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