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

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

@@ -18,7 +18,7 @@ public enum EquipAdvanceSearchEnum {
     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"),
+    TECH_PARAM("技术参数", "techParam", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryTechParam?type={type}",null,"EQU_LIST.0,EQU_CATEGORY.0,EQU_DEFINE.0"),
     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),

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

@@ -53,7 +53,7 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @PostMapping(value = "/select/queryEquipmentSearchData")
     @ApiOperation(httpMethod = "POST", value = "查询设备查询条件", notes = "查询设备查询条件")
     public ResponseModel<JSONArray> queryEquipmentSearchData(@RequestBody JSONObject jsonObject) {
-        return ResponseHelper.buildResponse(statisticalAnalysisService.queryEquipmentSearchData(jsonObject.getString("value")));
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryEquipmentSearchData(jsonObject));
     }
 
     /**
@@ -327,7 +327,7 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryTechParam")
     @ApiOperation(httpMethod = "GET", value = "高级搜索技术参数", notes = "高级搜索技术参数")
-    public ResponseModel<JSONArray> queryTechParam(String type) {
+    public ResponseModel<JSONArray> queryTechParam(@RequestParam() String type) {
         return ResponseHelper.buildResponse(statisticalAnalysisService.queryTechParam(type));
     }
 

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

@@ -136,8 +136,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return list;
     }
 
-    public JSONArray queryEquipmentSearchData(String value) {
-        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(value);
+    public JSONArray queryEquipmentSearchData(JSONObject jsonObject) {
+        String equList = jsonObject.getString("EQU_LIST");
+        String equCategory = jsonObject.getString("EQU_CATEGORY");
+        String equDefine = jsonObject.getString("EQU_DEFINE");
+        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine);
         JSONArray list = new JSONArray();
         for (int i = 0; i < paramMetaList.size(); i++) {
             JSONObject object = new JSONObject();
@@ -2249,10 +2252,15 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
     }
 
     public JSONArray queryTechParam(String type) {
-        if (ValidationUtil.isEmpty(type)) {
-            throw new BaseException("需要先选择设备品种，才能选择技术参数", "200", "需要先选择设备品种，才能选择技术参数");
+
+        String[] split = type.split(",");
+        String equList = split[0];
+        String equCategory = "".equals(split[1]) ? null : split[1];
+        String equDefine = "".equals(split[2]) ? null : split[2];
+        if ("".equals(equList) || null == equList) {
+            throw new BaseException("需要先选择设备种类，才能选择技术参数", "200", "需要先选择设备种类，才能选择技术参数");
         }
-        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(type);
+        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList,equCategory,equDefine);
         JSONArray list = new JSONArray();
         for (int i = 0; i < paramMetaList.size(); i++) {
             JSONObject object = new JSONObject();