工作端/居民端-新增家庭成员添加变动记录

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java

@@ -74,10 +74,10 @@ public class MyHomeController {
      * @params [dto]
      */
     @PostMapping("addMember")
-    public Result addMember(@RequestBody IcResiUserConfirmSubmitDTO dto) {
+    public Result addMember(@LoginUser TokenDto tokenDto,@RequestBody IcResiUserConfirmSubmitDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        return icResiUserService.addMember(dto);
+        return icResiUserService.addMember(tokenDto,dto);
     }
 
     /**

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

@@ -396,7 +396,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @date 2022/6/6 10:36
      * @params [dto]
      */
-    Result addMember(IcResiUserConfirmSubmitDTO dto);
+    Result addMember(TokenDto tokenDto,IcResiUserConfirmSubmitDTO dto);
 
     /**
      * @return com.epmet.commons.tools.utils.Result

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

@@ -145,6 +145,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
     @Resource
     private UserBaseInfoDao userBaseInfoDao;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
@@ -2319,7 +2323,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     @Override
-    public Result addMember(IcResiUserConfirmSubmitDTO dto) {
+    public Result addMember(TokenDto tokenDto,IcResiUserConfirmSubmitDTO dto) {
         IcResiUserEntity user = icResiUserDao.selectById(dto.getIcResiUserId());
 
         IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), user.getCustomerId());
@@ -2352,6 +2356,23 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
         insert(entity);
 
+        //变更记录表
+        IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
+        changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
+        changeRecordEntity.setOperatorId(tokenDto.getUserId());//userId
+        changeRecordEntity.setIcUserId(entity.getId());
+        Result<ResiUserBaseInfoResultDTO> userResult = epmetUserOpenFeignClient.selectUserBaseInfo(tokenDto);
+        if (!userResult.success()){
+            throw new EpmetException("查询用户信息失败...");
+        }
+        changeRecordEntity.setOperatorName(userResult.getData().getRealName());
+        changeRecordEntity.setIcUserName(entity.getName());
+        changeRecordEntity.setType("add");
+        changeRecordEntity.setTypeName("新增");
+        changeRecordEntity.setBeforeChangeName("-");
+        changeRecordEntity.setAfterChangeName("-");
+        changeRecordEntity.setChangeTime(new java.util.Date());
+        icUserChangeRecordService.insert(changeRecordEntity);
         return new Result().ok("新增成功");
     }
 
@@ -2429,6 +2450,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
         insert(entity);
 
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getStaffId());
+        //变更记录表
+        IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
+        changeRecordEntity.setCustomerId(dto.getCustomerId());
+        changeRecordEntity.setOperatorId(dto.getStaffId());
+        changeRecordEntity.setIcUserId(entity.getId());
+        changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
+        changeRecordEntity.setIcUserName(entity.getName());
+        changeRecordEntity.setType("add");
+        changeRecordEntity.setTypeName("新增");
+        changeRecordEntity.setBeforeChangeName("-");
+        changeRecordEntity.setAfterChangeName("-");
+        changeRecordEntity.setChangeTime(new java.util.Date());
+        icUserChangeRecordService.insert(changeRecordEntity);
+
         return new Result().ok("新增成功");
     }