Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ElevatorTechParamDefine.java

@@ -33,8 +33,8 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
     private BigDecimal liftingHeight;
 
 
-    @TechnicalParameter(key = "deviceLevel", label = "层数", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "层")
-    private BigDecimal deviceLevel;
+    @TechnicalParameter(key = "storey", label = "层数", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "层")
+    private BigDecimal storey;
 
 
     @TechnicalParameter(key = "stand", label = "站数", equCategory = {"3100", "3200", "3400"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "站")
@@ -60,9 +60,9 @@ public class ElevatorTechParamDefine implements ITechParamDefine {
     @TechnicalParameter(key = "explosionproofGrade", label = "区域防爆等级", equCategory = {"3400"}, equDefine = {"3410"}, type = TechnicalParameter.ParamType.STRING, dictCode = "FBDJ")
     private String explosionproofGrade;
 
-
-    @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"3400"}, equDefine = {"3410"}, type = TechnicalParameter.ParamType.STRING)
-    private String explosionproofSignComplete;
+//    附件上传类型的参数，无法参与查询，暂时注释掉
+//    @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"3400"}, equDefine = {"3410"}, type = TechnicalParameter.ParamType.STRING)
+//    private String explosionproofSignComplete;
 
 
     @TechnicalParameter(key = "nominalSpeed", label = "名义速度", equCategory = {"3300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m/s")

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LiftingTechParamDefine.java

@@ -122,13 +122,13 @@ public class LiftingTechParamDefine implements ITechParamDefine {
     @TechnicalParameter(key = "explosiveSubstance", label = "燃爆物质", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4410", "4420", "4440", "4450", "4870", "4170"}, type = TechnicalParameter.ParamType.STRING)
     private String explosiveSubstance;
 
+//    附件上传类型的参数，无法参与查询，暂时注释掉
+//    @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4410", "4420", "4440", "4450", "4870", "4170"}, type = TechnicalParameter.ParamType.STRING)
+//    private String explosionproofSignComplete;
 
-    @TechnicalParameter(key = "explosionproofSignComplete", label = "整机防爆标志", equCategory = {"4100", "4200", "4400", "4800", "4900", "4A00"}, equDefine = {"4110", "4130", "4140", "4150", "4190", "4210", "4220", "4230", "4240", "4250", "4260", "4270", "4280", "4290", "4410", "4420", "4440", "4450", "4870", "4170"}, type = TechnicalParameter.ParamType.STRING)
-    private String explosionproofSignComplete;
 
-
-    @TechnicalParameter(key = "ratedSpeedUp", label = "监检结束高度", equCategory = {"4300", "4800"}, ignoreCategoryConf = {"4800"}, equDefine = {"4310", "4320", "4860"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
-    private BigDecimal ratedSpeedUp;
+    @TechnicalParameter(key = "checkFinishedHeight", label = "监检结束高度", equCategory = {"4300", "4800"}, ignoreCategoryConf = {"4800"}, equDefine = {"4310", "4320", "4860"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
+    private BigDecimal checkFinishedHeight;
 
 
     @TechnicalParameter(key = "parkingVehicleHeight", label = "适停车辆尺寸高", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PipelineTechParamDefine.java

@@ -25,7 +25,7 @@ public class PipelineTechParamDefine implements ITechParamDefine {
     private String pipelineNumber;
 
 
-    @TechnicalParameter(key = "deviceLevel", label = "管道级别", type = TechnicalParameter.ParamType.STRING)
+    @TechnicalParameter(key = "deviceLevel", label = "管道级别", type = TechnicalParameter.ParamType.STRING, dictCode = "8100,8200,8300")
     private String deviceLevel;
 
 

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RidesTechParamDefine.java

@@ -29,16 +29,16 @@ public class RidesTechParamDefine implements ITechParamDefine {
     private BigDecimal numberOfPassengers;
 
 
-    @TechnicalParameter(key = "slideLength", label = "滑索(道)长度", equCategory = {"6B00", "6E00"}, equDefine = {"6E20"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
+    @TechnicalParameter(key = "slideLength", label = "滑索(道)/蹦极绳长度", equCategory = {"6B00", "6E00"}, equDefine = {"6E20","6E10"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
     private BigDecimal slideLength;
 
 
     @TechnicalParameter(key = "operatingHeight", label = "运行高度", equCategory = {"6500", "6E00", "6D00", "6D00"}, equDefine = {"6D10", "6D20", "6E10", "6E40"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
     private BigDecimal operatingHeight;
 
-
-    @TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", equCategory = {"6E00"}, equDefine = {"6E10"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
-    private BigDecimal slideHeight;
+    //字段值与滑索(道)长度重复，业务显隐使用
+//    @TechnicalParameter(key = "slideHeight", label = "蹦极绳长度", equCategory = {"6E00"}, equDefine = {"6E10"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
+//    private BigDecimal slideHeight;
 
 
     @TechnicalParameter(key = "rotaryDiameter", label = "回转直径", equCategory = {"6100", "6700", "6500", "6600", "6400", "6E00"}, equDefine = {"6E30"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -100,6 +100,7 @@ public class PieLineDataChangeServiceImpl {
         updateWrapper.set(IdxBizJgProjectContraption::getOrgName, projectContraptionChangeDataDtoNew.getOrgName());
         updateWrapper.set(IdxBizJgProjectContraption::getUseRegistrationCode, projectContraptionChangeDataDtoNew.getUseRegistrationCode());
         updateWrapper.set(IdxBizJgProjectContraption::getProductQualificationCertificate, projectContraptionChangeDataDtoNew.getProductQualificationCertificate());
+        updateWrapper.set(IdxBizJgProjectContraption::getUseDate, projectContraptionChangeDataDtoNew.getUseDate());
         updateWrapper.set(BaseEntity::getRecDate, new Date());
         updateWrapper.eq(BaseEntity::getSequenceNbr, projectContraptionChangeDataDtoNew.getProjectContraptionId());
         idxBizJgProjectContraptionServiceImpl.update(null, updateWrapper);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleProjectEquipChangeProcess.java

@@ -10,8 +10,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
-import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
-import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
 import com.yeejoin.amos.boot.module.jg.biz.edit.esUpdate.service.EsUpdateService;
@@ -230,6 +228,7 @@ public class SingleProjectEquipChangeProcess implements IEquipChangeDataProcessS
         IdxBizJgUseInfo useInfoNew = new IdxBizJgUseInfo();
         BeanUtil.copyProperties(useInfoOld, useInfoNew, true);
         BeanUtil.copyProperties(updatePieLine, useInfoNew, true);
+        useInfoNew.setUseDate(projectContraptionChangeDataDto.getUseDate());
         useInfoNew.setSequenceNbr(useInfoOld.getSequenceNbr());
         setNewUseAddressInfo(projectContraptionChangeDataDto, useInfoNew);
         // 冗余的字典名称字段更新

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/ReformNoticeStrategyHandler.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jg.biz.handler.strategy.ToBeSubmitDetailStra
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgReformNoticeServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import java.util.HashMap;
 import java.util.Map;
@@ -13,6 +14,7 @@ import java.util.Map;
 @Component
 public class ReformNoticeStrategyHandler implements ToBeSubmitDetailStrategy {
 
+    @Lazy
     @Autowired
     private JgReformNoticeServiceImpl jgReformNoticeService;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -86,7 +86,7 @@
       "name": "注销",
       "code": "BF_YZ",
       "image": "upload/tzs/common/image/移装报废.png",
-      "tips": "特种设备仅进行移装变更时需先进行“注销”，其他变更类业务通过“新增设备登记”直接办理，不需注销！"
+      "tips": "电梯/起重机械/锅炉/压力容器/大型游乐设施/客运索道设备在做《跨区移装变更》业务前需先进行“注销”，其他变更类业务不需注销！"
     },
     {
       "name": "报废",

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

@@ -24,7 +24,7 @@ public enum CompanyAdvanceSearchEnum {
     REGULATORY_LABELS("监管标签", "regulatoryLabels", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}", "QYBQ", null, FieldType.Text),
     INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}", "HYZGBM", null, FieldType.Text),
     ITEM_CODE("许可项目", "itemCode", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryXK", null, null, FieldType.Text),
-    SUB_ITEM_CODE("许可子项目", "subItemCode", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryXK?type={type}", null, "itemCode", FieldType.Text),
+    SUB_ITEM_CODE("许可子项目", "subItemCode", null, "/statistics/comprehensiveStatisticalAnalysis/select/querySubXK?type={type}", null, "itemCode", FieldType.Text),
     OPERATING_STATUS("经营状态", "operatingStatus", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicDataNew?type={type}", "jyzt", null, FieldType.Text),
     EQUIP_CATEGORY("设备类型", "equipCategory", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList", null, null, FieldType.Text),
     PERMIT_STATUS("许可状态", "permitStatus", null, "/statistics/comprehensiveStatisticalAnalysis/select/permitStatus", null, null, FieldType.Auto),
@@ -55,7 +55,7 @@ public enum CompanyAdvanceSearchEnum {
             } else if (TechnicalParameter.ParamType.STRING.equals(item.paramType)) {
                 jsonObject.put("type", "input");
             } else if (TechnicalParameter.ParamType.DATE.equals(item.paramType)) {
-                jsonObject.put("type", FieldType.Date);
+                jsonObject.put("type", "date");
             } else {
                 jsonObject.put("type", "select");
             }

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

@@ -20,13 +20,13 @@ public enum ConditionEnum {
     numberEq("等于", "eq", TechnicalParameter.ParamType.BIG_DECIMAL),
     numberGt("大于", "gt", TechnicalParameter.ParamType.BIG_DECIMAL),
     numberLt("小于", "lt", TechnicalParameter.ParamType.BIG_DECIMAL),
-    numberGe("大于等于", "ge", TechnicalParameter.ParamType.BIG_DECIMAL),
-    numberLe("小于等于", "le", TechnicalParameter.ParamType.BIG_DECIMAL),
+    numberGe("大于等于", "gte", TechnicalParameter.ParamType.BIG_DECIMAL),
+    numberLe("小于等于", "lte", TechnicalParameter.ParamType.BIG_DECIMAL),
     dateEq("等于", "eq", TechnicalParameter.ParamType.DATE),
     dateGt("大于", "gt", TechnicalParameter.ParamType.DATE),
     dateLt("小于", "lt", TechnicalParameter.ParamType.DATE),
-    dateGe("大于等于", "ge", TechnicalParameter.ParamType.DATE),
-    dateLe("小于等于", "le", TechnicalParameter.ParamType.DATE),
+    dateGe("大于等于", "gte", TechnicalParameter.ParamType.DATE),
+    dateLe("小于等于", "lte", 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/CylinderCategoryEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.*;
+
+@AllArgsConstructor
+@Getter
+public enum CylinderCategoryEnum {
+    /**
+     * 气瓶分类枚举
+     */
+    yhsyqp("0", "液化石油气瓶"),
+    gyqp("1", "工业气瓶"),
+    qt("2", "其他");
+
+    private String code;
+
+    private String name;
+
+    public static String getName(String code) {
+        Optional<String> op = Arrays.stream(CylinderCategoryEnum.values()).filter(e -> e.getCode().equals(code)).map(CylinderCategoryEnum::getName).findFirst();
+        return op.orElse("");
+    }
+
+    public static List<Map<String, Object>> getEnumList() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (CylinderCategoryEnum testEnum : EnumSet.allOf(CylinderCategoryEnum.class)) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("name", testEnum.name);
+            map.put("code", testEnum.code);
+            list.add(map);
+        }
+        return list;
+    }
+
+
+}

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

@@ -41,7 +41,7 @@ public enum DataQualityScoreEnum {
         for (DataQualityScoreEnum e : DataQualityScoreEnum.values()) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("label",e.name);
-            jsonObject.put("value",e.name);
+            jsonObject.put("value",e.code);
             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/EquipAdvanceSearchEnum.java

@@ -24,7 +24,7 @@ public enum EquipAdvanceSearchEnum {
     PRODUCT_NAME("设备名称", "PRODUCT_NAME", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
     TECH_PARAM("技术参数", "techParam", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryTechParam", null, "EQU_LIST_CODE,EQU_CATEGORY_CODE,EQU_DEFINE_CODE,WHETHER_VEHICLE_CYLINDER,QZ_OR_TANK", FieldType.Auto),
     PARAM_RANGE("参数范围", "paramRange", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Auto),
-    NEXT_INSPECT_DATE("检验有效期", "NEXT_INSPECT_DATE", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
+    NEXT_INSPECT_DATE("检验有效期", "NEXT_INSPECT_DATE", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryInspectionDate", null, null, FieldType.Date),
     EQU_STATE("设备状态", "EQU_STATE", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryEquState", null, null, FieldType.Integer),
     WHETHER_VEHICLE_CYLINDER("是否车用气瓶", "WHETHER_VEHICLE_CYLINDER", null, "/statistics/comprehensiveStatisticalAnalysis/select/vehicleCylinder", null, null, FieldType.Keyword),
     QZ_OR_TANK("是否撬装球罐", "QZ_OR_TANK", null, "/statistics/comprehensiveStatisticalAnalysis/select/qzOrTank", null, null, FieldType.Auto),
@@ -37,13 +37,13 @@ public enum EquipAdvanceSearchEnum {
     PRODUCE_UNIT_NAME("制造单位名称", "PRODUCE_UNIT_NAME", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
     DESIGN_UNIT_NAME("设计单位名称", "designUnitName", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Text),
     ME_UNIT_NAME("维保单位名称", "MAINTAIN_UNIT_NAME", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
-    AZUSC_UNIT_NAME("安改维单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Text),
+    AZUSC_UNIT_NAME("安装改造维修单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Text),
     CODE96333("96333识别码", "CODE96333", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
     SUPERVISORY_CODE("监管码", "SUPERVISORY_CODE", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
     EQU_TYPE("设备型号", "EQU_TYPE", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Text),
     PRODUCE_DATE("制造日期", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
     designDate("设计日期", "designDate", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
-    use_date("投用如期", "USE_DATE", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
+    use_date("投用日期", "use_date", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
     ISSUE_DATE("使用登记证日期", "issueDate", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
     JDJY("监督检验日期", "JDJY", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
     DQJY("定期检验日期", "DQJY", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
@@ -51,8 +51,8 @@ public enum EquipAdvanceSearchEnum {
     DTJY("电梯检测日期", "DTJY", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
     nextInspectDate("下次检验日期", "nextInspectDate", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
     //    PRODUCE_DATE("是否进口", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,""),
-    USE_PLACE_CODE("使用地点", "USE_PLACE_CODE", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
-    USE_PLACE("使用场所", "USE_PLACE", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}", "ADDRESS", null, FieldType.Keyword),
+    USE_PLACE_CODE("使用地点", "USE_PLACE", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
+    USE_PLACE("使用场所", "USE_SITE_CODE", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}", "ADDRESS", null, FieldType.Keyword),
 
     ;
 

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

@@ -17,20 +17,19 @@ public enum PersonAdvanceSearchEnum {
     /**
      * 高级搜索枚举
      */
-    NAME("姓名", "name", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Text),
+    NAME("姓名", "name", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
     NEWPOST("人员类型", "newPost", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX", null, null, FieldType.Keyword),
-    SUBPOST("子类型", "subPost", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX?type={type}", null, "newPost", FieldType.Keyword),
+    SUBPOST("子类型", "subPost", null, "/statistics/comprehensiveStatisticalAnalysis/select/querySubRYLX?type={type}", null, "newPost", FieldType.Keyword),
     CERT_NO("有无资质", "certNo", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryCertNo", null, null, FieldType.Keyword),
     EXPIRY_DATE("资质状态", "expiryDate", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryExpiryDate", null, null, FieldType.Date),
     CERT_TYPE("证书类型", "certType", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryCertType", null, null, FieldType.Keyword),
     PERMISSION_LEVEL("证书级别", "permissionLevel", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel", null, null, FieldType.Keyword),
-    JOB_ITEM("作业项目", "jobItem", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}", null, "certType", FieldType.Keyword),
-    PERMISSION_ITEM("项目", "permissionItem", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}", null, "permissionLevel", FieldType.Keyword),
+    JOB_ITEM("作业项目", "jobItem", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryTypeZYXM?type={type}", null, "certType", FieldType.Keyword),
+    PERMISSION_ITEM("项目", "permissionItem", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryLevelZYXM?type={type}", null, "permissionLevel", FieldType.Keyword),
     ISSUE_DATE("发证日期", "issueDate", TechnicalParameter.ParamType.DATE, "", null, null, FieldType.Date),
     EDUCATION("学历", "education", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}", "QYRYXL", null, FieldType.Keyword),
     ADDRESS("住址", "address", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
     UNITCODE("所属单位", "unitName", TechnicalParameter.ParamType.STRING, "", null, null, FieldType.Keyword),
-    SUPERVISEORGCODE("管辖机构", "superviseOrgCode", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryUnitByOrgCode?type={type}", null, "orgTreeId", FieldType.Keyword),
     EQUIP_TYPE("设备类型", "equipType", null, "/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList", null, null, FieldType.Keyword),
 
     ;

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

@@ -123,6 +123,18 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
         return ResponseHelper.buildResponse(statisticalAnalysisService.queryXK(type));
     }
 
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/querySubXK")
+    @ApiOperation(httpMethod = "GET", value = "高级筛选查询许可子项目", notes = "高级筛选查询许可子项目")
+    public ResponseModel<JSONArray> querySubXK(@RequestParam(required = false) String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.querySubXK(type));
+    }
+
     /**
      * @param
      * @return
@@ -145,6 +157,18 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
         return ResponseHelper.buildResponse(statisticalAnalysisService.queryRYLX(type));
     }
 
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/querySubRYLX")
+    @ApiOperation(httpMethod = "GET", value = "高级筛选查询人员子类型", notes = "高级筛选查询人员子类型")
+    public ResponseModel<JSONArray> querySubRYLX(@RequestParam(required = false) String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.querySubRYLX(type));
+    }
+
     /**
      * @param
      * @return
@@ -156,6 +180,28 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
         return ResponseHelper.buildResponse(statisticalAnalysisService.queryZYXM(type));
     }
 
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryTypeZYXM")
+    @ApiOperation(httpMethod = "GET", value = "高级筛选查询作业项目", notes = "高级筛选查询作业项目")
+    public ResponseModel<JSONArray> queryTypeZYXM(@RequestParam String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryTypeZYXM(type));
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryLevelZYXM")
+    @ApiOperation(httpMethod = "GET", value = "高级沙筛选查询项目", notes = "高级沙筛选查询项目")
+    public ResponseModel<JSONArray> queryLevelZYXM(@RequestParam String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryLevelZYXM(type));
+    }
+
 
     /**
      * @param
@@ -439,4 +485,15 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     public ResponseModel<JSONArray> queryExpiryDate() {
         return ResponseHelper.buildResponse(statisticalAnalysisService.queryExpiryDate());
     }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryInspectionDate")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索检验有效期", notes = "高级搜索检验有效期")
+    public ResponseModel<JSONArray> queryInspectionDate() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryInspectionDate());
+    }
 }

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

@@ -101,13 +101,15 @@ public class AQZSDPStatisticsServiceImpl {
 
     private StCommonServiceImpl stCommonService;
 
+    private JGDPStatisticsServiceImpl jgDPStatisticsService;
+
     private DataDictionaryMapper dataDictionaryMapper;
 
     @Autowired
     private ComprehensiveStatisticalAnalysisServiceImpl statisticalAnalysisService;
 
 
-    public AQZSDPStatisticsServiceImpl(RestHighLevelClient restHighLevelClient, AQZSDPStatisticsMapper statisticsMapper, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, TzsUserInfoMapper userInfoMapper, CylinderStatisticsMapper cylinderStatisticsMapper, StCommonServiceImpl stCommonService, DataDictionaryMapper dataDictionaryMapper) {
+    public AQZSDPStatisticsServiceImpl(RestHighLevelClient restHighLevelClient, AQZSDPStatisticsMapper statisticsMapper, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, TzsUserInfoMapper userInfoMapper, CylinderStatisticsMapper cylinderStatisticsMapper, StCommonServiceImpl stCommonService, DataDictionaryMapper dataDictionaryMapper, JGDPStatisticsServiceImpl jgDPStatisticsService) {
         this.restHighLevelClient = restHighLevelClient;
         this.statisticsMapper = statisticsMapper;
         this.enterpriseInfoMapper = enterpriseInfoMapper;
@@ -115,6 +117,7 @@ public class AQZSDPStatisticsServiceImpl {
         this.cylinderStatisticsMapper = cylinderStatisticsMapper;
         this.stCommonService = stCommonService;
         this.dataDictionaryMapper = dataDictionaryMapper;
+        this.jgDPStatisticsService = jgDPStatisticsService;
     }
 
 
@@ -906,7 +909,8 @@ public class AQZSDPStatisticsServiceImpl {
         long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
         result.put("total", hasSupervisoryCodeEquipCount);
         //2.压力管道长度统计
-        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+//        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode);
         //3.单位数量统计
         // 单位统计修改为查询es
 //        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());
@@ -1019,7 +1023,8 @@ public class AQZSDPStatisticsServiceImpl {
         // 1. 8大类设备数量统计,压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
         stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode,true,true, false);
         // 2. 压力管道长度统计
-        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+//        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode);
         //3.单位数量统计
         // 单位统计修改为查询es
 //        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());

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

@@ -24,6 +24,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.client.RestTemplate;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -723,11 +724,13 @@ public class DPSubServiceImpl {
                     SimpleDateFormat sdf = new SimpleDateFormat(f);
                     Date date = null;
                     try {
+                        if(!ObjectUtils.isEmpty(value) && !value.equals("null") && !value.equals("undefined")){
                             date = sdf.parse(ValidationUtil.validateString(value));
+                        }
                     } catch (ParseException e) {
                         throw new RuntimeException(e);
                     }
-                    jsonObject.put("value",sdf.format(date));
+                    jsonObject.put("value", null == date ? "" : sdf.format(date));
 
                 }
             } else if ("checkbox".equals(xObj.getString("componentKey"))) {

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

@@ -475,7 +475,7 @@ public class JGDPStatisticsServiceImpl {
     }
 
 
-    private void staticsCenterMapCountPipLine(Map<String, Object> result, String orgCode) {
+    public void staticsCenterMapCountPipLine(Map<String, Object> result, String orgCode) {
         SearchRequest request = new SearchRequest();
         SearchSourceBuilder builder = new SearchSourceBuilder();
         request.indices(StatisticalAnalysisEnum.equip.getKey());
@@ -1804,7 +1804,8 @@ public class JGDPStatisticsServiceImpl {
         long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
         result.put("total", hasSupervisoryCodeEquipCount);
         // 2.压力管道长度统计
-        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
+//        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
+        this.staticsCenterMapCountPipLine(result, orgCode);
         // 3.已纳管设备总数
         this.staticsCenterMapCountDataForEquipIsManage(result);
         // 4.登记证总数

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

@@ -107,13 +107,15 @@ public class JYJCDPStatisticsServiceImpl {
 
     private SafetyProblemTracingMapper safetyProblemTracingMapper;
 
+    private JGDPStatisticsServiceImpl jgDPStatisticsService;
+
     /**
      * 法定检验机构名单
      */
     @Value("${jyjc.legal.companyCode:12610100750228848W,12610300MB2943942F,12610400435630992M,12610200435252143F,126105007326878566,12610600MB29845683,126108004366752362,12610700MB296441XY,12610900353680128G,126110004363154256,126100004352004822}")
     private String legalCompanyCodes;
 
-    public JYJCDPStatisticsServiceImpl(JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper, JyjcInspectionApplicationMapper inspectionApplicationMapper, TzsUserInfoMapper tzsUserInfoMapper, JyjcInspectionResultMapper inspectionResultMapper, JyjcOpeningApplicationMapper openingApplicationMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, JYJCStatisticsMapper jyjcStatisticsMapper, SafetyProblemTracingMapper safetyProblemTracingMapper) {
+    public JYJCDPStatisticsServiceImpl(JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper, JyjcInspectionApplicationMapper inspectionApplicationMapper, TzsUserInfoMapper tzsUserInfoMapper, JyjcInspectionResultMapper inspectionResultMapper, JyjcOpeningApplicationMapper openingApplicationMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, JYJCStatisticsMapper jyjcStatisticsMapper, SafetyProblemTracingMapper safetyProblemTracingMapper, JGDPStatisticsServiceImpl jgDPStatisticsService) {
         this.inspectionApplicationEquipMapper = inspectionApplicationEquipMapper;
         this.inspectionApplicationMapper = inspectionApplicationMapper;
         this.tzsUserInfoMapper = tzsUserInfoMapper;
@@ -123,6 +125,7 @@ public class JYJCDPStatisticsServiceImpl {
         this.stCommonService = stCommonService;
         this.jyjcStatisticsMapper = jyjcStatisticsMapper;
         this.safetyProblemTracingMapper = safetyProblemTracingMapper;
+        this.jgDPStatisticsService = jgDPStatisticsService;
     }
 
 
@@ -544,7 +547,8 @@ public class JYJCDPStatisticsServiceImpl {
         long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
         result.put("total", hasSupervisoryCodeEquipCount);
         // 3.压力管道统计
-        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+//        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode);
         // 4.报检数量统计
         this.staticsCenterMapCountDataReporting(result, dpFilterParamDto);
         // 5.检验检测临期设备数数量统计

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

@@ -34,7 +34,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
     private static final String LOCK_KEY_ELEVATOR = "sequence_lock_elevator";
     private static final String LOCK_KEY_SUPERVISORY = "sequence_lock_supervisory";
     private static final String SEQUENCE_TYPE_UR = "%05d";
-    private static final String SEQUENCE_TYPE = "%07d";
+    private static final String SEQUENCE_TYPE = "%08d";
     private final RedisTemplate<String, String> redisTemplate;
     private final StringRedisTemplate stringRedisTemplate;
     private final CategoryOtherInfoMapper categoryOtherInfoMapper;