删除居民信息，更新时间，更新用户

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;
 }
 

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);

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -96,9 +96,9 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                     @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);
 
     /**
      * 接口名称

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeDetailedDao.java

@@ -40,5 +40,5 @@ public interface IcUserChangeDetailedDao extends BaseDao<IcUserChangeDetailedEnt
      **/
     void delByCustomerId(@Param("customerId") String customerId, @Param("type") String type, @Param("icUserIds") List<String> icUserIds);
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(@Param("icResiUserId")String icResiUserId,@Param("currentStaffId")String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcUserChangeRecordDao.java

@@ -50,5 +50,5 @@ public interface IcUserChangeRecordDao extends BaseDao<IcUserChangeRecordEntity>
      **/
     void delByCustomerId(@Param("customerId") String customerId, @Param("type") String type, @Param("icUserIds") List<String> icUserIds);
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(@Param("icResiUserId") String icResiUserId,@Param("currentStaffId")String currentStaffId);
 }

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<IcUserTransferRecordEntity> {
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(@Param("icResiUserId") String icResiUserId, @Param("currentStaffId")String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeDetailedService.java

@@ -37,5 +37,5 @@ public interface IcUserChangeDetailedService extends BaseService<IcUserChangeDet
      **/
     void delByCustomerId(String customerId, String type, List<String> icUserIds);
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(String icResiUserId,String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserChangeRecordService.java

@@ -55,5 +55,5 @@ public interface IcUserChangeRecordService extends BaseService<IcUserChangeRecor
      **/
     void icUserChangeRecordInit(IcUserChangeRecordInitFormDTO formDTO) throws ParseException;
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(String icResiUserId,String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java

@@ -48,5 +48,5 @@ public interface IcUserTransferRecordService extends BaseService<IcUserTransferR
      */
     void moveResi(IcResiUserTransferFormDTO formDTO);
 
-    int deleteByIcResiUserId(String icResiUserId);
+    int deleteByIcResiUserId(String icResiUserId,String currentStaffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -176,18 +176,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(DelIcResiUserFormDTO formDTO) {
-        baseDao.updateToDel(formDTO.getIcResiUserId());
+        baseDao.updateToDel(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
         CustomerFormQueryDTO queryDTO = ConvertUtils.sourceToTarget(formDTO, CustomerFormQueryDTO.class);
         Result<Set<String>> 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());
+        icUserTransferRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
-        icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId());
+        icUserChangeRecordService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
-        icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId());
+        icUserChangeDetailedService.deleteByIcResiUserId(formDTO.getIcResiUserId(),formDTO.getCurrentStaffId());
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeDetailedServiceImpl.java

@@ -45,7 +45,7 @@ public class IcUserChangeDetailedServiceImpl extends BaseServiceImpl<IcUserChang
     }
 
     @Override
-    public int deleteByIcResiUserId(String icResiUserId) {
+    public int deleteByIcResiUserId(String icResiUserId,String currentStaffId) {
-        return baseDao.deleteByIcResiUserId(icResiUserId);
+        return baseDao.deleteByIcResiUserId(icResiUserId,currentStaffId);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java

@@ -172,8 +172,8 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
     }
 
     @Override
-    public int deleteByIcResiUserId(String icResiUserId) {
+    public int deleteByIcResiUserId(String icResiUserId,String currentStaffId) {
-        return baseDao.deleteByIcResiUserId(icResiUserId);
+        return baseDao.deleteByIcResiUserId(icResiUserId,currentStaffId);
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java

@@ -412,8 +412,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
     }
 
     @Override
-    public int deleteByIcResiUserId(String icResiUserId) {
+    public int deleteByIcResiUserId(String icResiUserId,String currentStaffId) {
-        return baseDao.deleteByIcResiUserId(icResiUserId);
+        return baseDao.deleteByIcResiUserId(icResiUserId,currentStaffId);
     }
 
 

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -221,12 +221,20 @@
         IC_RESI_USER.ID ASC
     </select>
 
-    <update id="updateToDel" parameterType="java.lang.String">
+    <update id="updateToDel" parameterType="map">
-        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>
 
     <update id="updateSubTableToDel" parameterType="map">
-        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>
     <update id="updateIcResiUserByIdCard">
         update

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeDetailedDao.xml

@@ -15,8 +15,11 @@
         </foreach>
     </delete>
 
-    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
+    <update id="deleteByIcResiUserId" parameterType="map">
-        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}
     </update>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml

@@ -73,8 +73,11 @@
         </foreach>
     </delete>
 
-    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
+    <update id="deleteByIcResiUserId" parameterType="map">
-        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}
     </update>
 

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserTransferRecordDao.xml

@@ -3,8 +3,11 @@
 
 <mapper namespace="com.epmet.dao.IcUserTransferRecordDao">
 
-    <update id="deleteByIcResiUserId" parameterType="java.lang.String">
+    <update id="deleteByIcResiUserId" parameterType="map">
-        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}
     </update>
 </mapper>