工地预警流水表、区域信息表、打卡信息、考勤模板、考勤情况、校园信息新增更新、删除功能 删除DTO增加deptCode传参 编辑增加数据所属单位条件

src/main/java/com/zksy/szpt/controller/IndexController.java

@@ -28,4 +28,16 @@ public class IndexController {
     public Integer addXxRwwcqk(@RequestBody @Valid XxRwwcqkDTO xxRwwcqkDTO) {
         return indexService.addXxRwwcqk(xxRwwcqkDTO);
     }
+
+    @ApiOperation(value="编辑xx_rwwcqk数据")
+    @PostMapping("/updateXxRwwcqk")
+    public Integer updateXxRwwcqk(@RequestBody @Validated XxRwwcqkDTO xxRwwcqkDTO){
+        return indexService.updateXxRwwcqk(xxRwwcqkDTO);
+    }
+
+    @ApiOperation(value = "删除xx_rwwcqk数据")
+    @PostMapping("/deleteXxRwwcqk")
+    public Integer deleteXxRwwcqk(@RequestBody CommonDelDTO commonDelDTO) {
+        return indexService.deleteXxRwwcqk(commonDelDTO);
+    }
 }

src/main/java/com/zksy/szpt/controller/SzptClockInController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptClockInDTO;
 import com.zksy.szpt.service.SzptClockInService;
 import io.swagger.annotations.Api;
@@ -7,14 +8,11 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 @Api(tags = "新增服务")
 @RequestMapping("/rest/index")
 @RestController
 @Validated
-
-
 public class SzptClockInController {
     private final SzptClockInService szptClockInService;
     public SzptClockInController(SzptClockInService szptClockInService) {
@@ -35,8 +33,8 @@ public class SzptClockInController {
 
     @ApiOperation(value = "删除szpt_clock_in数据")
     @PostMapping("/deleteSzptClockIn")
-    public Integer deleteSzptClockIn(@RequestBody List<Integer> ids) {
-        return szptClockInService.deleteSzptClockIn(ids);
+    public Integer deleteSzptClockIn(@RequestBody CommonDelDTO commonDelDTO) {
+        return szptClockInService.deleteSzptClockIn(commonDelDTO);
     }
 
 

src/main/java/com/zksy/szpt/controller/SzptClockInRulesController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptClockInRulesDTO;
 import com.zksy.szpt.service.SzptClockInRulesService;
 import io.swagger.annotations.Api;
@@ -7,13 +8,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Api(tags = "新增服务")
 @RequestMapping("/rest/index")
 @RestController
 @Validated
-
 public class SzptClockInRulesController {
     private final SzptClockInRulesService szptClockInRulesService;
 
@@ -35,7 +33,7 @@ public class SzptClockInRulesController {
 
     @ApiOperation(value = "删除SzptClockInRules数据")
     @PostMapping("/deleteSzptClockInRules")
-    public Integer deleteSzptClockInRules(@RequestBody List<Integer> ids) {
-        return szptClockInRulesService.deleteSzptClockInRules(ids);
+    public Integer deleteSzptClockInRules(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptClockInRulesService.deleteSzptClockInRules(commonDelDTO);
     }
 }

src/main/java/com/zksy/szpt/controller/SzptFwxxController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptFwxxDTO;
 import com.zksy.szpt.service.SzptFwxxService;
 import io.swagger.annotations.Api;
@@ -7,7 +8,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 @Api(tags = "新增服务")
 @RequestMapping("/rest/index")
@@ -36,7 +36,7 @@ public class SzptFwxxController {
 
     @ApiOperation(value = "删除SzptFwxx数据")
     @PostMapping("/deleteSzptFwxx")
-    public Integer deleteSzptFwxx(@RequestBody List<String> ids) {
-        return szptFwxxService.deleteSzptFwxx(ids);
+    public Integer deleteSzptFwxx(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptFwxxService.deleteSzptFwxx(commonDelDTO);
     }
 }

src/main/java/com/zksy/szpt/controller/SzptGdCsyjhldxController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdCsyjhldxDTO;
 import com.zksy.szpt.service.SzptGdCsyjhldxService;
 import io.swagger.annotations.Api;
@@ -7,7 +8,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 @Api(tags = "新增服务")
 @RequestMapping("/rest/index")
@@ -36,7 +36,7 @@ public class SzptGdCsyjhldxController {
 
     @ApiOperation(value = "删除SzptGdCsyjhldx数据")
     @PostMapping("/deleteSzptGdCsyjhldx")
-    public Integer deleteSzptGdCsyjhldx(@RequestBody List<String> ids) {
-        return szptGdCsyjhldxService.deleteSzptGdCsyjhldx(ids);
+    public Integer deleteSzptGdCsyjhldx(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptGdCsyjhldxService.deleteSzptGdCsyjhldx(commonDelDTO);
     }
 }

src/main/java/com/zksy/szpt/controller/SzptGdRyxxController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdRyxxDTO;
 import com.zksy.szpt.service.SzptGdRyxxService;
 import io.swagger.annotations.Api;
@@ -10,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 
 @Api(tags = "新增服务")
 @RequestMapping("/rest/index")
@@ -37,7 +37,7 @@ public class SzptGdRyxxController {
 
     @ApiOperation(value = "删除工地人员信息数据")
     @PostMapping("/deleteSzptGdRyxx")
-    public Integer deleteSzptGdRyxx(@RequestBody List<String> ids) {
-        return szptGdRyxxService.deleteSzptGdRyxx(ids);
+    public Integer deleteSzptGdRyxx(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptGdRyxxService.deleteSzptGdRyxx(commonDelDTO);
     }
 }

src/main/java/com/zksy/szpt/controller/SzptGdSbxxController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdSbxxDTO;
 import com.zksy.szpt.service.SzptGdSbxxService;
 import io.swagger.annotations.Api;
@@ -10,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 
 @Api(tags = "新增服务")
 @RequestMapping("/rest/index")
@@ -37,7 +37,7 @@ public class SzptGdSbxxController {
 
     @ApiOperation(value = "删除设备信息数据")
     @PostMapping("/deleteSzptGdSbxx")
-    public Integer deleteSzptGdSbxx(@RequestBody List<String> ids) {
-        return szptGdSbxxService.deleteSzptGdSbxx(ids);
+    public Integer deleteSzptGdSbxx(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptGdSbxxService.deleteSzptGdSbxx(commonDelDTO);
     }
 }

src/main/java/com/zksy/szpt/controller/SzptGdXxController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdXxDTO;
 import com.zksy.szpt.service.SzptGdXxService;
 import io.swagger.annotations.Api;
@@ -10,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 
 @Api(tags = "新增服务")
 @RequestMapping("/rest/index")
@@ -37,7 +37,7 @@ public class SzptGdXxController {
 
     @ApiOperation(value = "删除工地信息数据")
     @PostMapping("/deleteSzptGdXx")
-    public Integer deleteSzptGdXx(@RequestBody List<String> ids) {
-        return szptGdXxService.deleteSzptGdXx(ids);
+    public Integer deleteSzptGdXx(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptGdXxService.deleteSzptGdXx(commonDelDTO);
     }
 }

src/main/java/com/zksy/szpt/controller/SzptGdYjController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdYjDTO;
-import com.zksy.szpt.service.IndexService;
 import com.zksy.szpt.service.SzptGdYjService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,4 +28,16 @@ public class SzptGdYjController {
     public Integer addSzptGdYj(@RequestBody @Validated SzptGdYjDTO szptGdYjDTO){
         return szptGdYjService.addSzptGdYj(szptGdYjDTO);
     }
+
+    @ApiOperation(value="编辑工地预警流水表")
+    @PostMapping("/updateSzptGdYj")
+    public Integer updateSzptGdYj(@RequestBody @Validated SzptGdYjDTO szptGdYjDTO){
+        return szptGdYjService.updateSzptGdYj(szptGdYjDTO);
+    }
+
+    @ApiOperation(value = "删除工地预警流水表")
+    @PostMapping("/deleteSzptGdYj")
+    public Integer deleteSzptGdYj(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptGdYjService.deleteSzptGdYj(commonDelDTO);
+    }
 }

src/main/java/com/zksy/szpt/controller/SzptQyxxController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptQyxxDTO;
 import com.zksy.szpt.service.SzptQyxxService;
 import io.swagger.annotations.Api;
@@ -26,4 +27,16 @@ public class SzptQyxxController {
     public Integer addSzptQyxx(@RequestBody @Validated SzptQyxxDTO szptQyxxDTO){
         return szptQyxxService.addSzptQyxx(szptQyxxDTO);
     }
+
+    @ApiOperation(value="编辑工地预警流水表")
+    @PostMapping("/updateSzptQyxx")
+    public Integer updateSzptQyxx(@RequestBody @Validated SzptQyxxDTO szptQyxxDTO){
+        return szptQyxxService.updateSzptQyxx(szptQyxxDTO);
+    }
+
+    @ApiOperation(value = "删除工地预警流水表")
+    @PostMapping("/deleteSzptQyxx")
+    public Integer deleteSzptQyxx(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptQyxxService.deleteSzptQyxx(commonDelDTO);
+    }
 }

src/main/java/com/zksy/szpt/controller/SzptXyzhDkxxController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhDkxxDTO;
 import com.zksy.szpt.service.SzptXyzhDkxxService;
 import io.swagger.annotations.Api;
@@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/rest/index")
 @RestController
 @Validated
-
 public class SzptXyzhDkxxController {
     private final SzptXyzhDkxxService szptXyzhDkxxService;
     public SzptXyzhDkxxController(SzptXyzhDkxxService szptXyzhDkxxService) {
@@ -26,4 +26,16 @@ public class SzptXyzhDkxxController {
     public Integer addSzptXyzhDkxx(@RequestBody @Validated SzptXyzhDkxxDTO szptXyzhDkxxDTO){
         return szptXyzhDkxxService.addSzptXyzhDkxx(szptXyzhDkxxDTO);
     }
+
+    @ApiOperation(value="编辑打卡信息")
+    @PostMapping("/updateSzptXyzhDkxx")
+    public Integer updateSzptXyzhDkxx(@RequestBody @Validated SzptXyzhDkxxDTO szptXyzhDkxxDTO){
+        return szptXyzhDkxxService.updateSzptXyzhDkxx(szptXyzhDkxxDTO);
+    }
+
+    @ApiOperation(value = "删除打卡信息")
+    @PostMapping("/deleteSzptXyzhDkxx")
+    public Integer deleteSzptXyzhDkxx(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptXyzhDkxxService.deleteSzptXyzhDkxx(commonDelDTO);
+    }
 }

src/main/java/com/zksy/szpt/controller/SzptXyzhKqmbController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhKqmbDTO;
 import com.zksy.szpt.service.SzptXyzhKqmbService;
 import io.swagger.annotations.Api;
@@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/rest/index")
 @RestController
 @Validated
-
 public class SzptXyzhKqmbController {
     private final SzptXyzhKqmbService szptXyzhKqmbService;
     public SzptXyzhKqmbController(SzptXyzhKqmbService szptXyzhKqmbService) {
@@ -26,4 +26,16 @@ public class SzptXyzhKqmbController {
     public Integer addSzptXyzhKqmb(@RequestBody @Validated SzptXyzhKqmbDTO szptXyzhKqmbDTO){
         return szptXyzhKqmbService.addSzptXyzhKqmb(szptXyzhKqmbDTO);
     }
+
+    @ApiOperation(value="编辑考勤模板")
+    @PostMapping("/updateSzptXyzhKqmb")
+    public Integer updateSzptXyzhKqmb(@RequestBody @Validated SzptXyzhKqmbDTO szptXyzhKqmbDTO){
+        return szptXyzhKqmbService.updateSzptXyzhKqmb(szptXyzhKqmbDTO);
+    }
+
+    @ApiOperation(value = "删除考勤模板")
+    @PostMapping("/deleteSzptXyzhKqmb")
+    public Integer deleteSzptXyzhKqmb(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptXyzhKqmbService.deleteSzptXyzhKqmb(commonDelDTO);
+    }
 }

src/main/java/com/zksy/szpt/controller/SzptXyzhMbdhController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhMbdhDTO;
 import com.zksy.szpt.service.SzptXyzhMbdhService;
 import io.swagger.annotations.Api;
@@ -14,16 +15,27 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/rest/index")
 @RestController
 @Validated
-
 public class SzptXyzhMbdhController {
     private final SzptXyzhMbdhService szptXyzhMbdhService;
     public SzptXyzhMbdhController(SzptXyzhMbdhService szptXyzhMbdhService) {
         this.szptXyzhMbdhService = szptXyzhMbdhService;
     }
 
-    @ApiOperation(value="新增考勤模板")
+    @ApiOperation(value="新增考勤情况")
     @PostMapping("/addSzptXyzhMbdh")
     public Integer addSzptXyzhMbdh(@RequestBody @Validated SzptXyzhMbdhDTO szptXyzhMbdhDTO){
         return szptXyzhMbdhService.addSzptXyzhMbdh(szptXyzhMbdhDTO);
     }
+
+    @ApiOperation(value="编辑考勤情况")
+    @PostMapping("/updateSzptXyzhMbdh")
+    public Integer updateSzptXyzhKqmb(@RequestBody @Validated SzptXyzhMbdhDTO szptXyzhMbdhDTO){
+        return szptXyzhMbdhService.updateSzptXyzhMbdh(szptXyzhMbdhDTO);
+    }
+
+    @ApiOperation(value = "删除考勤情况")
+    @PostMapping("/deleteSzptXyzhMbdh")
+    public Integer deleteSzptXyzhMbdh(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptXyzhMbdhService.deleteSzptXyzhMbdh(commonDelDTO);
+    }
 }

src/main/java/com/zksy/szpt/controller/SzptXyzhXyxxController.java

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhXyxxDTO;
 import com.zksy.szpt.service.SzptXyzhXyxxService;
 import io.swagger.annotations.Api;
@@ -20,9 +21,21 @@ public class SzptXyzhXyxxController {
         this.szptXyzhXyxxService = szptXyzhXyxxService;
     }
 
-    @ApiOperation(value="新增考勤模板")
+    @ApiOperation(value="新增校园信息")
     @PostMapping("/addSzptXyzhXyxx")
     public Integer addSzptXyzhXyxx(@RequestBody @Validated SzptXyzhXyxxDTO szptXyzhXyxxDTO){
         return szptXyzhXyxxService.addSzptXyzhXyxx(szptXyzhXyxxDTO);
     }
+
+    @ApiOperation(value="编辑校园信息")
+    @PostMapping("/updateSzptXyzhXyxx")
+    public Integer updateSzptXyzhXyxx(@RequestBody @Validated SzptXyzhXyxxDTO szptXyzhXyxxDTO){
+        return szptXyzhXyxxService.updateSzptXyzhXyxx(szptXyzhXyxxDTO);
+    }
+
+    @ApiOperation(value = "删除校园信息")
+    @PostMapping("/deleteSzptXyzhXyxx")
+    public Integer deleteSzptXyzhXyxx(@RequestBody @Validated CommonDelDTO commonDelDTO) {
+        return szptXyzhXyxxService.deleteSzptXyzhXyxx(commonDelDTO);
+    }
 }

src/main/java/com/zksy/szpt/domain/dto/CommonDelDTO.java

@@ -10,11 +10,24 @@ public class CommonDelDTO {
     @NotEmpty(message = "账户ID不能为空")
     private List<String> ids;
 
+    /**
+     * 所属单位
+     */
+    @NotEmpty(message = "所属单位不能为空")
+    private String deptCode;
+
     public @NotEmpty(message = "账户ID不能为空") List<String> getIds() {
         return ids;
     }
-
     public void setIds(@NotEmpty(message = "账户ID不能为空") List<String> ids) {
         this.ids = ids;
     }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
 }
\ No newline at end of file

src/main/java/com/zksy/szpt/domain/dto/SzptFwxxDTO.java

 package com.zksy.szpt.domain.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
@@ -184,7 +183,16 @@ public class SzptFwxxDTO {
      */
     private Date jkmhysj;
 
+    /**
+     * 数据归属单位代码
+     */
+    private String sjgsdwdm;
+
 
+    /**
+     * 数据归属单位名称
+     */
+    private String sjgsdwmc;
 
     /**
      * 房主证件照片
@@ -471,7 +479,21 @@ public class SzptFwxxDTO {
         this.jkmhysj = jkmhysj;
     }
 
+    public String getSjgsdwmc() {
+        return sjgsdwmc;
+    }
 
+    public void setSjgsdwmc(String sjgsdwmc) {
+        this.sjgsdwmc = sjgsdwmc;
+    }
+
+    public String getSjgsdwdm() {
+        return sjgsdwdm;
+    }
+
+    public void setSjgsdwdm(String sjgsdwdm) {
+        this.sjgsdwdm = sjgsdwdm;
+    }
 
     public String getFzzjzp() {
         return fzzjzp;

src/main/java/com/zksy/szpt/domain/dto/SzptGdRyxxDTO.java

@@ -22,6 +22,7 @@ public class SzptGdRyxxDTO {
     /**
      * 人口编码
      */
+    @NotBlank(message = "人口编码不能为空")
     private String rkbm;
 
     /**

src/main/java/com/zksy/szpt/domain/dto/SzptGdSbxxDTO.java

@@ -109,6 +109,7 @@ public class SzptGdSbxxDTO {
     @NotBlank(message = "状态不能为空")
     private String zt;
 
+
     /**
      * 数据归属单位代码
      */

src/main/java/com/zksy/szpt/service/IndexService.java

 package com.zksy.szpt.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zksy.szpt.domain.dto.*;
 import com.zksy.szpt.domain.po.*;
 import com.zksy.szpt.mapper.*;
@@ -19,17 +21,16 @@ public class IndexService {
         return xxRwwcqkMapper.insert(xxRwwcqk);
     }
 
-    @Resource
-    private XxZhxxMapper xxZhxxMapper;
-
-    public Integer addXxZhxx(XxZhxxDTO xxZhxxDTO) {
-        XxZhxx xxZhxx = BeanMapperUtil.map(xxZhxxDTO, XxZhxx.class);
-        return xxZhxxMapper.insert(xxZhxx);
+    public Integer updateXxRwwcqk(XxRwwcqkDTO xxRwwcqkDTO) {
+        XxRwwcqk xxRwwcqk = BeanMapperUtil.map(xxRwwcqkDTO, XxRwwcqk.class);
+        LambdaUpdateWrapper<XxRwwcqk> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(XxRwwcqk::getRwid, xxRwwcqk.getRwid());
+        return xxRwwcqkMapper.update(xxRwwcqk,wrapper);
     }
 
-
-
-
-
-
+    public Integer deleteXxRwwcqk(CommonDelDTO commonDelDTO) {
+        LambdaQueryWrapper<XxRwwcqk> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(XxRwwcqk::getRwid, commonDelDTO);
+        return xxRwwcqkMapper.delete(wrapper);
+    }
 }

src/main/java/com/zksy/szpt/service/SzptClockInRulesService.java

@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptClockInRulesDTO;
 import com.zksy.szpt.domain.po.SzptClockInRules;
 import com.zksy.szpt.mapper.SzptClockInRulesMapper;
@@ -9,7 +10,6 @@ import com.zksy.szpt.util.BeanMapperUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class SzptClockInRulesService {
@@ -28,9 +28,9 @@ public class SzptClockInRulesService {
         return szptClockInRulesMapper.update(szptClockInRules,wrapper);
     }
 
-    public Integer deleteSzptClockInRules(List<Integer> ids) {
+    public Integer deleteSzptClockInRules(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptClockInRules> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SzptClockInRules::getId, ids);
+        wrapper.in(SzptClockInRules::getId, commonDelDTO);
         return szptClockInRulesMapper.delete(wrapper);
     }
 }

src/main/java/com/zksy/szpt/service/SzptClockInService.java

@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptClockInDTO;
 import com.zksy.szpt.domain.po.SzptClockIn;
 import com.zksy.szpt.mapper.SzptClockInMapper;
@@ -9,7 +10,6 @@ import com.zksy.szpt.util.BeanMapperUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class SzptClockInService {
@@ -28,9 +28,9 @@ public class SzptClockInService {
         return szptClockInMapper.update(szptClockIn,wrapper);
     }
 
-    public Integer deleteSzptClockIn(List<Integer> ids) {
+    public Integer deleteSzptClockIn(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptClockIn> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SzptClockIn::getId, ids);
+        wrapper.in(SzptClockIn::getId, commonDelDTO);
         return szptClockInMapper.delete(wrapper);
     }
 }

src/main/java/com/zksy/szpt/service/SzptFwxxService.java

@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptFwxxDTO;
 import com.zksy.szpt.domain.po.SzptFwxx;
 import com.zksy.szpt.mapper.SzptFwxxMapper;
@@ -9,7 +10,6 @@ import com.zksy.szpt.util.BeanMapperUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class SzptFwxxService {
@@ -26,12 +26,13 @@ public class SzptFwxxService {
         SzptFwxx szptFwxx = BeanMapperUtil.map(szptFwxxDTO, SzptFwxx.class);
         LambdaUpdateWrapper<SzptFwxx> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(SzptFwxx::getQyid, szptFwxx.getQyid());
+        wrapper.eq(SzptFwxx::getSjgsdwdm, szptFwxx.getSjgsdwdm());
         return szptFwxxMapper.update(szptFwxx,wrapper);
     }
 
-    public Integer deleteSzptFwxx(List<String> ids) {
+    public Integer deleteSzptFwxx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptFwxx> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SzptFwxx::getQyid, ids);
+        wrapper.in(SzptFwxx::getQyid, commonDelDTO);
         return szptFwxxMapper.delete(wrapper);
     }
 }

src/main/java/com/zksy/szpt/service/SzptGdCsyjhldxService.java

@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdCsyjhldxDTO;
 import com.zksy.szpt.domain.po.SzptGdCsyjhldx;
 import com.zksy.szpt.mapper.SzptGdCsyjhldxMapper;
@@ -9,7 +10,6 @@ import com.zksy.szpt.util.BeanMapperUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class SzptGdCsyjhldxService {
@@ -28,9 +28,9 @@ public class SzptGdCsyjhldxService {
         return szptGdCsyjhldxMapper.update(szptGdCsyjhldx,wrapper);
     }
 
-    public Integer deleteSzptGdCsyjhldx(List<String> ids) {
+    public Integer deleteSzptGdCsyjhldx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptGdCsyjhldx> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SzptGdCsyjhldx::getId, ids);
+        wrapper.in(SzptGdCsyjhldx::getId, commonDelDTO);
         return szptGdCsyjhldxMapper.delete(wrapper);
     }
 }

src/main/java/com/zksy/szpt/service/SzptGdRyxxService.java

@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdRyxxDTO;
 import com.zksy.szpt.domain.po.SzptGdRyxx;
 import com.zksy.szpt.mapper.SzptGdRyxxMapper;
@@ -9,7 +10,6 @@ import com.zksy.szpt.util.BeanMapperUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class SzptGdRyxxService {
@@ -24,13 +24,13 @@ public class SzptGdRyxxService {
     public Integer updateSzptGdRyxx(SzptGdRyxxDTO szptGdRyxxDTO) {
         SzptGdRyxx szptGdRyxx = BeanMapperUtil.map(szptGdRyxxDTO, SzptGdRyxx.class);
         LambdaUpdateWrapper<SzptGdRyxx> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(SzptGdRyxx::getId, szptGdRyxx.getId());
+        wrapper.eq(SzptGdRyxx::getRkbm, szptGdRyxx.getRkbm());
         return szptGdRyxxMapper.update(szptGdRyxx,wrapper);
     }
 
-    public Integer deleteSzptGdRyxx(List<String> ids) {
+    public Integer deleteSzptGdRyxx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptGdRyxx> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SzptGdRyxx::getId, ids);
+        wrapper.in(SzptGdRyxx::getRkbm, commonDelDTO);
         return szptGdRyxxMapper.delete(wrapper);
     }
 }

src/main/java/com/zksy/szpt/service/SzptGdSbxxService.java

@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdSbxxDTO;
 import com.zksy.szpt.domain.po.SzptGdSbxx;
 import com.zksy.szpt.mapper.SzptGdSbxxMapper;
@@ -9,7 +10,6 @@ import com.zksy.szpt.util.BeanMapperUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class SzptGdSbxxService {
@@ -25,12 +25,13 @@ public class SzptGdSbxxService {
         SzptGdSbxx szptGdSbxx = BeanMapperUtil.map(szptGdSbxxDTO, SzptGdSbxx.class);
         LambdaUpdateWrapper<SzptGdSbxx> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(SzptGdSbxx::getId, szptGdSbxx.getId());
+        wrapper.eq(SzptGdSbxx::getSjgsdwdm, szptGdSbxx.getSjgsdwdm());
         return szptGdSbxxMapper.update(szptGdSbxx,wrapper);
     }
 
-    public Integer deleteSzptGdSbxx(List<String> ids) {
+    public Integer deleteSzptGdSbxx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptGdSbxx> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SzptGdSbxx::getId, ids);
+        wrapper.in(SzptGdSbxx::getId, commonDelDTO);
         return szptGdSbxxMapper.delete(wrapper);
     }
 }

src/main/java/com/zksy/szpt/service/SzptGdXxService.java

@@ -2,6 +2,7 @@ package com.zksy.szpt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdXxDTO;
 import com.zksy.szpt.domain.po.SzptGdXx;
 import com.zksy.szpt.mapper.SzptGdXxMapper;
@@ -9,7 +10,6 @@ import com.zksy.szpt.util.BeanMapperUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class SzptGdXxService {
@@ -25,12 +25,13 @@ public class SzptGdXxService {
         SzptGdXx szptGdXx = BeanMapperUtil.map(szptGdXxDTO, SzptGdXx.class);
         LambdaUpdateWrapper<SzptGdXx> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(SzptGdXx::getId, szptGdXx.getId());
+        wrapper.eq(SzptGdXx::getSjgsdwdm, szptGdXx.getSjgsdwdm());
         return szptGdXxMapper.update(szptGdXx,wrapper);
     }
 
-    public Integer deleteSzptGdXx(List<String> ids) {
+    public Integer deleteSzptGdXx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptGdXx> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SzptGdXx::getId, ids);
+        wrapper.in(SzptGdXx::getId, commonDelDTO);
         return szptGdXxMapper.delete(wrapper);
     }
 }

src/main/java/com/zksy/szpt/service/SzptGdYjService.java

 package com.zksy.szpt.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdYjDTO;
 import com.zksy.szpt.domain.po.SzptGdYj;
 import com.zksy.szpt.mapper.SzptGdYjMapper;
@@ -16,4 +19,17 @@ public class SzptGdYjService {
         SzptGdYj szptGdYj = BeanMapperUtil.map(szptGdYjDTO,SzptGdYj.class);
         return szptGdYjMapper.insert(szptGdYj);
     }
+
+    public Integer updateSzptGdYj(SzptGdYjDTO szptGdYjDTO) {
+        SzptGdYj szptGdYj = BeanMapperUtil.map(szptGdYjDTO, SzptGdYj.class);
+        LambdaUpdateWrapper<SzptGdYj> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(SzptGdYj::getId, szptGdYj.getId());
+        return szptGdYjMapper.update(szptGdYj,wrapper);
+    }
+
+    public Integer deleteSzptGdYj(CommonDelDTO commonDelDTO) {
+        LambdaQueryWrapper<SzptGdYj> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SzptGdYj::getId, commonDelDTO);
+        return szptGdYjMapper.delete(wrapper);
+    }
 }

src/main/java/com/zksy/szpt/service/SzptQyxxService.java

 package com.zksy.szpt.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptQyxxDTO;
 import com.zksy.szpt.domain.po.SzptQyxx;
 import com.zksy.szpt.mapper.SzptQyxxMapper;
@@ -16,4 +19,18 @@ public class SzptQyxxService {
         SzptQyxx szptQyxx = BeanMapperUtil.map(szptQyxxDTO,SzptQyxx.class);
         return szptQyxxMapper.insert(szptQyxx);
     }
+
+    public Integer updateSzptQyxx(SzptQyxxDTO szptQyxxDTO) {
+        SzptQyxx szptQyxx = BeanMapperUtil.map(szptQyxxDTO, SzptQyxx.class);
+        LambdaUpdateWrapper<SzptQyxx> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(SzptQyxx::getId, szptQyxx.getId());
+        wrapper.eq(SzptQyxx::getSjgsdwdm, szptQyxx.getSjgsdwdm());
+        return szptQyxxMapper.update(szptQyxx,wrapper);
+    }
+
+    public Integer deleteSzptQyxx(CommonDelDTO commonDelDTO) {
+        LambdaQueryWrapper<SzptQyxx> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SzptQyxx::getId, commonDelDTO);
+        return szptQyxxMapper.delete(wrapper);
+    }
 }

src/main/java/com/zksy/szpt/service/SzptXyzhDkxxService.java

 package com.zksy.szpt.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhDkxxDTO;
 import com.zksy.szpt.domain.po.SzptXyzhDkxx;
 import com.zksy.szpt.mapper.SzptXyzhDkxxMapper;
@@ -17,4 +20,17 @@ public class SzptXyzhDkxxService {
         SzptXyzhDkxx szptXyzhDkxx = BeanMapperUtil.map(szptXyzhDkxxDTO, SzptXyzhDkxx.class);
         return szptXyzhDkxxMapper.insert(szptXyzhDkxx);
     }
+
+    public Integer updateSzptXyzhDkxx(SzptXyzhDkxxDTO szptXyzhDkxxDTO) {
+        SzptXyzhDkxx szptXyzhDkxx = BeanMapperUtil.map(szptXyzhDkxxDTO, SzptXyzhDkxx.class);
+        LambdaUpdateWrapper<SzptXyzhDkxx> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(SzptXyzhDkxx::getDklsid, szptXyzhDkxx.getDklsid());
+        return szptXyzhDkxxMapper.update(szptXyzhDkxx,wrapper);
+    }
+
+    public Integer deleteSzptXyzhDkxx(CommonDelDTO commonDelDTO) {
+        LambdaQueryWrapper<SzptXyzhDkxx> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SzptXyzhDkxx::getDklsid, commonDelDTO);
+        return szptXyzhDkxxMapper.delete(wrapper);
+    }
 }

src/main/java/com/zksy/szpt/service/SzptXyzhKqmbService.java

 package com.zksy.szpt.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
+import com.zksy.szpt.domain.dto.SzptXyzhDkxxDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhKqmbDTO;
+import com.zksy.szpt.domain.po.SzptXyzhDkxx;
 import com.zksy.szpt.domain.po.SzptXyzhKqmb;
 import com.zksy.szpt.mapper.SzptXyzhKqmbMapper;
 import com.zksy.szpt.util.BeanMapperUtil;
@@ -17,4 +22,17 @@ public class SzptXyzhKqmbService {
         SzptXyzhKqmb szptXyzhKqmb = BeanMapperUtil.map(szptXyzhKqmbDTO, SzptXyzhKqmb.class);
         return szptXyzhKqmbMapper.insert(szptXyzhKqmb);
     }
+
+    public Integer updateSzptXyzhKqmb(SzptXyzhKqmbDTO szptXyzhKqmbDTO) {
+        SzptXyzhKqmb szptXyzhKqmb = BeanMapperUtil.map(szptXyzhKqmbDTO, SzptXyzhKqmb.class);
+        LambdaUpdateWrapper<SzptXyzhKqmb> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(SzptXyzhKqmb::getId, szptXyzhKqmb.getId());
+        return szptXyzhKqmbMapper.update(szptXyzhKqmb,wrapper);
+    }
+
+    public Integer deleteSzptXyzhKqmb(CommonDelDTO commonDelDTO) {
+        LambdaQueryWrapper<SzptXyzhKqmb> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SzptXyzhKqmb::getId, commonDelDTO);
+        return szptXyzhKqmbMapper.delete(wrapper);
+    }
 }

src/main/java/com/zksy/szpt/service/SzptXyzhMbdhService.java

 package com.zksy.szpt.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
+import com.zksy.szpt.domain.dto.SzptXyzhKqmbDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhMbdhDTO;
+import com.zksy.szpt.domain.po.SzptXyzhKqmb;
 import com.zksy.szpt.domain.po.SzptXyzhMbdh;
 import com.zksy.szpt.mapper.SzptXyzhMbdhMapper;
 import com.zksy.szpt.util.BeanMapperUtil;
@@ -17,4 +22,17 @@ public class SzptXyzhMbdhService {
         SzptXyzhMbdh szptXyzhMbdh = BeanMapperUtil.map(szptXyzhMbdhDTO, SzptXyzhMbdh.class);
         return szptXyzhMbdhMapper.insert(szptXyzhMbdh);
     }
+
+    public Integer updateSzptXyzhMbdh(SzptXyzhMbdhDTO szptXyzhMbdhDTO) {
+        SzptXyzhMbdh szptXyzhMbdh = BeanMapperUtil.map(szptXyzhMbdhDTO, SzptXyzhMbdh.class);
+        LambdaUpdateWrapper<SzptXyzhMbdh> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(SzptXyzhMbdh::getId, szptXyzhMbdh.getId());
+        return szptXyzhMbdhMapper.update(szptXyzhMbdh,wrapper);
+    }
+
+    public Integer deleteSzptXyzhMbdh(CommonDelDTO commonDelDTO) {
+        LambdaQueryWrapper<SzptXyzhMbdh> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SzptXyzhMbdh::getId, commonDelDTO);
+        return szptXyzhMbdhMapper.delete(wrapper);
+    }
 }

src/main/java/com/zksy/szpt/service/SzptXyzhXyxxService.java

 package com.zksy.szpt.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhMbdhDTO;
 import com.zksy.szpt.domain.dto.SzptXyzhXyxxDTO;
 import com.zksy.szpt.domain.po.SzptXyzhMbdh;
@@ -19,4 +22,17 @@ public class SzptXyzhXyxxService {
         SzptXyzhXyxx szptXyzhXyxx = BeanMapperUtil.map(szptXyzhXyxxDTO, SzptXyzhXyxx.class);
         return szptXyzhXyxxMapper.insert(szptXyzhXyxx);
     }
+
+    public Integer updateSzptXyzhXyxx(SzptXyzhXyxxDTO szptXyzhXyxxDTO) {
+        SzptXyzhXyxx szptXyzhXyxx = BeanMapperUtil.map(szptXyzhXyxxDTO, SzptXyzhXyxx.class);
+        LambdaUpdateWrapper<SzptXyzhXyxx> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(SzptXyzhXyxx::getId, szptXyzhXyxx.getId());
+        return szptXyzhXyxxMapper.update(szptXyzhXyxx,wrapper);
+    }
+
+    public Integer deleteSzptXyzhXyxx(CommonDelDTO commonDelDTO) {
+        LambdaQueryWrapper<SzptXyzhXyxx> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SzptXyzhXyxx::getId, commonDelDTO);
+        return szptXyzhXyxxMapper.delete(wrapper);
+    }
 }