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

@@ -17,10 +17,10 @@ public enum CompanyAdvanceSearchEnum {
     EXPIRYDATE("许可有效期", "expiryDate",TechnicalParameter.ParamType.DATE,"",null,null),
     UNIT_TYPE("企业类型", "unitType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null),
     REGULATORY_LABELS("企业等级", "regulatoryLabels",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","QYBQ",null),
-    INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","HYZGBM",null),
+    INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicDataNew?type={type}","HYZGBM",null),
     ITEM_CODE("许可项目", "itemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK",null,null),
     SUB_ITEM_CODE("许可子项目", "subItemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK?type={type}",null,"itemCode"),
-    OPERATING_STATUS("经营状态", "operatingStatus",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","jyzt",null),
+    OPERATING_STATUS("经营状态", "operatingStatus",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicDataNew?type={type}","jyzt",null),
     EQUIP_CATEGORY("监管设备类型", "equipCategory",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",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

@@ -240,6 +240,17 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryDicDataNew")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索字典类型", notes = "高级搜索字典类型")
+    public ResponseModel<JSONArray> queryDicDataNew(@RequestParam String dataKey) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryDicDataNew(dataKey));
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryIsSupervisoryCode")
     @ApiOperation(httpMethod = "GET", value = "高级搜索赋码状态", notes = "高级搜索赋码状态")
     public ResponseModel<JSONArray> queryIsSupervisoryCode() {

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

@@ -152,6 +152,20 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return jsonArray;
     }
 
+    public JSONArray queryDicDataNew(String dictCode) {
+        JSONArray jsonArray = new JSONArray();
+        //根据dictCode查询数据字典
+        List<DataDictionary> dictionaries = dataDictionaryService.getByType(dictCode);
+        for (DataDictionary dictionary : dictionaries) {
+            JSONObject object = new JSONObject();
+            object.put("label", dictionary.getName());
+            object.put("value", dictionary.getName());
+            object.put("key", dictionary.getCode());
+            jsonArray.add(object);
+        }
+        return jsonArray;
+    }
+
     private JSONArray getConditionList(TechnicalParameter.ParamType value, String dictCode) {
         return ConditionEnum.getByCode(ValidationUtil.isEmpty(dictCode) ? value : null);
     }
@@ -1276,9 +1290,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         result.put("regulatoryLabels", deployDictionary(dataDictionaryService.getByType("QYBQ")));
 
         //行业主管部门
-        result.put("industrySupervisor", deployDictionary(dataDictionaryService.getByType("HYZGBM")));
+        result.put("industrySupervisor", deployDictionaryNew(dataDictionaryService.getByType("HYZGBM")));
         //经营状态
-        result.put("operatingStatus", deployDictionary(dataDictionaryService.getByType("jyzt")));
+        result.put("operatingStatus", deployDictionaryNew(dataDictionaryService.getByType("jyzt")));
 
         //许可状态
         JSONArray permitStatusData = new JSONArray();
@@ -1403,6 +1417,24 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return result;
     }
 
+    /**
+     * 特殊处理字典，value为name
+     * @param list
+     * @return
+     */
+    public JSONArray deployDictionaryNew(List<DataDictionary> list) {
+        JSONArray result = new JSONArray();
+        for (int i = 0; i < list.size(); i++) {
+            JSONObject object = new JSONObject();
+            object.put("key", list.get(i).getCode());
+            object.put("value", list.get(i).getName());
+            object.put("label", list.get(i).getName());
+            result.add(object);
+        }
+
+        return result;
+    }
+
     public JSONArray queryXK(String type) {
         JSONArray result = new JSONArray();
         if (ValidationUtil.isEmpty(type)) {