From 38e8e14cd5a79e870d21155385b365157783c92f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 Aug 2022 09:41:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B1=85=E6=B0=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/DelIcResiUserFormDTO.java | 1 + .../com/epmet/controller/IcResiUserController.java | 1 + .../src/main/java/com/epmet/dao/IcResiUserDao.java | 4 ++-- .../com/epmet/dao/IcUserChangeDetailedDao.java | 2 +- .../java/com/epmet/dao/IcUserChangeRecordDao.java | 2 +- .../com/epmet/dao/IcUserTransferRecordDao.java | 3 ++- .../epmet/service/IcUserChangeDetailedService.java | 2 +- .../epmet/service/IcUserChangeRecordService.java | 2 +- .../epmet/service/IcUserTransferRecordService.java | 2 +- .../epmet/service/impl/IcResiUserServiceImpl.java | 10 +++++----- .../impl/IcUserChangeDetailedServiceImpl.java | 4 ++-- .../impl/IcUserChangeRecordServiceImpl.java | 4 ++-- .../impl/IcUserTransferRecordServiceImpl.java | 4 ++-- .../src/main/resources/mapper/IcResiUserDao.xml | 14 +++++++++++--- .../resources/mapper/IcUserChangeDetailedDao.xml | 7 +++++-- .../resources/mapper/IcUserChangeRecordDao.xml | 7 +++++-- .../resources/mapper/IcUserTransferRecordDao.xml | 7 +++++-- 17 files changed, 48 insertions(+), 28 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java index 98526ad993..f4d0b7c1dc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java @@ -29,5 +29,6 @@ public class DelIcResiUserFormDTO implements Serializable { private String customerId; private String formCode= IcFormCodeEnum.RESI_BASE_INFO.getCode(); + private String currentStaffId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 40e661a63b..3e268bf8d9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -200,6 +200,7 @@ public class IcResiUserController implements ResultDataResolver { @PostMapping("delete") public Result delete(@LoginUser TokenDto tokenDto, @RequestBody DelIcResiUserFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setCurrentStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, DelIcResiUserFormDTO.IdGroup.class); formDTO.getUserIds().forEach(userId -> { formDTO.setIcResiUserId(userId); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index ae94fe4ec2..1fedc84df4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -96,9 +96,9 @@ public interface IcResiUserDao extends BaseDao { @Param("icResiUserId") String icResiUserId, @Param("subTableName") String subTableName); - int updateToDel(String icResiUserId); + int updateToDel(@Param("icResiUserId") String icResiUserId,@Param("currentStaffId") String currentStaffId); - int updateSubTableToDel(@Param("subTalbeName") String subTalbeName, @Param("icResiUserId") String icResiUserId); + int updateSubTableToDel(@Param("subTalbeName") String subTalbeName, @Param("icResiUserId") String icResiUserId,@Param("currentStaffId")String currentStaffId); /** * 接口名称 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java index bee24287c5..4fa9fd0540 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java @@ -40,5 +40,5 @@ public interface IcUserChangeDetailedDao extends BaseDao icUserIds); - int deleteByIcResiUserId(String icResiUserId); + int deleteByIcResiUserId(@Param("icResiUserId")String icResiUserId,@Param("currentStaffId")String currentStaffId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java index 89ee1327f2..9c171f54f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java @@ -50,5 +50,5 @@ public interface IcUserChangeRecordDao extends BaseDao **/ void delByCustomerId(@Param("customerId") String customerId, @Param("type") String type, @Param("icUserIds") List icUserIds); - int deleteByIcResiUserId(String icResiUserId); + int deleteByIcResiUserId(@Param("icResiUserId") String icResiUserId,@Param("currentStaffId")String currentStaffId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java index a869491b26..2042361b4c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserTransferRecordDao.java @@ -20,6 +20,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcUserTransferRecordEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 居民调动记录表 @@ -30,5 +31,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface IcUserTransferRecordDao extends BaseDao { - int deleteByIcResiUserId(String icResiUserId); + int deleteByIcResiUserId(@Param("icResiUserId") String icResiUserId, @Param("currentStaffId")String currentStaffId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java index cf305c4b0a..2b164723f8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java @@ -37,5 +37,5 @@ public interface IcUserChangeDetailedService extends BaseService icUserIds); - int deleteByIcResiUserId(String icResiUserId); + int deleteByIcResiUserId(String icResiUserId,String currentStaffId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java index fa68cd34da..620c786e5f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java @@ -55,5 +55,5 @@ public interface IcUserChangeRecordService extends BaseService> subTableRes = operCustomizeOpenFeignClient.queryIcResiSubTables(queryDTO); if (subTableRes.success() && !CollectionUtils.isEmpty(subTableRes.getData())) { for (String subTalbeName : subTableRes.getData()) { - baseDao.updateSubTableToDel(subTalbeName, formDTO.getIcResiUserId()); + baseDao.updateSubTableToDel(subTalbeName, formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); } } //删除ic_user_transfer_record、ic_user_change_record、ic_user_change_detailed - icUserTransferRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId()); - icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId()); - icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId()); + icUserTransferRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); + icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); + icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId()); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java index 7cf719e48d..060eab7ba7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java @@ -45,7 +45,7 @@ public class IcUserChangeDetailedServiceImpl extends BaseServiceImpl - - update ic_resi_user set del_flag='1',UPDATED_TIME = now() where id=#{icResiUserId} + + update ic_resi_user + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} + where id = #{icResiUserId} - update ${subTalbeName} set del_flag='1',UPDATED_TIME = now() where IC_RESI_USER=#{icResiUserId} + update ${subTalbeName} + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} + where IC_RESI_USER=#{icResiUserId} update diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml index 6edda514fe..c2a8804395 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml @@ -15,8 +15,11 @@ - - update ic_user_change_detailed set del_flag='1' + + update ic_user_change_detailed + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} where IC_USER_ID=#{icResiUserId} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml index cc865efc81..4b7203f075 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml @@ -73,8 +73,11 @@ - - update ic_user_change_record set del_flag='1' + + update ic_user_change_record + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} where IC_USER_ID = #{icResiUserId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml index d2a829567e..2729a66899 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml @@ -3,8 +3,11 @@ - - update ic_user_transfer_record set del_flag='1' + + update ic_user_transfer_record + set del_flag='1', + UPDATED_TIME = now(), + UPDATED_BY = #{currentStaffId} where IC_USER_ID = #{icResiUserId} \ No newline at end of file