From ac570f2d15d7efc812befaafd96c0f2bc1b3b683 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 1 Nov 2022 15:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=B1=85=E6=B0=91=E7=9A=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=B0=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E5=88=A0=E9=99=A4=E8=AF=A5=E5=B1=85=E6=B0=91=E7=9A=84?= =?UTF-8?q?=E8=BF=81=E5=87=BA=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B9=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=EF=BC=9B=E5=BD=93?= =?UTF-8?q?=E8=BF=81=E5=87=BA=E7=9A=84=E5=B1=85=E6=B0=91=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E8=A2=AB=E8=BF=81=E5=85=A5=EF=BC=8C=E5=88=99=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/ChangeRelocationDTO.java | 5 +++ ...hRecordFormDTO.java => OnlyIdFormDTO.java} | 2 +- .../ChangeRelocationController.java | 15 +++++++ .../controller/IcBirthRecordController.java | 4 +- .../controller/IcMoveInRecordController.java | 9 +++++ .../service/ChangeRelocationService.java | 10 +++++ .../impl/ChangeRelocationServiceImpl.java | 40 +++++++++++++++++++ .../resources/mapper/ChangeRelocationDao.xml | 1 + 8 files changed, 83 insertions(+), 3 deletions(-) rename epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/{DeleteIcBirthRecordFormDTO.java => OnlyIdFormDTO.java} (86%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java index dd632ca671..7db30e392b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java @@ -29,6 +29,11 @@ public class ChangeRelocationDTO implements Serializable { */ private String icResiUserId; + /** + * ic_resi_user 用户状态 + */ + private String status; + /** * 姓名 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java similarity index 86% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java index 9cc3dd05fe..3e2501850d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DeleteIcBirthRecordFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OnlyIdFormDTO.java @@ -13,7 +13,7 @@ import java.util.List; * @dscription */ @Data -public class DeleteIcBirthRecordFormDTO implements Serializable { +public class OnlyIdFormDTO implements Serializable { private static final long serialVersionUID = -5220529162950147825L; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java index 1b84302742..6ac14fec7c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ChangeRelocationDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.ChangeRelocationExcel; import com.epmet.service.ChangeRelocationService; import org.apache.commons.collections4.CollectionUtils; @@ -144,4 +145,18 @@ public class ChangeRelocationController { return new Result(); } + /** + * 恢复迁出人员 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("recovery") + public Result recovery(@LoginUser TokenDto tokenDto,@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + changeRelocationService.recovery(tokenDto,dto); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java index b8ba028d4c..b9229eea74 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java @@ -24,7 +24,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcBirthRecordDTO; import com.epmet.dto.form.BirthRecordFormDTO; import com.epmet.dto.form.BirthRecordUpdateDTO; -import com.epmet.dto.form.DeleteIcBirthRecordFormDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.excel.IcBirthRecordExcel; import com.epmet.service.IcBirthRecordService; import lombok.extern.slf4j.Slf4j; @@ -94,7 +94,7 @@ public class IcBirthRecordController { } @PostMapping("deleteById") - public Result deleteById(@RequestBody DeleteIcBirthRecordFormDTO dto) { + public Result deleteById(@RequestBody OnlyIdFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icBirthRecordService.deleteById(dto.getId()); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java index 18c40e286e..b11e6e369c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcMoveInRecordController.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcMoveInRecordDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.dto.form.IcMoveInAddEditFormDTO; import com.epmet.dto.form.IcMoveInListFormDTO; import com.epmet.dto.result.IcMoveInListResultDTO; @@ -95,6 +96,14 @@ public class IcMoveInRecordController { return new Result(); } + @PostMapping("deleteById") + public Result deleteById(@RequestBody OnlyIdFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icMoveInRecordService.deleteById(dto.getId()); + return new Result(); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody IcMoveInListFormDTO formDTO, HttpServletResponse response) throws IOException { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java index 150fc05fa0..fb87579a59 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java @@ -2,8 +2,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.ChangeRelocationDTO; +import com.epmet.dto.form.OnlyIdFormDTO; import com.epmet.entity.ChangeRelocationEntity; import java.util.List; @@ -105,4 +107,12 @@ public interface ChangeRelocationService extends BaseService page(Map params) { @@ -342,6 +352,36 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl