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

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

@@ -88,8 +88,8 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         return ConvertUtils.sourceToTarget(entityList, ChangeRelocationDTO.class);
     }
 
-    private QueryWrapper<ChangeRelocationEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<ChangeRelocationEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
         String name = (String) params.get("name");
         String idCard = (String) params.get("idCard");
         String mobile = (String) params.get("mobile");
@@ -165,22 +165,24 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         entity.setAgencyId(dto.getGridId());
         entity.setAgencyName(dto.getGridName());
         entity.setAge(IdCardNoValidatorUtils.getAge(result.getIdCard()).toString());
-        entity.setAddress(dto.getVillageName()+dto.getBuildName()+dto.getUnitName()+dto.getHomeName());
+        entity.setAddress(dto.getVillageName() + dto.getBuildName() + dto.getUnitName() + dto.getHomeName());
         insert(entity);
 
         //享受福利
-        if(dto.getWelfareFlag() != null && dto.getWelfareFlag()){
+        if (dto.getWelfareFlag() != null && dto.getWelfareFlag()) {
             ChangeWelfareDTO formDto = new ChangeWelfareDTO();
             formDto.setUserId(dto.getIcUserId());
             formDto.setName(dto.getName());
             formDto.setIdCard(result.getIdCard());
             formDto.setMobile(result.getMobile());
             formDto.setGridId(result.getGridId());
-            if(StringUtils.isNotBlank(dto.getGender())){
-                if("女".equals(dto.getGender())){
+            if (StringUtils.isNotBlank(dto.getGender())) {
+                if ("女".equals(dto.getGender())) {
                     formDto.setGender("0");
-                }else if("男".equals(dto.getGender())){
+                } else if ("男".equals(dto.getGender())) {
                     formDto.setGender("1");
+                } else {
+                    formDto.setGender("2");
                 }
             }
             formDto.setJoinReason("迁出人员选定");
@@ -194,7 +196,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         userEntity.setSubStatus(IcResiUserSubStatusEnum.MOVE_OUT.getSubStatus());//迁出
         icResiUserService.updateById(userEntity);
         //插入变更主表、变更明细表
-        IcResiUserTransferFormDTO icResiUserTransferFormDTO=ConvertUtils.sourceToTarget(dto,IcResiUserTransferFormDTO.class);
+        IcResiUserTransferFormDTO icResiUserTransferFormDTO = ConvertUtils.sourceToTarget(dto, IcResiUserTransferFormDTO.class);
         icResiUserTransferFormDTO.setNewAgencyId(dto.getAgencyId());
         icResiUserTransferFormDTO.setNewGridId(dto.getGridId());
         icResiUserTransferFormDTO.setNewNeighborHoodId(dto.getVillageId());

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

@@ -150,6 +150,7 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao,
             return new Result().error("该人员已经迁入福利人口");
         }
         dto.setJoinDate(DateUtils.format(new Date()));
+        dto.setId(StringUtils.EMPTY);
         ChangeWelfareEntity entity = ConvertUtils.sourceToTarget(dto, ChangeWelfareEntity.class);
         insert(entity);
         return new Result();