Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

# Conflicts:
#	dsk-admin/src/main/java/com/dsk/web/controller/search/service/MarketAnalysisService.java
中标市场分析

dsk-admin/src/main/java/com/dsk/web/controller/search/MarketAnalysisController.java

@@ -33,22 +33,12 @@ public class MarketAnalysisController {
     }
 
     /*
-     * 资质等级按照大类、等级类型分组
+     * 资质等级按照行业、等级类型分组
      */
-    @RequestMapping("/certGroupByCategoryAndLevel")
-    public AjaxResult certGroupByCategoryAndLevel() {
+    @RequestMapping("/certGroupByMajorAndLevel")
+    public AjaxResult certGroupByMajorAndLevel() {
 
-        return marketAnalysisService.certGroupByCategoryAndLevel();
-    }
-
-
-    /*
-     * 资质等级按照小类、等级类型分组
-     */
-    @RequestMapping("/certGroupByTypeAndLevel")
-    public AjaxResult certGroupByTypeAndLevel() {
-
-        return marketAnalysisService.certGroupByTypeAndLevel();
+        return marketAnalysisService.certGroupByMajorAndLevel();
     }
 
 
@@ -58,7 +48,7 @@ public class MarketAnalysisController {
     @RequestMapping("/certGroupByCategoryProvinceLevel")
     public AjaxResult certGroupByCategoryProvinceLevel() {
 
-        return marketAnalysisService.certGroupByCategoryProvinceLevel();
+        return marketAnalysisService.certGroupByMajorProvinceLevel();
     }
 
     /*

dsk-admin/src/main/java/com/dsk/web/controller/search/service/MarketAnalysisService.java

@@ -12,11 +12,9 @@ public interface MarketAnalysisService {
 
     AjaxResult areaGroupByProvince();
 
-    AjaxResult certGroupByTypeAndLevel();
+    AjaxResult certGroupByMajorAndLevel();
 
-    AjaxResult certGroupByCategoryAndLevel();
-
-    AjaxResult certGroupByCategoryProvinceLevel();
+    AjaxResult certGroupByMajorProvinceLevel();
 
     AjaxResult countGroupByProvince(ComposeQueryDto compose);
 

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/MarketAnalysisServiceImpl.java

@@ -30,19 +30,16 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     }
 
     @Override
-    public AjaxResult certGroupByTypeAndLevel() {
-        return null;
+    public AjaxResult certGroupByMajorAndLevel() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorAndLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
     }
 
-    @Override
-    public AjaxResult certGroupByCategoryAndLevel() {
-        return null;
-    }
 
     @Override
-    public AjaxResult certGroupByCategoryProvinceLevel()  {
-
-        return null;
+    public AjaxResult certGroupByMajorProvinceLevel()  {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override