1.公司详情增加证件类型

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml

@@ -116,7 +116,8 @@
 			tui.certificate_num certificateNum,
 			tui.unit_name unitName,
 			tui.post_name postName,
-			tui.phone
+			tui.phone,
+			tui.equip_type equipType
 		FROM
 			tzs_user_info tui
 		LEFT JOIN tz_base_enterprise_info bei ON tui.unit_code = bei.use_code
@@ -146,6 +147,12 @@
 		<if test="paramDto.unitName != null and paramDto.unitName != ''">
 			AND tui.unit_name LIKE concat ( '%', #{paramDto.unitName}, '%' )
 		</if>
+		<if test="paramDto.equipType != null and paramDto.equipType != ''">
+			AND tui.equip_type LIKE concat ( '%', #{paramDto.equipType}, '%' )
+		</if>
+		<if test="paramDto.phone != null and paramDto.phone != ''">
+			AND tui.phone LIKE concat ( '%', #{paramDto.phone}, '%' )
+		</if>
 	</select>
     <select id="count" resultType="java.lang.Integer">
 		select count(1) from idx_biz_jg_other_info where INFORMATION_SITUATION NOTNULL

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -1145,6 +1146,23 @@ public class ZLDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(regionCode);
         List<String> unitTypeList = UnitTypeEnum.getNameListByType(paramDto.getCompanyType());
         Page<Map<String, Object>> result = screenMapper.getPersonPage(page, paramDto, orgCode, unitTypeList);
+        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
+        Map<String,String> equipType = new HashMap<>();
+        for(EquipmentCategoryDto dto : equipmentCategoryDtos){
+            equipType.put(dto.getCode(),dto.getName());
+        }
+        for(Map<String,Object> m : result.getRecords()){
+            if(StrUtil.isNotEmpty((String) m.get("equipType"))){
+                JSONArray array = JSONArray.parseArray(m.get("equipType")+"");
+                array.forEach(t->{
+                    if(StrUtil.isEmpty((String) m.get("equipTypeName"))){
+                        m.put("equipTypeName",equipType.get(t+""));
+                    }else{
+                        m.put("equipTypeName",m.get("equipTypeName")+"/"+equipType.get(t+""));
+                    }
+                });
+            }
+        }
         return result;
     }