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

 package com.dsk.web.controller.search.controller;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -9,6 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
 
 
 /**
@@ -18,7 +23,7 @@ import javax.annotation.Resource;
  */
 @RequestMapping("/marketAnalysis")
 @RestController
-public class MarketAnalysisController {
+public class MarketAnalysisController extends BaseController {
 
 
     @Resource
@@ -86,11 +91,23 @@ public class MarketAnalysisController {
         return marketAnalysisService.countGroupByProvince(object);
     }
 
+    @RequestMapping("/getYear")
+    public TableDataInfo getYear(){
+        List<Integer> list = new ArrayList<>();
+        Calendar calendar = Calendar.getInstance();
+        int nowYear = calendar.get(Calendar.YEAR);
+        list.add(nowYear);
+        for (int i = 1; i < 5; i++) {
+            list.add(nowYear-i);
+        }
+        return getDataTable(list);
+    }
+
     /*
      * 中标数量按月份分组
      */
     @RequestMapping("/countGroupByMonth")
-    public AjaxResult countGroupByMonth() {
-        return marketAnalysisService.countGroupByMonth();
+    public AjaxResult countGroupByMonth(@RequestBody JSONObject object) {
+        return marketAnalysisService.countGroupByMonth(object);
     }
 }

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

@@ -19,7 +19,7 @@ public interface MarketAnalysisService {
 
     AjaxResult countGroupByProvince(JSONObject object);
 
-    AjaxResult countGroupByMonth();
+    AjaxResult countGroupByMonth(JSONObject object);
 
     AjaxResult bidMoneyGroupByProjectType(JSONObject object);
 

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

@@ -62,8 +62,8 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     }
 
     @Override
-    public AjaxResult countGroupByMonth() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", null);
+    public AjaxResult countGroupByMonth(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }