Commit 740cdf32 authored by lixinglin's avatar lixinglin

parkinfo filter by status

parent 212c005c
package com.ruoyi.system.controller;
import java.util.ArrayList;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -21,14 +23,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* 开发区信息Controller
*
*
* @author ruoyi
* @date 2023-10-07
*/
@Controller
@RequestMapping("/developmentInfo/info")
public class DevelopmentInfoController extends BaseController
{
public class DevelopmentInfoController extends BaseController {
private String prefix = "developmentInfo/info";
@Autowired
......@@ -36,8 +37,7 @@ public class DevelopmentInfoController extends BaseController
@RequiresPermissions("developmentInfo:info:view")
@GetMapping()
public String info()
{
public String info() {
return prefix + "/info";
}
......@@ -47,10 +47,15 @@ public class DevelopmentInfoController extends BaseController
@RequiresPermissions("developmentInfo:info:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(DevelopmentInfo developmentInfo)
{
public TableDataInfo list(DevelopmentInfo developmentInfo) {
startPage();
List<DevelopmentInfo> list = developmentInfoService.selectDevelopmentInfoList(developmentInfo);
Integer status = developmentInfo.getStatus();
List<DevelopmentInfo> list = new ArrayList<>();
if (status == null) {
list = developmentInfoService.selectByStatus("1");
} else {
list = developmentInfoService.selectDevelopmentInfoList(developmentInfo);
}
return getDataTable(list);
}
......@@ -61,8 +66,7 @@ public class DevelopmentInfoController extends BaseController
@Log(title = "开发区信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(DevelopmentInfo developmentInfo)
{
public AjaxResult export(DevelopmentInfo developmentInfo) {
List<DevelopmentInfo> list = developmentInfoService.selectDevelopmentInfoList(developmentInfo);
ExcelUtil<DevelopmentInfo> util = new ExcelUtil<DevelopmentInfo>(DevelopmentInfo.class);
return util.exportExcel(list, "开发区信息数据");
......@@ -72,8 +76,7 @@ public class DevelopmentInfoController extends BaseController
* 新增开发区信息
*/
@GetMapping("/add")
public String add()
{
public String add() {
return prefix + "/add";
}
......@@ -84,8 +87,7 @@ public class DevelopmentInfoController extends BaseController
@Log(title = "开发区信息", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(DevelopmentInfo developmentInfo)
{
public AjaxResult addSave(DevelopmentInfo developmentInfo) {
return toAjax(developmentInfoService.insertDevelopmentInfo(developmentInfo));
}
......@@ -94,8 +96,7 @@ public class DevelopmentInfoController extends BaseController
*/
@RequiresPermissions("developmentInfo:info:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
public String edit(@PathVariable("id") Long id, ModelMap mmap) {
DevelopmentInfo developmentInfo = developmentInfoService.selectDevelopmentInfoById(id);
mmap.put("developmentInfo", developmentInfo);
return prefix + "/edit";
......@@ -108,8 +109,7 @@ public class DevelopmentInfoController extends BaseController
@Log(title = "开发区信息", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(DevelopmentInfo developmentInfo)
{
public AjaxResult editSave(DevelopmentInfo developmentInfo) {
return toAjax(developmentInfoService.updateDevelopmentInfo(developmentInfo));
}
......@@ -118,10 +118,9 @@ public class DevelopmentInfoController extends BaseController
*/
@RequiresPermissions("developmentInfo:info:remove")
@Log(title = "开发区信息", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
public AjaxResult remove(String ids) {
return toAjax(developmentInfoService.deleteDevelopmentInfoByIds(ids));
}
......
......@@ -58,4 +58,6 @@ public interface DevelopmentInfoMapper
* @return 结果
*/
public int deleteDevelopmentInfoByIds(String[] ids);
List<DevelopmentInfo> selectByStatus(String number);
}
......@@ -58,4 +58,6 @@ public interface IDevelopmentInfoService
* @return 结果
*/
public int deleteDevelopmentInfoById(Long id);
List<DevelopmentInfo> selectByStatus(String number);
}
package com.ruoyi.system.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.ParkInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.DevelopmentInfoMapper;
......@@ -11,87 +13,103 @@ import com.ruoyi.common.core.text.Convert;
/**
* 开发区Service业务层处理
*
*
* @author ruoyi
* @date 2023-11-10
*/
@Service
public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService
{
public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
@Autowired
private DevelopmentInfoMapper developmentInfoMapper;
/**
* 查询开发区
*
*
* @param id 开发区主键
* @return 开发区
*/
@Override
public DevelopmentInfo selectDevelopmentInfoById(Long id)
{
public DevelopmentInfo selectDevelopmentInfoById(Long id) {
return developmentInfoMapper.selectDevelopmentInfoById(id);
}
/**
* 查询开发区列表
*
*
* @param developmentInfo 开发区
* @return 开发区
*/
@Override
public List<DevelopmentInfo> selectDevelopmentInfoList(DevelopmentInfo developmentInfo)
{
public List<DevelopmentInfo> selectDevelopmentInfoList(DevelopmentInfo developmentInfo) {
return developmentInfoMapper.selectDevelopmentInfoList(developmentInfo);
}
/**
* 新增开发区
*
*
* @param developmentInfo 开发区
* @return 结果
*/
@Override
public int insertDevelopmentInfo(DevelopmentInfo developmentInfo)
{
public int insertDevelopmentInfo(DevelopmentInfo developmentInfo) {
developmentInfo.setCreateTime(DateUtils.getNowDate());
return developmentInfoMapper.insertDevelopmentInfo(developmentInfo);
}
/**
* 修改开发区
*
*
* @param developmentInfo 开发区
* @return 结果
*/
@Override
public int updateDevelopmentInfo(DevelopmentInfo developmentInfo)
{
public int updateDevelopmentInfo(DevelopmentInfo developmentInfo) {
developmentInfo.setUpdateTime(DateUtils.getNowDate());
Long id = developmentInfo.getId();
Integer status = developmentInfo.getStatus();
if (status.equals(3)) {
Long mirrorId = developmentInfo.getMirrorId();
if (mirrorId != null) {
DevelopmentInfo parkInfo1 = new DevelopmentInfo();
parkInfo1.setMirrorId(mirrorId);
List<DevelopmentInfo> parkInfos = developmentInfoMapper.selectDevelopmentInfoList(parkInfo1);
for (DevelopmentInfo info : parkInfos) {
Long id1 = info.getId();
if (!id.equals(id1)) {
info.setStatus(9);
developmentInfoMapper.updateDevelopmentInfo(info);
}
}
}
}
return developmentInfoMapper.updateDevelopmentInfo(developmentInfo);
}
/**
* 批量删除开发区
*
*
* @param ids 需要删除的开发区主键
* @return 结果
*/
@Override
public int deleteDevelopmentInfoByIds(String ids)
{
public int deleteDevelopmentInfoByIds(String ids) {
return developmentInfoMapper.deleteDevelopmentInfoByIds(Convert.toStrArray(ids));
}
/**
* 删除开发区信息
*
*
* @param id 开发区主键
* @return 结果
*/
@Override
public int deleteDevelopmentInfoById(Long id)
{
public int deleteDevelopmentInfoById(Long id) {
return developmentInfoMapper.deleteDevelopmentInfoById(id);
}
@Override
public List<DevelopmentInfo> selectByStatus(String number) {
return developmentInfoMapper.selectByStatus(number);
}
}
......@@ -13,37 +13,34 @@ import com.ruoyi.common.core.text.Convert;
/**
* parkinfoService业务层处理
*
*
* @author ruoyi
* @date 2023-09-24
*/
@Service
public class ParkInfoServiceImpl implements IParkInfoService
{
public class ParkInfoServiceImpl implements IParkInfoService {
@Autowired
private ParkInfoMapper parkInfoMapper;
/**
* 查询parkinfo
*
*
* @param id parkinfo主键
* @return parkinfo
*/
@Override
public ParkInfo selectParkInfoById(Long id)
{
public ParkInfo selectParkInfoById(Long id) {
return parkInfoMapper.selectParkInfoById(id);
}
/**
* 查询parkinfo列表
*
*
* @param parkInfo parkinfo
* @return parkinfo
*/
@Override
public List<ParkInfo> selectParkInfoList(ParkInfo parkInfo)
{
public List<ParkInfo> selectParkInfoList(ParkInfo parkInfo) {
return parkInfoMapper.selectParkInfoList(parkInfo);
}
......@@ -56,42 +53,57 @@ public class ParkInfoServiceImpl implements IParkInfoService
/**
* 新增parkinfo
*
*
* @param parkInfo parkinfo
* @return 结果
*/
@Override
public int insertParkInfo(ParkInfo parkInfo)
{
public int insertParkInfo(ParkInfo parkInfo) {
parkInfo.setCreateTime(DateUtils.getNowDate());
return parkInfoMapper.insertParkInfo(parkInfo);
}
/**
* 修改parkinfo
*
*
* @param parkInfo parkinfo
* @return 结果
*/
@Override
public int updateParkInfo(ParkInfo parkInfo)
{
public int updateParkInfo(ParkInfo parkInfo) {
parkInfo.setUpdateTime(DateUtils.getNowDate());
Long id = parkInfo.getId();
Integer status = parkInfo.getStatus();
if (status.equals(3)) {
Long mirrorId = parkInfo.getMirrorId();
if (mirrorId != null) {
ParkInfo parkInfo1 = new ParkInfo();
parkInfo1.setMirrorId(mirrorId);
List<ParkInfo> parkInfos = parkInfoMapper.selectParkInfoList(parkInfo1);
for (ParkInfo info : parkInfos) {
Long id1 = info.getId();
if (!id.equals(id1)) {
info.setStatus(9);
parkInfoMapper.updateParkInfo(info);
}
}
}
}
return parkInfoMapper.updateParkInfo(parkInfo);
}
public int updateOtherUserParkInfo(Map<String,Long> map){
return parkInfoMapper.updateOtherUserParkInfo( map);
public int updateOtherUserParkInfo(Map<String, Long> map) {
return parkInfoMapper.updateOtherUserParkInfo(map);
}
/**
* 批量删除parkinfo
*
*
* @param ids 需要删除的parkinfo主键
* @return 结果
*/
@Override
public int deleteParkInfoByIds(String ids)
{
public int deleteParkInfoByIds(String ids) {
return parkInfoMapper.deleteParkInfoByIds(Convert.toStrArray(ids));
}
......@@ -103,19 +115,18 @@ public class ParkInfoServiceImpl implements IParkInfoService
* @return 结果
*/
@Override
public int deleteParkInfoStatusByIds(String ids)
{
public int deleteParkInfoStatusByIds(String ids) {
return parkInfoMapper.deleteParkInfoStatusByIds(Convert.toStrArray(ids));
}
/**
* 删除parkinfo信息
*
*
* @param id parkinfo主键
* @return 结果
*/
@Override
public int deleteParkInfoById(Long id)
{
public int deleteParkInfoById(Long id) {
return parkInfoMapper.deleteParkInfoById(id);
}
}
......@@ -224,7 +224,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDevelopmentInfoVo"/>
where id = #{id}
</select>
<select id="selectByStatus" parameterType="String" resultMap="DevelopmentInfoResult">
<include refid="selectDevelopmentInfoVo"/>
where status != #{status}
</select>
<insert id="insertDevelopmentInfo" parameterType="DevelopmentInfo" useGeneratedKeys="true" keyProperty="id">
insert into development_info
<trim prefix="(" suffix=")" suffixOverrides=",">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment