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/processor/MaskProcessor.java

@@ -13,8 +13,10 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
+/**
+ * desc:脱敏处理器
+ */
 @Slf4j
 public class MaskProcessor {
 
@@ -42,20 +44,15 @@ public class MaskProcessor {
 
         if (object instanceof Result) {
             mask(((Result<?>) object).getData());
-            return;
         } else if (object instanceof PageData) {
             mask(((PageData<?>) object).getList());
-            return;
         } else if (object instanceof List) {
             ((List)object).forEach(e -> mask(e));
-            return;
         } else if (object instanceof Map) {
             maskMap((Map) object);
-            return;
         } else if (object.getClass().getName().startsWith(EPMET_PACKAGE_PREFIX)) {
             // 自定义bean，走反射
             maskEpmetBean(object);
-            return;
         }
     }
 
@@ -77,14 +74,12 @@ public class MaskProcessor {
             if (value != null && value.getClass().getName().startsWith(EPMET_PACKAGE_PREFIX)) {
                 // 是epmet的对象
                 maskEpmetBean(value);
-                continue;
             } else if (value instanceof String) {
                 int index = fieldNames.indexOf(key);
                 if (index != -1) {
                     String maskResult = maskString((String) value, fieldsMaskType.get(index));
                     entry.setValue(maskResult);
                 }
-                continue;
             }
         }
     }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -613,7 +613,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId);
         CustomerAgencyDTO res= ConvertUtils.sourceToTarget(customerAgencyEntity,CustomerAgencyDTO.class);
         //设置行政地区编码全路径
-        if (StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) {
+        if (null != res && StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) {
             res.setAreaCodePath(queryAreaCodePath(res));
         }
         return res;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java

@@ -37,7 +37,7 @@ public class HouseMemberResultDTO implements Serializable {
     @ExcelProperty(value = {"房屋信息","所属楼栋"},index = 4)
     private String buildingName;
     @ExcelProperty(value = {"房屋信息","单元"},index = 5)
-    private String unitName;
+    private String unitNum;
     /**
      * 门牌号
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java

@@ -49,7 +49,7 @@ public class IcHouseListResultDTO implements Serializable {
      */
     private String buildingName;
     /**
-     * 单元号
+     * 单元号_单元
      */
     private String unitNum;
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -604,14 +604,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
 
         PageData<IcHouseListResultDTO> houseData = this.getHouseList(formDTO);
-        List<HouseMemberResultDTO> resultDTOS = ConvertUtils.sourceToTarget(houseData.getList(), HouseMemberResultDTO.class);
 
         List<HouseMemberResultDTO> resultList = new ArrayList<>();
         PageData<HouseMemberResultDTO> result = new PageData<>(resultList,houseData.getList().size());
         int finalSearchLevel = searchLevel;
         AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize());
 
-        resultDTOS.stream().forEach(o ->{
+        houseData.getList().forEach(o ->{
 
             resiParam.setNeighborHoodId(o.getNeighborHoodId());
             if (finalSearchLevel == 1){
@@ -641,7 +640,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                 resultDTO.setGridName(o.getGridName());
                 resultDTO.setNeighborHoodName(o.getNeighborHoodName());
                 resultDTO.setBuildingName(o.getBuildingName());
-                resultDTO.setUnitName(o.getUnitName());
+                resultDTO.setUnitNum(o.getUnitNum());
                 resultDTO.setDoorName(o.getDoorName());
                 resultDTO.setHouseType(o.getHouseType());
                 resultDTO.setPurpose(o.getPurpose());

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordFormDTO.java

@@ -69,9 +69,4 @@ public class BirthRecordFormDTO extends PageFormDTO implements Serializable {
      * 是否福利
      */
     private String isWelfare;
-
-    /**
-     * 是否分页
-     */
-    private Boolean isPage;
 }

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

@@ -24,7 +24,7 @@ import java.util.Map;
 
 
 /**
- * 合同表
+ * 人员迁出表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-06

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

@@ -5,7 +5,7 @@ import com.epmet.entity.ChangeRelocationEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 合同表
+ * 人员迁出表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-06

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

@@ -44,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 合同表
+ * 人员迁出表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-06
@@ -72,7 +72,6 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
     private IcResiUserService icResiUserService;
 
 
-
     @Override
     public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
         IPage<ChangeRelocationEntity> page = baseDao.selectPage(
@@ -182,6 +181,8 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
                     formDto.setGender("0");
                 } else if ("男".equals(dto.getGender())) {
                     formDto.setGender("1");
+                } else {
+                    formDto.setGender("2");
                 }
             }
             formDto.setJoinReason("迁出人员选定");

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