bug修改

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/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-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

@@ -439,4 +439,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());
+    }
 }