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

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

@@ -103,7 +103,8 @@
 			tui.profile,
 			tui.certificate_num certificateNum,
 			tui.post_name postName,
-			tui.phone
+			tui.phone,
+			tui.equip_type equipType
 		FROM
 			tzs_user_info tui
 		where
@@ -117,6 +118,9 @@
 		<if test="map.post != null and map.post != ''">
 			AND tui.post LIKE concat ( '%', #{map.post}, '%' )
 		</if>
+		<if test="map.equipType != null and map.equipType != ''">
+			AND tui.equip_type LIKE concat ( '%', #{map.equipType}, '%' )
+		</if>
 	</select>
 	<select id="getPostList" resultType="java.util.Map">
 		SELECT

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/EnterpriseBizByTCMServiceImpl.java

@@ -28,8 +28,10 @@ import com.yeejoin.amos.boot.module.statistics.api.mapper.EnterpriseBizMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.PlanTaskMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsBaseInstitutionMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.BaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.BaseUnitLicenceMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.ymt.flc.api.dto.RegUnitInfoDto;
@@ -86,6 +88,8 @@ public class EnterpriseBizByTCMServiceImpl {
 
     private PlanTaskMapper planTaskMapper;
 
+    private EquipmentCategoryMapper equipmentCategoryMapper;
+
     public EnterpriseBizByTCMServiceImpl(RedisUtils redisUtils, StCommonServiceImpl stCommonService,
                                          TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper,
                                          EnterpriseBizMapper enterpriseBizMapper,
@@ -95,7 +99,8 @@ public class EnterpriseBizByTCMServiceImpl {
                                          BaseUnitLicenceMapper baseUnitLicenceMapper,
                                          RegUnitInfoMapper regUnitInfoMapper,
                                          RegUnitIcMapper regUnitIcMapper,
-                                         PlanTaskMapper planTaskMapper) {
+                                         PlanTaskMapper planTaskMapper,
+                                         EquipmentCategoryMapper equipmentCategoryMapper) {
         this.redisUtils = redisUtils;
         this.stCommonService = stCommonService;
         this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
@@ -107,6 +112,7 @@ public class EnterpriseBizByTCMServiceImpl {
         this.regUnitInfoMapper = regUnitInfoMapper;
         this.regUnitIcMapper = regUnitIcMapper;
         this.planTaskMapper = planTaskMapper;
+        this.equipmentCategoryMapper = equipmentCategoryMapper;
     }
 
     public Map<String, Object> getInfoByUseCodeMap(String useCode) {
@@ -441,6 +447,23 @@ public class EnterpriseBizByTCMServiceImpl {
 
     public Page<Map<String,Object>> getPersonPage(JSONObject map, Page page) {
         Page<Map<String, Object>> result = planTaskMapper.getPersonPage(page, map);
+        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;
     }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json

@@ -139,6 +139,7 @@
       "keyParams": [
         { "key": "unitType", "label": "单位类型" },
         { "key": "useUnit", "label": "单位名称" },
+        { "key": "useUnitCertificate", "label": "证件类型" },
         { "key": "useUnitCode", "label": "证件号码" },
         { "key": "governingBody", "label": "管辖机构" },
         { "key": "address", "label": "地址" },