Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -254,6 +254,7 @@ public enum EpmetErrorCode {
 	IC_NAT_IDCARD_NATTIME(8923,"已存在相同记录"),
 	IC_NAT(8924,"平台已存在记录，请去修改原有记录"),
 	RESI_IC_NAT(8925,"已存在记录，请联系社区工作人员修改"),
+	IC_MOVE_IN(8926,"居民信息中房屋信息与当前选择房屋不一致，是否更新？"),
 
 
 	//通用错误码 start

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java

@@ -1,5 +1,7 @@
 package com.epmet.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -67,6 +69,8 @@ public class ChangeDeathDTO implements Serializable {
     /**
      * 死亡时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JSONField(format = "yyyy-MM-dd")
     private Date deathDate;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java

@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.validator.group.AddGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -135,6 +137,10 @@ public class IcMoveInListResultDTO implements Serializable {
          * 来源地区地址
          */
         private String sourceAddress;
+        /**
+         * 详细地址
+         */
+        private String address;
 
         /**
          * 迁移证号码

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

@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -36,6 +37,7 @@ public class ChangeDeathController {
     private ChangeDeathService changeDeathService;
 
     @RequestMapping("page")
+    @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     public Result<PageData<ChangeDeathDTO>> page(@RequestParam Map<String, Object> params){
         PageData<ChangeDeathDTO> page = changeDeathService.page(params);
         return new Result<PageData<ChangeDeathDTO>>().ok(page);

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

@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -36,6 +37,7 @@ public class ChangeRelocationController {
     private ChangeRelocationService changeRelocationService;
 
     @RequestMapping("page")
+    @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     public Result<PageData<ChangeRelocationDTO>> page(@RequestParam Map<String, Object> params){
         PageData<ChangeRelocationDTO> page = changeRelocationService.page(params);
         return new Result<PageData<ChangeRelocationDTO>>().ok(page);

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

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.MaskResponse;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -35,6 +36,7 @@ public class ChangeWelfareController {
     private ChangeWelfareService changeWelfareService;
 
     @RequestMapping("page")
+    @MaskResponse(fieldNames = {"mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     public Result<PageData<ChangeWelfareDTO>> page(@RequestParam Map<String, Object> params){
         PageData<ChangeWelfareDTO> page = changeWelfareService.page(params);
         return new Result<PageData<ChangeWelfareDTO>>().ok(page);

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

@@ -165,9 +165,10 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
         }
 
         //3.判断是否需要更新居民信息
-        if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
+        if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
+                && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())
                 && StringUtils.isNotBlank(formDTO.getIsReplace()) && !"0".equals(formDTO.getIsReplace()) && !"1".equals(formDTO.getIsReplace())) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民信息中房屋信息与当前选择房屋不一致，是否更新？");
+            throw new EpmetException(EpmetErrorCode.IC_MOVE_IN.getCode(), EpmetErrorCode.IC_MOVE_IN.getMsg());
         }
 
         //4.勾选了补充居民信息且选择了更新信息的