Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -1506,7 +1506,9 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public Object updateHistory(Map<String, Object> map) {
         String historyEquType = (String) map.get(HISTORY_EQU_TYPE);
+        String historySubmitType = (String) map.get(HISTORY_SUBMIT_TYPE);
         JSONObject jsonObject = new JSONObject(map);
+        jsonObject.put("historySubmitType", historySubmitType);
         switch (historyEquType) {
             case "unit":
 //                return jgUseRegistrationServiceImpl.handleUnitHistoryEquip(jsonObject);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -689,9 +689,19 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                     .map(JgVehicleInformationEq::getEquId)
                     .collect(Collectors.toList());
             if (CollUtil.isNotEmpty(records)) {
-                vo.setEquipmentLists(this.baseMapper.queryForUnitVesselEquipment(sequenceNbr, records).stream()
-                        .peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
-                        .collect(Collectors.toList()));
+                Map<String, Object> mediumMap = getFillingMediumMap();
+                List<Map<String, Object>> equipmentList = this.baseMapper
+                        .queryForUnitVesselEquipment(sequenceNbr, records)
+                        .stream()
+                        .peek(item -> {
+                            String key = Objects.toString(item.get("chargingMedium"), "");
+                            mediumMap.getOrDefault(key, null); // 提前获取映射
+                            if (mediumMap.containsKey(key)) {
+                                item.put("chargingMedium", mediumMap.get(key));
+                            }
+                        })
+                        .collect(Collectors.toList());
+                vo.setEquipmentLists(equipmentList);
             }
         } else {
             // 完成及已作废时显示历史数据详情
@@ -702,11 +712,19 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                         .map(JgVehicleInformationEq::getEquId)
                         .collect(Collectors.toList());
                 if (CollUtil.isNotEmpty(records)) {
-                    vo.setEquipmentLists(
-                            this.baseMapper.queryForUnitVesselEquipment(sequenceNbr, records).stream()
-                                    .peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
-                                    .collect(Collectors.toList())
-                    );
+                    Map<String, Object> mediumMap = getFillingMediumMap(); // 假设返回的是 Map<String, String>
+                    List<Map<String, Object>> equipmentList = this.baseMapper
+                            .queryForUnitVesselEquipment(sequenceNbr, records)
+                            .stream()
+                            .peek(item -> {
+                                String key = Objects.toString(item.get("chargingMedium"), "");
+                                mediumMap.getOrDefault(key, null); // 提前获取映射
+                                if (mediumMap.containsKey(key)) {
+                                    item.put("chargingMedium", mediumMap.get(key));
+                                }
+                            })
+                            .collect(Collectors.toList());
+                    vo.setEquipmentLists(equipmentList);
                 }
             } else {
                 List equList = objects.toJavaList(Map.class);
@@ -1854,7 +1872,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         String useRegistrationCode = String.valueOf(map.get("useRegistrationCode")).trim();
         // 车辆VIN码
         String identificationCode = String.valueOf(map.get("identificationCode")).trim();
-        String equipId = String.valueOf(map.get("equipId"));
         // 表单设备列表
         List<Map<String, Object>> equipmentLists = new ObjectMapper()
                 .convertValue(map.get("equipmentLists"), new TypeReference<List<Map<String, Object>>>() {
@@ -2027,7 +2044,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         // 登记证记录表主键
         Long changeRecordId = sequence.nextId();
         //新增
+        Object submitType = map.get("historySubmitType");
         if (StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr())) {
+            //暂存或者提交
+            if(!Arrays.asList("tempSubmit", "tempEdit").contains(submitType)){
                 ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
                 if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
                     log.error("车用气瓶使用登记申请单单号获取失败！");
@@ -2035,10 +2055,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 }
                 String applyNo = listResponseModel.getResult().get(0);
                 vehicleInformation.setApplyNo(applyNo);
-            vehicleInformation.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
+                String status = "temp".equals(submitType)
+                        ? FlowStatusEnum.TO_BE_SUBMITTED.getName()
+                        : FlowStatusEnum.TO_BE_FINISHED.getName();
+                vehicleInformation.setStatus(status);
                 vehicleInformation.setRegType("1");//历史登记
                 this.save(vehicleInformation);
 
+                if (!"temp".equals(submitType)){
                     // 取第一条设备的注册消息--用来获取这一批设备的设备种类/类别/品种
                     LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
                     lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(equipmentLists.get(0).get("record")));
@@ -2047,9 +2071,21 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                     generateRegistrationManage(vehicleInformation, registerInfo);
                     // 生成一条tzs_jg_certificate_change_record记录
                     generateCertificateChangeRecord(vehicleInformation, registerInfo, changeRecordId, null);
+                }
             } else {
-            // 删除以前设备关联关系
+                //暂存编辑或暂存提交
+                String status = "tempEdit".equals(submitType)
+                        ? FlowStatusEnum.TO_BE_SUBMITTED.getName()
+                        : FlowStatusEnum.TO_BE_FINISHED.getName();
+                vehicleInformation.setStatus(status);
+                LambdaQueryWrapper<JgVehicleInformationEq> lambda = new QueryWrapper<JgVehicleInformationEq>().lambda();
+                lambda.eq(JgVehicleInformationEq::getVehicleId, vehicleInformation.getSequenceNbr());
+                jgVehicleInformationEqService.getBaseMapper().delete(lambda);
                 this.getBaseMapper().updateById(vehicleInformation);
+            }
+        } else {
+            // 编辑
+            // 删除以前设备关联关系
             LambdaQueryWrapper<JgVehicleInformationEq> lambda = new QueryWrapper<JgVehicleInformationEq>().lambda();
             lambda.eq(JgVehicleInformationEq::getVehicleId, vehicleInformation.getSequenceNbr());
             jgVehicleInformationEqService.getBaseMapper().delete(lambda);
@@ -2098,8 +2134,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(useInfoLambdaQueryWrapper);
                 useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
                 useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
-                useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
-                useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
+                useInfo.setORegDate(Objects.toString(map.get("oRegDate"), null));
+                useInfo.setORegUnit(Objects.toString(map.get("oRegUnit"), null));
                 useInfo.setEstateUnitCreditCode(vehicleInformation.getEstateUnitCreditCode());
                 useInfo.setEstateUnitName(vehicleInformation.getEstateUnitName());
                 useInfo.setSafetyManagerId(vehicleInformation.getSafetyManagerId());
@@ -2124,9 +2160,11 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherInfoWrapper);
 
                 // 更新设备信息
+                if(!Arrays.asList("temp", "tempEdit").contains(submitType)){
                     this.updateEquipInfo(vehicleInformation, registerInfo, otherInfo, String.valueOf(x.get("record")));
                     // 更新es
                     this.updateEquipEsData(vehicleInformation, otherInfo, registerInfo, String.valueOf(x.get("record")));
+                }
                 // 查询设备制造信息
                 LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
                 factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, String.valueOf(x.get("record")));
@@ -2191,6 +2229,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);
         List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
+        Optional.ofNullable(equipmentLists)
+                .filter(list -> !list.isEmpty())
+                .filter(list -> list.stream().map(v -> (String) v.get("chargingMedium")).distinct().count() == 1)
+                .orElseThrow(() -> new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同充装介质设备！"));
 
         CompanyBo company = reginParams.getCompany();
         vehicleInfoDto.setCreateDate(new Date());
@@ -2284,13 +2326,24 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
         vehicleInformation.setGasNum(equipmentLists.size());
         BigDecimal totalVolume = equipmentLists.stream()
-                .map(x -> new BigDecimal(String.valueOf(x.get("singleBottleVolume"))))
+                .map(x -> {
+                    Object val = x.get("singleBottleVolume");
+                    try {
+                        return new BigDecimal(String.valueOf(val));
+                    } catch (Exception e) {
+                        return BigDecimal.ZERO;
+                    }
+                })
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         vehicleInformation.setVolume(totalVolume.toPlainString());
         vehicleInformation.setAuditPassDate(new Date());
 
         // 登记证记录表主键
         Long changeRecordId = sequence.nextId();
+        String status = "tempEdit".equals(map.get("historySubmitType"))
+                ? FlowStatusEnum.TO_BE_SUBMITTED.getName()
+                : FlowStatusEnum.TO_BE_FINISHED.getName();
+        vehicleInformation.setStatus(status);
         this.getBaseMapper().updateById(vehicleInformation);
         JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, vehicleInformation.getUseRegistrationCode())
@@ -2350,11 +2403,13 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoMapper.selectOne(factoryInfoWrapper);
 
                 // 生成tzs_jg_certificate_change_record_eq记录
+                if (!"tempEdit".equals(map.get("historySubmitType"))){
                     JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
                     changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
                     changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
                     changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());//产品编号
                     certificateChangeRecordEqService.save(changeRecordEq);
+                }
             });
         }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/CompanyAdvanceSearchEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum CompanyAdvanceSearchEnum {
+
+    /**
+     * 高级搜索枚举
+     */
+    ADDRESS("详细地址", "address", TechnicalParameter.ParamType.STRING,"",null,null),
+    EXPIRYDATE("许可有效期", "expiryDate",TechnicalParameter.ParamType.DATE,"",null,null),
+    UNIT_TYPE("企业类型", "unitType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null),
+    REGULATORY_LABELS("企业等级", "regulatoryLabels",null,"",null,null),
+    INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","HYZGBM",null),
+    ITEM_CODE("许可项目", "itemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK",null,null),
+    SUB_ITEM_CODE("许可子项目", "subItemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK?type={type}",null,"itemCode"),
+    OPERATING_STATUS("经营状态", "operatingStatus",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","jyzt",null),
+    EQUIP_CATEGORY("监管设备类型", "equipCategory",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null,null),
+
+    ;
+
+    private String name;
+    private String code;
+    private TechnicalParameter.ParamType paramType;
+    private String url;
+    private String dataKey;
+    private String argKey;
+
+    public static JSONArray getAll(){
+        JSONArray jsonArray = new JSONArray();
+        for (CompanyAdvanceSearchEnum item : values()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("label", item.name);
+            jsonObject.put("value", item.code);
+            jsonObject.put("key", item.code);
+            jsonObject.put("dataKey", item.dataKey);
+            jsonObject.put("argKey", item.argKey);
+            jsonObject.put("paramType", item.paramType);
+            jsonObject.put("isMulti", false);
+            if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){
+                jsonObject.put("type","inputNumber");
+            }else if(TechnicalParameter.ParamType.STRING.equals(item.paramType)){
+                jsonObject.put("type","input");
+            }else if(TechnicalParameter.ParamType.DATE.equals(item.paramType)){
+                jsonObject.put("type","date");
+            }else {
+                jsonObject.put("type","select");
+            }
+            jsonObject.put("conditions",ConditionEnum.getByCode(item.paramType));
+            jsonObject.put("url", item.url);
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
+    }
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/ConditionEnum.java

@@ -29,6 +29,7 @@ public enum ConditionEnum {
     dateLe("小于等于", "le", TechnicalParameter.ParamType.DATE),
     in("包含","in", null),
     notin("不包含","notin", null),
+    eq("等于","eq", null),
 
     ;
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/DataQualityScoreEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum DataQualityScoreEnum {
+
+    /**
+     * *设备等级
+     */
+
+    I("I级", "3"),
+    II("II级", "2"),
+    III("III级", "1"),
+    ;
+
+    private String name;
+    private String code;
+
+    public static Map<String, String> getName = new HashMap<>();
+    public static Map<String, String> getCode = new HashMap<>();
+
+
+    static {
+        for (DataQualityScoreEnum e : DataQualityScoreEnum.values()) {
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+    }
+
+    public static JSONArray getAll(){
+        JSONArray jsonArray = new JSONArray();
+        for (DataQualityScoreEnum e : DataQualityScoreEnum.values()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("label",e.name);
+            jsonObject.put("value",e.name);
+            jsonObject.put("key",e.code);
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
+    }
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/AdvanceSearchEnum.java → amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/EquipAdvanceSearchEnum.java

@@ -8,36 +8,36 @@ import lombok.Getter;
 
 @AllArgsConstructor
 @Getter
-public enum AdvanceSearchEnum {
+public enum EquipAdvanceSearchEnum {
 
     /**
      * 高级搜索枚举
      */
-    USE_ORG_CODE("使用登记证编号", "USE_ORG_CODE", TechnicalParameter.ParamType.STRING,""),
-    EQU_LIST("设备种类", "EQU_LIST",null,""),
-    EQU_CATEGORY("设备类别", "EQU_CATEGORY",null,""),
-    EQU_DEFINE("设备品种", "EQU_DEFINE",null,""),
-    PRODUCT_NAME("设备名称", "PRODUCT_NAME", TechnicalParameter.ParamType.STRING,""),
-    TECH_PARAM("技术参数", "techParam", null,""),
-    PARAM_RANGE("参数范围", "paramRange", TechnicalParameter.ParamType.STRING,""),
-    NEXT_INSPECT_DATE("检验有效期", "nextInspectDate", TechnicalParameter.ParamType.DATE,""),
-    EQU_STATE("检验有效期", "EQU_STATE", null,""),
-//    SUPERVISORY_CODE("赋码状态", "", null,""),
-//    SUPERVISORY_CODE("设备等级", "", null,""),
-//    SUPERVISORY_CODE("使用年限", "", null,""),
-    UNIT_TYPE("所属单位类型", "unitType", null,""),
-    USC_UNIT_NAME("所属单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
-    PRODUCE_UNIT_NAME("制造单位名称", "PRODUCE_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
-    DESIGN_UNIT_NAME("设计单位名称", "DESIGN_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
-    ME_UNIT_NAME("维保单位名称", "ME_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
-    AZUSC_UNIT_NAME("安装单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,""),
-    CODE96333("96333识别码", "CODE96333", TechnicalParameter.ParamType.STRING,""),
-    SUPERVISORY_CODE("监管码", "SUPERVISORY_CODE", TechnicalParameter.ParamType.STRING,""),
-    EQU_TYPE("设备型号", "EQU_TYPE", TechnicalParameter.ParamType.STRING,""),
-    PRODUCE_DATE("制造日期", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,""),
+    USE_ORG_CODE("使用登记证编号", "USE_ORG_CODE", TechnicalParameter.ParamType.STRING,"",null,null),
+    EQU_LIST("设备种类", "EQU_LIST_CODE",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null,null),
+    EQU_CATEGORY("设备类别", "EQU_CATEGORY_CODE",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquCategory?type={type}",null,"EQU_LIST_CODE"),
+    EQU_DEFINE("设备品种", "EQU_DEFINE_CODE",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquDefine?type={type}",null,"EQU_CATEGORY_CODE"),
+    PRODUCT_NAME("设备名称", "PRODUCT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
+    TECH_PARAM("技术参数", "techParam", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryTechParam?type={type}",null,"EQU_LIST_CODE"),
+    PARAM_RANGE("参数范围", "paramRange", TechnicalParameter.ParamType.STRING,"",null,null),
+    NEXT_INSPECT_DATE("检验有效期", "nextInspectDate", TechnicalParameter.ParamType.DATE,"",null,null),
+    EQU_STATE("设备状态", "EQU_STATE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquState",null,null),
+    IS_SUPERVISORY_CODE("赋码状态", "IS_SUPERVISORY_CODE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryIsSupervisoryCode",null,null),
+    DATA_QUALITY_SCORE("设备等级", "DATA_QUALITY_SCORE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDataQualityScore",null,null),
+    USC_DATE("使用年限", "USC_DATE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUscDate",null,null),
+    UNIT_TYPE("所属单位类型", "unitType", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null),
+    USC_UNIT_NAME("所属单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
+    PRODUCE_UNIT_NAME("制造单位名称", "PRODUCE_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
+    DESIGN_UNIT_NAME("设计单位名称", "DESIGN_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
+    ME_UNIT_NAME("维保单位名称", "ME_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
+    AZUSC_UNIT_NAME("安装单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
+    CODE96333("96333识别码", "CODE96333", TechnicalParameter.ParamType.STRING,"",null,null),
+    SUPERVISORY_CODE("监管码", "SUPERVISORY_CODE", TechnicalParameter.ParamType.STRING,"",null,null),
+    EQU_TYPE("设备型号", "EQU_TYPE", TechnicalParameter.ParamType.STRING,"",null,null),
+    PRODUCE_DATE("制造日期", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,"",null,null),
 //    PRODUCE_DATE("是否进口", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,""),
-    USE_PLACE_CODE("使用地点", "USE_PLACE_CODE", TechnicalParameter.ParamType.STRING,""),
-    USE_PLACE("使用场所", "USE_PLACE", null,""),
+    USE_PLACE_CODE("使用地点", "USE_PLACE_CODE", TechnicalParameter.ParamType.STRING,"",null,null),
+    USE_PLACE("使用场所", "USE_PLACE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","ADDRESS",null),
 
     ;
 
@@ -45,14 +45,18 @@ public enum AdvanceSearchEnum {
     private String code;
     private TechnicalParameter.ParamType paramType;
     private String url;
+    private String dataKey;
+    private String argKey;
 
     public static JSONArray getAll(){
         JSONArray jsonArray = new JSONArray();
-        for (AdvanceSearchEnum item : values()) {
+        for (EquipAdvanceSearchEnum item : values()) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("label", item.name);
             jsonObject.put("value", item.code);
             jsonObject.put("key", item.code);
+            jsonObject.put("dataKey", item.dataKey);
+            jsonObject.put("argKey", item.argKey);
             jsonObject.put("paramType", item.paramType);
             jsonObject.put("isMulti", false);
             if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/EquipStateEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum EquipStateEnum {
+
+    /**
+     * *设备状态
+     */
+
+    WDJ("未登记", "0"),
+    ZY("在用", "1"),
+    TY("停用", "2"),
+    BF("报废", "3"),
+    ZX("注销", "4"),
+    ;
+
+    private String name;
+    private String code;
+
+    public static Map<String, String> getName = new HashMap<>();
+    public static Map<String, String> getCode = new HashMap<>();
+
+
+    static {
+        for (EquipStateEnum e : EquipStateEnum.values()) {
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+    }
+
+    public static JSONArray getAll(){
+        JSONArray jsonArray = new JSONArray();
+        for (EquipStateEnum e : EquipStateEnum.values()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("label",e.name);
+            jsonObject.put("value",e.name);
+            jsonObject.put("key",e.code);
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
+    }
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/IsSupervisoryCodeEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum IsSupervisoryCodeEnum {
+
+    /**
+     * *赋码状态
+     */
+
+    WFM("未赋码", "0"),
+    YFM("已赋码", "1"),
+    ;
+
+    private String name;
+    private String code;
+
+    public static Map<String, String> getName = new HashMap<>();
+    public static Map<String, String> getCode = new HashMap<>();
+
+
+    static {
+        for (IsSupervisoryCodeEnum e : IsSupervisoryCodeEnum.values()) {
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+    }
+
+    public static JSONArray getAll(){
+        JSONArray jsonArray = new JSONArray();
+        for (IsSupervisoryCodeEnum e : IsSupervisoryCodeEnum.values()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("label",e.name);
+            jsonObject.put("value",e.name);
+            jsonObject.put("key",e.code);
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
+    }
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/PersonAdvanceSearchEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum PersonAdvanceSearchEnum {
+
+    /**
+     * 高级搜索枚举
+     */
+    NAME("人员名称", "name", TechnicalParameter.ParamType.STRING,"",null,null),
+    NEWPOST("人员类型", "newPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX",null,null),
+    SUBPOST("人员子类型", "subPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX?type={type}",null,"newPost"),
+//    REGULATORY_LABELS("有无资质", "regulatoryLabels",null,""),
+//    REGULATORY_LABELS("资质状态", "regulatoryLabels",null,""),
+    CERT_TYPE("证书类型", "certType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertType",null,null),
+    PERMISSION_LEVEL("证书级别", "permissionLevel",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel",null,null),
+    JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"certType|permissionLevel"),
+    ISSUE_DATE("发证日期", "issueDate",TechnicalParameter.ParamType.DATE,"",null,null),
+    EDUCATION("学历", "education",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","XLLX",null),
+    ADDRESS("住址", "address",TechnicalParameter.ParamType.STRING,"",null,null),
+    UNITCODE("所属企业", "unitCode", TechnicalParameter.ParamType.STRING,"",null,null),
+    SUPERVISEORGCODE("管辖机构", "superviseOrgCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitByOrgCode?type={type}",null,"orgTreeId"),
+    EQUIP_TYPE("监管设备类型", "equipType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null,null),
+
+    ;
+
+    private String name;
+    private String code;
+    private TechnicalParameter.ParamType paramType;
+    private String url;
+    private String dataKe;
+    private String argKey;
+
+    public static JSONArray getAll(){
+        JSONArray jsonArray = new JSONArray();
+        for (PersonAdvanceSearchEnum item : values()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("label", item.name);
+            jsonObject.put("value", item.code);
+            jsonObject.put("key", item.code);
+            jsonObject.put("dataKey", item.code);
+            jsonObject.put("argKey", item.argKey);
+            jsonObject.put("paramType", item.paramType);
+            jsonObject.put("isMulti", false);
+            if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){
+                jsonObject.put("type","inputNumber");
+            }else if(TechnicalParameter.ParamType.STRING.equals(item.paramType)){
+                jsonObject.put("type","input");
+            }else if(TechnicalParameter.ParamType.DATE.equals(item.paramType)){
+                jsonObject.put("type","date");
+            }else {
+                jsonObject.put("type","select");
+            }
+            jsonObject.put("conditions",ConditionEnum.getByCode(item.paramType));
+            jsonObject.put("url", item.url);
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
+    }
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/UnitTypeEnum.java

@@ -43,7 +43,7 @@ public enum UnitTypeEnum {
         for (UnitTypeEnum e : UnitTypeEnum.values()) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("label",e.name);
-            jsonObject.put("value",e.code);
+            jsonObject.put("value",e.name);
             jsonObject.put("key",e.code);
             jsonArray.add(jsonObject);
         }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/UscDateEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum UscDateEnum {
+
+    /**
+     * *使用年限
+     */
+
+    FIVE_YEARS_OR_LESS("5年以下", "5"),
+    FIVE_TO_TEN_YEARS("5~10年", "5-10"),
+    TEN_TO_FIFTEEN_YEARS("10~15年", "10-15"),
+    MORE_THAN_FIFTEEN_YEARS("15年以上", "15"),
+    ;
+
+    private String name;
+    private String code;
+
+    public static Map<String, String> getName = new HashMap<>();
+    public static Map<String, String> getCode = new HashMap<>();
+
+
+    static {
+        for (UscDateEnum e : UscDateEnum.values()) {
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+    }
+
+    public static JSONArray getAll(){
+        JSONArray jsonArray = new JSONArray();
+        for (UscDateEnum e : UscDateEnum.values()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("label",e.name);
+            jsonObject.put("value",e.name);
+            jsonObject.put("key",e.code);
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
+    }
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/TzsCustomFilterMapper.java

 package com.yeejoin.amos.boot.module.statistics.api.mapper;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.statistics.api.entity.TzsCustomFilter;
 import org.apache.ibatis.annotations.MapKey;
@@ -18,4 +19,6 @@ public interface TzsCustomFilterMapper extends BaseMapper<TzsCustomFilter> {
 
     @MapKey("key")
     List<Map<String, Object>> selectEquipmentCategoryByParentId(@Param("parentId") String parentId);
+
+    JSONArray queryEquCategory(@Param("type") String type, @Param("description") String description);
 }

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

@@ -10,4 +10,18 @@
         from tz_equipment_category
         where parent_id = #{parentId}
     </select>
+
+    <select id="queryEquCategory" resultType="com.alibaba.fastjson.JSONArray">
+        SELECT
+            code AS value,
+            code AS key,
+            name AS label
+        FROM
+            tz_equipment_category
+        WHERE
+            description = #{description}
+        <if test="type != null and type != ''">
+            AND parent_id = (SELECT id FROM tz_equipment_category where code = #{type})
+        </if>
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

@@ -128,10 +128,22 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/select/queryZZZT")
-    @ApiOperation(httpMethod = "GET", value = "查询资质状态", notes = "查询资质状态")
-    public ResponseModel<JSONArray> queryZZZT() {
-        return ResponseHelper.buildResponse(statisticalAnalysisService.queryZZZT());
+    @GetMapping(value = "/select/queryZYXM")
+    @ApiOperation(httpMethod = "GET", value = "查询作业项目", notes = "查询作业项目")
+    public ResponseModel<JSONArray> queryZYXM(@RequestParam String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryZYXM(type));
+    }
+
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryUnitByOrgCode")
+    @ApiOperation(httpMethod = "GET", value = "根据监管机构查询企业", notes = "根据监管机构查询企业")
+    public ResponseModel<JSONArray> queryUnitByOrgCode(@RequestParam String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryUnitByOrgCode(type));
     }
 
     /**
@@ -168,5 +180,125 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
         return ResponseHelper.buildResponse("后台处理中，请注意下载！");
     }
 
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryEquipList")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索设备种类", notes = "高级搜索设备种类")
+    public ResponseModel<JSONArray> queryEquipList() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryEquipList());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryEquCategory")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索设备类别", notes = "高级搜索设备类别")
+    public ResponseModel<JSONArray> queryEquCategory(@RequestParam(required = false) String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryEquCategory(type));
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryEquDefine")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索设备品种", notes = "高级搜索设备品种")
+    public ResponseModel<JSONArray> queryEquDefine(@RequestParam(required = false) String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryEquDefine(type));
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryEquState")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索设备状态", notes = "高级搜索设备状态")
+    public ResponseModel<JSONArray> queryEquState() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryEquState());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryDicData")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索字典类型", notes = "高级搜索字典类型")
+    public ResponseModel<JSONArray> queryDicData(@RequestParam String dataKey) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.getData(dataKey));
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryIsSupervisoryCode")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索赋码状态", notes = "高级搜索赋码状态")
+    public ResponseModel<JSONArray> queryIsSupervisoryCode() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryIsSupervisoryCode());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryDataQualityScore")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索设备等级", notes = "高级搜索设备等级")
+    public ResponseModel<JSONArray> queryDataQualityScore() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryDataQualityScore());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryUscDate")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索使用年限", notes = "高级搜索使用年限")
+    public ResponseModel<JSONArray> queryUscDate() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryUscDate());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryTechParam")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索技术参数", notes = "高级搜索技术参数")
+    public ResponseModel<JSONArray> queryTechParam(String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryTechParam(type));
+    }
+
 
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryCertType")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索证书类型", notes = "高级搜索证书类型")
+    public ResponseModel<JSONArray> queryCertType() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryCertType());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryPermissionLevel")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索证书级别", notes = "高级搜索证书级别")
+    public ResponseModel<JSONArray> queryPermissionLevel() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryPermissionLevel());
+    }
 }

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

@@ -15,17 +15,17 @@ import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;
 import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.MinioUtils;
-import com.yeejoin.amos.boot.module.statistics.api.enums.AdvanceSearchEnum;
-import com.yeejoin.amos.boot.module.statistics.api.enums.ConditionEnum;
-import com.yeejoin.amos.boot.module.statistics.api.enums.StatisticalAnalysisEnum;
-import com.yeejoin.amos.boot.module.statistics.api.enums.UnitTypeEnum;
+import com.yeejoin.amos.boot.module.statistics.api.enums.*;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper;
 import com.yeejoin.amos.boot.module.statistics.api.vo.EquipInfoVo;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -128,7 +128,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return list;
     }
 
-    private JSONArray getData(String dictCode) {
+    public JSONArray getData(String dictCode) {
         JSONArray jsonArray = new JSONArray();
         //根据dictCode查询数据字典
         List<DataDictionary> dictionaries = dataDictionaryService.getByType(dictCode);
@@ -148,12 +148,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     public JSONArray queryAdvancedSearch(String type) {
         JSONArray all = new JSONArray();
-        if ("equip".equals(type)) {
-            all = AdvanceSearchEnum.getAll();
-        } else if ("company".equals(type)) {
-
+        if("equip".equals(type)) {
+            all = EquipAdvanceSearchEnum.getAll();
+        }else if("company".equals(type)){
+            all = CompanyAdvanceSearchEnum.getAll();
         } else if ("person".equals(type)) {
-
+            all = PersonAdvanceSearchEnum.getAll();
         }
         return all;
     }
@@ -765,7 +765,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
     public JSONObject queryCompanySearchData() {
         JSONObject result = new JSONObject();
         //获取企业类型
-        result.put("UNIT_TYPE", UnitTypeEnum.getAll());
+        result.put("unitType", UnitTypeEnum.getAll());
 
         //获取企业等级
         result.put("regulatoryLabels", deployDictionary(dataDictionaryService.getByType("QYBQ")));
@@ -779,17 +779,17 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         JSONArray permitStatusData = new JSONArray();
         for (int i = 0; i < 3; i++) {
             JSONObject object = new JSONObject();
-            if (0 == i) {
-                object.put("key", "0");
-                object.put("value", "0");
+            if(0==i){
+                object.put("key", "overdue");
+                object.put("value", "overdue");
                 object.put("label", "超期");
-            } else if (1 == i) {
-                object.put("key", "1");
-                object.put("value", "1");
+            }else if(1==i){
+                object.put("key", "near");
+                object.put("value", "near");
                 object.put("label", "临期");
-            } else {
-                object.put("key", "2");
-                object.put("value", "2");
+            }else{
+                object.put("key", "normal");
+                object.put("value", "normal");
                 object.put("label", "正常");
             }
             permitStatusData.add(object);
@@ -806,15 +806,82 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             object.put("label", equipmentCategoryDtos.get(i).getName());
             equipCategoryData.add(object);
         }
-        result.put("equipList", equipCategoryData);
+        result.put("equipCategory", equipCategoryData);
 
         return result;
     }
 
     public JSONObject queryPersonSearchData() {
         JSONObject result = new JSONObject();
-
-
+        //资质状态
+        JSONArray permissionStatus = new JSONArray();
+        for(int i=0;i<3;i++){
+            JSONObject object = new JSONObject();
+            if(0==i){
+                object.put("key", "noLicenses");
+                object.put("value", "noLicenses");
+                object.put("label", "无资质要求");
+            }else if(1==i){
+                object.put("key", "overdue");
+                object.put("value", "overdue");
+                object.put("label", "资质超期");
+            }else if(2==i){
+                object.put("key", "near");
+                object.put("value", "near");
+                object.put("label", "资质临期");
+            }else {
+                object.put("key", "normal");
+                object.put("value", "normal");
+                object.put("label", "正常");
+            }
+            permissionStatus.add(object);
+        }
+        result.put("expiryDate", permissionStatus);
+        //证书类型
+        List<DictionarieValueModel> certType = Systemctl.dictionarieClient.dictValues("CERT_TYPE").getResult();
+        JSONArray certTypeArray = new JSONArray();
+        for(int i=0;i<certType.size();i++){
+            JSONObject object = new JSONObject();
+            object.put("key", certType.get(i).getDictDataKey());
+            object.put("value", certType.get(i).getDictDataKey());
+            object.put("label", certType.get(i).getDictDataValue());
+            certTypeArray.add(object);
+        }
+        result.put("certType", certTypeArray);
+        //证书级别
+        List<DictionarieValueModel> RYJB_JC = Systemctl.dictionarieClient.dictValues("RYJB_JC").getResult();
+        List<DictionarieValueModel> RYJB_JY = Systemctl.dictionarieClient.dictValues("RYJB_JY").getResult();
+        JSONArray permissionLevelArray = new JSONArray();
+        for(int i=0;i<RYJB_JC.size();i++){
+            JSONObject object = new JSONObject();
+            object.put("key", RYJB_JC.get(i).getDictDataKey());
+            object.put("value", RYJB_JC.get(i).getDictDataKey());
+            object.put("label", RYJB_JC.get(i).getDictDataValue());
+            permissionLevelArray.add(object);
+        }
+        for(int i=0;i<RYJB_JY.size();i++){
+            JSONObject object = new JSONObject();
+            object.put("key", RYJB_JY.get(i).getDictDataKey());
+            object.put("value", RYJB_JY.get(i).getDictDataKey());
+            object.put("label", RYJB_JY.get(i).getDictDataValue());
+            permissionLevelArray.add(object);
+        }
+        result.put("permissionLevel", permissionLevelArray);
+        //学历
+        result.put("education", deployDictionary(dataDictionaryService.getByType("XLLX")));
+        //监管设备类型
+        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
+        JSONArray equipCategoryData = new JSONArray();
+        for(int i=0;i<equipmentCategoryDtos.size();i++){
+            JSONObject object = new JSONObject();
+            object.put("key", equipmentCategoryDtos.get(i).getCode());
+            object.put("value", equipmentCategoryDtos.get(i).getCode());
+            object.put("label", equipmentCategoryDtos.get(i).getName());
+            equipCategoryData.add(object);
+        }
+        result.put("equipType", equipCategoryData);
+        //获取企业类型
+        result.put("unitType", UnitTypeEnum.getAll());
         return result;
     }
 
@@ -924,9 +991,141 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                 .fluentPut("time", new Date().getTime()));
     }
 
-    public JSONArray queryZZZT() {
-        JSONArray array = new JSONArray();
+    public JSONArray queryZYXM(String type) {
+        JSONArray result = new JSONArray();
+        if("特种设备安全管理和作业人员证".equals(type)){
+            List<DictionarieValueModel> certType = Systemctl.dictionarieClient.dictValues("JOB_ITEM").getResult();
+            for (DictionarieValueModel certTypeModel : certType) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("key", certTypeModel.getDictDataKey());
+                jsonObject.put("value", certTypeModel.getDictDataKey());
+                jsonObject.put("label", certTypeModel.getDictDataValue());
+                result.add(jsonObject);
+            }
+        }else {
+            List<DictionarieValueModel> certType = Systemctl.dictionarieClient.dictValues("ZZXM_"+type).getResult();
+            for (DictionarieValueModel certTypeModel : certType) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("key", certTypeModel.getDictDataKey());
+                jsonObject.put("value", certTypeModel.getDictDataKey());
+                jsonObject.put("label", certTypeModel.getDictDataValue());
+                result.add(jsonObject);
+            }
+        }
+        return result;
+    }
+
+    public JSONArray queryUnitByOrgCode(String orgCode) {
+        SearchRequest searchRequest = new SearchRequest("idx_biz_enterprise_info");
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+        boolQueryBuilder.must(QueryBuilders.wildcardQuery("superviseOrgCode.keyword",  QueryParser.escape(orgCode) + "*"));
+        searchSourceBuilder.query(boolQueryBuilder);
+        searchRequest.source(searchSourceBuilder);
+
+        JSONArray result = new JSONArray();
+        try {
+            SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
+            for (org.elasticsearch.search.SearchHit hit : searchResponse.getHits().getHits()) {
+                JSONObject jsonObject = ((JSONObject) JSONObject.toJSON(hit)).getJSONObject("sourceAsMap");
+                JSONObject dto = new JSONObject();
+                dto.put("key",jsonObject.getString("useCode"));
+                dto.put("value",jsonObject.getString("useCode"));
+                dto.put("label",jsonObject.getString("useUnit"));
+                result.add(dto);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        return result;
+    }
+
+    public JSONArray queryEquipList() {
+        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
+        JSONArray equipCategoryData = new JSONArray();
+        for(int i=0;i<equipmentCategoryDtos.size();i++){
+            JSONObject object = new JSONObject();
+            object.put("key", equipmentCategoryDtos.get(i).getCode());
+            object.put("value", equipmentCategoryDtos.get(i).getCode());
+            object.put("label", equipmentCategoryDtos.get(i).getName());
+            equipCategoryData.add(object);
+        }
+        return equipCategoryData;
+    }
+
+    public JSONArray queryEquCategory(String type) {
+        JSONArray result = tzsCustomFilterMapper.queryEquCategory(type,"EQU_CATEGORY");
+        return result;
+    }
 
-        return null;
+    public JSONArray queryEquDefine(String type) {
+        JSONArray result = tzsCustomFilterMapper.queryEquCategory(type,"EQU_DEFINE");
+        return result;
+    }
+
+    public JSONArray queryEquState() {
+        return EquipStateEnum.getAll();
+    }
+
+    public JSONArray queryIsSupervisoryCode() {
+        return IsSupervisoryCodeEnum.getAll();
+    }
+
+    public JSONArray queryDataQualityScore() {
+        return DataQualityScoreEnum.getAll();
+    }
+
+    public JSONArray queryUscDate() {
+        return UscDateEnum.getAll();
+    }
+
+    public JSONArray queryTechParam(String type) {
+        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(type);
+        JSONArray list = new JSONArray();
+        for (int i = 0; i < paramMetaList.size(); i++) {
+            JSONObject object = new JSONObject();
+            object.put("key", paramMetaList.get(i).getParamKey());
+            object.put("value", paramMetaList.get(i).getParamKey());
+            object.put("label", paramMetaList.get(i).getParamLabel());
+            list.add(object);
+        }
+        return list;
+    }
+
+    public JSONArray queryCertType() {
+        //证书类型
+        List<DictionarieValueModel> certType = Systemctl.dictionarieClient.dictValues("CERT_TYPE").getResult();
+        JSONArray certTypeArray = new JSONArray();
+        for(int i=0;i<certType.size();i++){
+            JSONObject object = new JSONObject();
+            object.put("key", certType.get(i).getDictDataKey());
+            object.put("value", certType.get(i).getDictDataKey());
+            object.put("label", certType.get(i).getDictDataValue());
+            certTypeArray.add(object);
+        }
+        return certTypeArray;
+    }
+
+    public JSONArray queryPermissionLevel() {
+        //证书级别
+        List<DictionarieValueModel> RYJB_JC = Systemctl.dictionarieClient.dictValues("RYJB_JC").getResult();
+        List<DictionarieValueModel> RYJB_JY = Systemctl.dictionarieClient.dictValues("RYJB_JY").getResult();
+        JSONArray permissionLevelArray = new JSONArray();
+        for(int i=0;i<RYJB_JC.size();i++){
+            JSONObject object = new JSONObject();
+            object.put("key", RYJB_JC.get(i).getDictDataKey());
+            object.put("value", RYJB_JC.get(i).getDictDataKey());
+            object.put("label", RYJB_JC.get(i).getDictDataValue());
+            permissionLevelArray.add(object);
+        }
+        for(int i=0;i<RYJB_JY.size();i++){
+            JSONObject object = new JSONObject();
+            object.put("key", RYJB_JY.get(i).getDictDataKey());
+            object.put("value", RYJB_JY.get(i).getDictDataKey());
+            object.put("label", RYJB_JY.get(i).getDictDataValue());
+            permissionLevelArray.add(object);
+        }
+        return permissionLevelArray;
     }
 }
\ No newline at end of file