Merge branch 'develop_tzs_register' of…

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

@@ -22,10 +22,12 @@ public enum EquipAdvanceSearchEnum {
     PARAM_RANGE("参数范围", "paramRange", TechnicalParameter.ParamType.STRING,"",null,null),
     NEXT_INSPECT_DATE("检验有效期", "NEXT_INSPECT_DATE", 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),
+    WHETHER_VEHICLE_CYLINDER("是否车用气瓶", "WHETHER_VEHICLE_CYLINDER", null,"/statistics/comprehensiveStatisticalAnalysis/select/vehicleCylinder",null,null),
+    QZ_OR_TANK("是否车用气瓶", "WHETHER_VEHICLE_CYLINDER", null,"/statistics/comprehensiveStatisticalAnalysis/select/qzOrTank",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),
+//    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),
@@ -35,6 +37,14 @@ public enum EquipAdvanceSearchEnum {
     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),
+    designDate("设计日期", "designDate", TechnicalParameter.ParamType.DATE,"",null,null),
+    usc_date("投用如期", "USC_DATE", TechnicalParameter.ParamType.DATE,"",null,null),
+    ISSUE_DATE("使用登记证日期", "issueDate", TechnicalParameter.ParamType.DATE,"",null,null),
+    JDJY("监督检验日期", "JDJY", TechnicalParameter.ParamType.DATE,"",null,null),
+    DQJY("定期检验日期", "DQJY", TechnicalParameter.ParamType.DATE,"",null,null),
+    SCJY("首次检验日期", "SCJY", TechnicalParameter.ParamType.DATE,"",null,null),
+    DTJY("电梯检测日期", "DTJY", TechnicalParameter.ParamType.DATE,"",null,null),
+    nextInspectDate("下次检验日期", "nextInspectDate", TechnicalParameter.ParamType.DATE,"",null,null),
 //    PRODUCE_DATE("是否进口", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,""),
     USE_PLACE_CODE("使用地点", "USE_PLACE_CODE", TechnicalParameter.ParamType.STRING,"",null,null),
     USE_PLACE("使用场所", "USE_PLACE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","ADDRESS",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/UnitTypeEnum.java

@@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import org.springframework.util.ObjectUtils;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @AllArgsConstructor
@@ -53,21 +52,10 @@ public enum UnitTypeEnum {
         return jsonArray;
     }
 
-    public static List<Map<String, Object>> getUnitTypeByCategory(String category) {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (UnitTypeEnum e : UnitTypeEnum.values()) {
-            if (e.type.equals(category)) {
-                Map<String, Object> map = new HashMap<>();
-                map.put("label", e.name);
-                map.put("value", e.name);
-                map.put("key", e.code);
-                list.add(map);
-            }
-        }
-        return list;
-    }
-
     public static JSONArray getUnitTypeByType(String category) {
+        if (ObjectUtils.isEmpty(category)) {
+            return getAll();
+        }
         JSONArray jsonArray = new JSONArray();
         for (UnitTypeEnum e : UnitTypeEnum.values()) {
             if (e.type.equals(category)) {

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

@@ -74,8 +74,8 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryCompanySearchData")
     @ApiOperation(httpMethod = "GET", value = "查询企业条件", notes = "查询企业条件")
-    public ResponseModel<JSONObject> queryCompanySearchData() {
-        return ResponseHelper.buildResponse(statisticalAnalysisService.queryCompanySearchData());
+    public ResponseModel<JSONObject> queryCompanySearchData(@RequestParam(required = false) String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryCompanySearchData(type));
     }
 
     /**
@@ -85,8 +85,8 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryPersonSearchData")
     @ApiOperation(httpMethod = "GET", value = "查询个人条件", notes = "查询个人条件")
-    public ResponseModel<JSONObject> queryPersonSearchData() {
-        return ResponseHelper.buildResponse(statisticalAnalysisService.queryPersonSearchData());
+    public ResponseModel<JSONObject> queryPersonSearchData(@RequestParam(required = false) String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryPersonSearchData(type));
     }
 
     /**
@@ -270,6 +270,28 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/vehicleCylinder")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索是否车用气瓶", notes = "高级搜索是否车用气瓶")
+    public ResponseModel<JSONArray> queryVehicleCylinder() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryVehicleCylinder());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/qzOrTank")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索是否撬装球罐", notes = "高级搜索是否撬装球罐")
+    public ResponseModel<JSONArray> queryQzOrTank() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryQzOrTank());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryUscDate")
     @ApiOperation(httpMethod = "GET", value = "高级搜索使用年限", notes = "高级搜索使用年限")
     public ResponseModel<JSONArray> queryUscDate() {

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

@@ -1572,16 +1572,15 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
 
     public JSONArray queryUnitType(String type) {
-        if (ObjectUtils.isEmpty(type)) {
-            return UnitTypeEnum.getAll();
-        }
         return UnitTypeEnum.getUnitTypeByType(type);
     }
 
-    public JSONObject queryCompanySearchData() {
+    public JSONObject queryCompanySearchData(String type) {
         JSONObject result = new JSONObject();
+        //获取企业分类
+        result.put("unitCategory", getUnitCategory());
         //获取企业类型
-        result.put("unitType", UnitTypeEnum.getAll());
+        result.put("unitType", UnitTypeEnum.getUnitTypeByType(type));
 
         //获取企业等级
         result.put("regulatoryLabels", deployDictionary(dataDictionaryService.getByType("QYBQ")));
@@ -1627,7 +1626,25 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return result;
     }
 
-    public JSONObject queryPersonSearchData() {
+    private static JSONArray getUnitCategory() {
+        JSONArray unitCategory = new JSONArray();
+        for (int i = 0; i < 2; i++) {
+            JSONObject object = new JSONObject();
+            if (0 == i) {
+                object.put("key", "use");
+                object.put("value", "use");
+                object.put("label", "使用单位");
+            } else {
+                object.put("key", "license");
+                object.put("value", "license");
+                object.put("label", "许可单位");
+            }
+            unitCategory.add(object);
+        }
+        return unitCategory;
+    }
+
+    public JSONObject queryPersonSearchData(String type) {
         JSONObject result = new JSONObject();
         //有无资质
         JSONArray certNoData = new JSONArray();
@@ -1712,8 +1729,10 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             equipCategoryData.add(object);
         }
         result.put("equipType", equipCategoryData);
+        //获取企业分类
+        result.put("unitCategory", getUnitCategory());
         //获取企业类型
-        result.put("unitType", UnitTypeEnum.getAll());
+        result.put("unitType", UnitTypeEnum.getUnitTypeByType(type));
         return result;
     }
 
@@ -2129,4 +2148,42 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         }
         return permissionStatus;
     }
+
+    public JSONArray queryVehicleCylinder() {
+        //是否车用气瓶
+        JSONArray vehicleCylinder = new JSONArray();
+        for (int i = 0; i < 2; i++) {
+            JSONObject object = new JSONObject();
+            if (0 == i) {
+                object.put("key", "0");
+                object.put("value", "0");
+                object.put("label", "否");
+            } else {
+                object.put("key", "1");
+                object.put("value", "1");
+                object.put("label", "是");
+            }
+            vehicleCylinder.add(object);
+        }
+        return vehicleCylinder;
+    }
+
+    public JSONArray queryQzOrTank() {
+        //是否车用气瓶
+        JSONArray qzOrTank = new JSONArray();
+        for (int i = 0; i < 2; i++) {
+            JSONObject object = new JSONObject();
+            if (0 == i) {
+                object.put("key", "WHETHER_SKID_MOUNTED_PRESSURE_VESSEL");
+                object.put("value", "WHETHER_SKID_MOUNTED_PRESSURE_VESSEL");
+                object.put("label", "撬装设备");
+            } else {
+                object.put("key", "whetherSphericalTank");
+                object.put("value", "whetherSphericalTank");
+                object.put("label", "球罐");
+            }
+            qzOrTank.add(object);
+        }
+        return qzOrTank;
+    }
 }
\ No newline at end of file