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

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

 package com.dsk.web.controller.search;
 
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -31,31 +33,37 @@ public class MarketAnalysisController {
     }
 
     /*
-     * 资质等级按照大类、等级类型分组
+     * 资质等级按照行业、等级类型分组
      */
-    @RequestMapping("/certGroupByCategoryAndLevel")
-    public AjaxResult certGroupByCategoryAndLevel() {
+    @RequestMapping("/certGroupByMajorAndLevel")
+    public AjaxResult certGroupByMajorAndLevel() {
 
-        return marketAnalysisService.certGroupByCategoryAndLevel();
+        return marketAnalysisService.certGroupByMajorAndLevel();
     }
 
 
     /*
-     * 资质等级按照小类、等级类型分组
+     * 资质等级按照大类、省份、等级类型分组
      */
-    @RequestMapping("/certGroupByTypeAndLevel")
-    public AjaxResult certGroupByTypeAndLevel() {
+    @RequestMapping("/certGroupByCategoryProvinceLevel")
+    public AjaxResult certGroupByCategoryProvinceLevel() {
 
-        return marketAnalysisService.certGroupByTypeAndLevel();
+        return marketAnalysisService.certGroupByMajorProvinceLevel();
     }
 
-
     /*
-     * 资质等级按照大类、省份、等级类型分组
+     * 中标数量按省份分组
      */
-    @RequestMapping("/certGroupByCategoryProvinceLevel")
-    public AjaxResult certGroupByCategoryProvinceLevel() {
+    @RequestMapping("/countGroupByProvince")
+    public AjaxResult countGroupByProvince(@RequestBody ComposeQueryDto compose) {
+        return marketAnalysisService.countGroupByProvince(compose);
+    }
 
-        return marketAnalysisService.certGroupByCategoryProvinceLevel();
+    /*
+     * 中标数量按月份分组
+     */
+    @RequestMapping("/countGroupByMonth")
+    public AjaxResult countGroupByMonth(@RequestBody ComposeQueryDto compose) {
+        return marketAnalysisService.countGroupByMonth(compose);
     }
 }

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

 package com.dsk.web.controller.search.service;
 
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
 
 /**
  * @Author liujie
@@ -11,9 +12,11 @@ public interface MarketAnalysisService {
 
     AjaxResult areaGroupByProvince();
 
-    AjaxResult certGroupByTypeAndLevel();
+    AjaxResult certGroupByMajorAndLevel();
 
-    AjaxResult certGroupByCategoryAndLevel();
+    AjaxResult certGroupByMajorProvinceLevel();
 
-    AjaxResult certGroupByCategoryProvinceLevel();
+    AjaxResult countGroupByProvince(ComposeQueryDto compose);
+
+    AjaxResult countGroupByMonth(ComposeQueryDto compose);
 }

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

@@ -3,6 +3,7 @@ package com.dsk.web.controller.search.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
+import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.http.HttpUtils;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
@@ -29,18 +30,27 @@ 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;
+    public AjaxResult certGroupByMajorProvinceLevel()  {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult certGroupByCategoryProvinceLevel()  {
+    public AjaxResult countGroupByProvince(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 
-        return null;
+    @Override
+    public AjaxResult countGroupByMonth(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
     }
 }