个人数据

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

@@ -78,4 +78,10 @@ public class PersonDataResultDTO implements Serializable {
      */
     @JsonIgnore
     private String isVolunteer;
+
+    @JsonIgnore
+    private String customerId;
+
+    @JsonIgnore
+    private String gridId;
 }

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

@@ -31,7 +31,9 @@ import com.epmet.commons.tools.enums.HouseTypeEnum;
 import com.epmet.commons.tools.enums.RelationshipEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -496,12 +498,33 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         // 志愿者处理
         if (personData.getIsVolunteer().equals(NumConstant.ONE_STR)){
-            List<String> volunteers = baseDao.selectVolunteerByUserId(formDTO.getUserId());
+            List<String> volunteerList = baseDao.selectVolunteerByUserId(formDTO.getUserId());
-            volunteers.forEach(v -> {
+            if (!CollectionUtils.isEmpty(volunteerList)){
-
+                List<String> volunteers = new ArrayList<>();
+                List<String> finalVolunteers = volunteers;
+                volunteerList.forEach(v -> {
+                    List<String> collect = Arrays.stream(v.split(",")).collect(Collectors.toList());
+                    finalVolunteers.addAll(collect);
                 });
+                volunteers = volunteers.stream().distinct().collect(Collectors.toList());
+                // 去customize 查询志愿者类别
+                Result<List<String>> volunteerResult = operCustomizeOpenFeignClient.volunteerLabelByValues(volunteers, personData.getCustomerId());
+                if (!volunteerResult.success()){
+                    throw new RenException("查询志愿者类别失败...");
                 }
-        // TODO
+                personData.setVolunteerCategory(volunteerResult.getData());
+            }
+        }
+        // 网格名
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(personData.getGridId());
+        if (null != gridInfo){
+            personData.setGridName(gridInfo.getGridNamePath());
+        }
+        /**
+         * 人员类别
+         * 先查询customize配置的
+         * 再根据配置去查询字段
+         */
         return personData;
     }
 

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

@@ -153,6 +153,10 @@
     <resultMap id="selectPersonData" type="com.epmet.dto.result.PersonDataResultDTO">
         <result column="GZDW" property="workUnit"/>
         <result column="ID_CARD" property="idCard"/>
+        <result column="name" property="name"/>
+        <result column="isVolunteer" property="isVolunteer"/>
+        <result column="CUSTOMER_ID" property="customerId"/>
+        <result column="GRID_ID" property="gridId"/>
         <collection property="financialSituation" ofType="com.epmet.dto.FinancialSituationDTO">
             <result column="YSR" property="monthlyIncome"/>
             <result column="TXJE" property="retirementAmount"/>
@@ -160,11 +164,14 @@
     </resultMap>
     <select id="personData" resultMap="selectPersonData">
         SELECT
-            GZDW AS workUnit,
+            GZDW,
             name,
             YSR,
             TXJE,
-            ID_CARD
+            ID_CARD,
+            IFNULL(IS_VOLUNTEER,'0') AS isVolunteer,
+            CUSTOMER_ID,
+            GRID_ID
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND ID = #{userId}