调整技术参数入参接口

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",null,"EQU_LIST,EQU_CATEGORY,EQU_DEFINE,WHETHER_VEHICLE_CYLINDER,QZ_OR_TANK"),
+    TECH_PARAM("技术参数", "techParam", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryTechParam",null,"EQU_LIST_CODE,EQU_CATEGORY_CODE,EQU_DEFINE_CODE,WHETHER_VEHICLE_CYLINDER,QZ_OR_TANK"),
     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/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -2435,9 +2435,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     public JSONArray queryTechParam(JSONObject jsonObject) {
 
-        String equList = jsonObject.getString("EQU_LIST");
-        String equCategory = jsonObject.getString("EQU_CATEGORY");
-        String equDefine = jsonObject.getString("EQU_DEFINE");
+        String equList = jsonObject.getString("EQU_LIST_CODE");
+        String equCategory = jsonObject.getString("EQU_CATEGORY_CODE");
+        String equDefine = jsonObject.getString("EQU_DEFINE_CODE");
         String vehicleCylinder = "1".equals(jsonObject.getString("WHETHER_VEHICLE_CYLINDER")) ? "vehicleCylinder" : null;
         if ("".equals(equList) || null == equList) {
             throw new BaseException("需要先选择设备种类，才能选择技术参数", "200", "需要先选择设备种类，才能选择技术参数");