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

# Conflicts:
#	dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java
招标市场

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

@@ -82,15 +82,15 @@ public class MarketAnalysisController {
      * 中标数量按省份分组
      */
     @RequestMapping("/countGroupByProvince")
-    public AjaxResult countGroupByProvince(@RequestBody ComposeQueryDto compose) {
-        return marketAnalysisService.countGroupByProvince(compose);
+    public AjaxResult countGroupByProvince(@RequestBody JSONObject object) {
+        return marketAnalysisService.countGroupByProvince(object);
     }
 
     /*
      * 中标数量按月份分组
      */
     @RequestMapping("/countGroupByMonth")
-    public AjaxResult countGroupByMonth(@RequestBody ComposeQueryDto compose) {
-        return marketAnalysisService.countGroupByMonth(compose);
+    public AjaxResult countGroupByMonth() {
+        return marketAnalysisService.countGroupByMonth();
     }
 }

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

@@ -17,9 +17,9 @@ public interface MarketAnalysisService {
 
     AjaxResult certGroupByMajorProvinceLevel();
 
-    AjaxResult countGroupByProvince(ComposeQueryDto compose);
+    AjaxResult countGroupByProvince(JSONObject object);
 
-    AjaxResult countGroupByMonth(ComposeQueryDto compose);
+    AjaxResult countGroupByMonth();
 
     AjaxResult bidMoneyGroupByProjectType(JSONObject object);
 

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

@@ -56,14 +56,14 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     }
 
     @Override
-    public AjaxResult countGroupByProvince(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult countGroupByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByProvince", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult countGroupByMonth(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult countGroupByMonth() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }