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/business/BusinessOverviewController.java

 package com.dsk.web.controller.business;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.utils.SecurityUtils;
@@ -8,6 +9,7 @@ import com.dsk.system.service.IBusinessOverviewService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -31,4 +33,22 @@ public class BusinessOverviewController extends BaseController {
     public AjaxResult statistics(){
         return AjaxResult.success(baseService.statistics(new BusinessSearchDto(SecurityUtils.getUserId())));
     }
+
+    /**
+     * 公招项目地区统计
+     * @return
+     */
+    @GetMapping("/countGroupByProvince")
+    public AjaxResult countGroupByProvince(@RequestBody JSONObject object){
+        return baseService.countGroupByProvince(object);
+    }
+
+    /**
+     * 公招项目投资金额统计
+     * @return
+     */
+    @GetMapping("/rangByMoney")
+    public AjaxResult rangByMoney(@RequestBody JSONObject object){
+        return baseService.rangByMoney(object);
+    }
 }

dsk-system/src/main/java/com/dsk/system/service/IBusinessOverviewService.java

 package com.dsk.system.service;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.system.domain.business.dto.BusinessSearchDto;
 
 import java.util.Map;
@@ -12,4 +14,8 @@ public interface IBusinessOverviewService {
 
     Map<String, Object> statistics(BusinessSearchDto dto);
 
+    AjaxResult countGroupByProvince(JSONObject object);
+
+    AjaxResult rangByMoney(JSONObject object);
+
 }

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -152,6 +152,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                             vo.setInvestmentAmount(MapUtil.getDouble(map, "projectContractAmount"));
                         }
                         vo.setProjectType(MapUtil.getStr(map, "projectType"));
+                        vo.setProjectStage(MapUtil.getStr(map, "tenderStage"));
                         vo.setProjectCategory(MapUtil.getStr(map, "projectPurposes"));
                         vos.add(vo);
                     }

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessOverviewServiceImpl.java

 package com.dsk.system.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.annotation.DataScope;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.BaseEntity;
+import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.business.dto.BusinessSearchDto;
 import com.dsk.system.mapper.BusinessInfoMapper;
 import com.dsk.system.service.IBusinessOverviewService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +27,9 @@ public class BusinessOverviewServiceImpl implements IBusinessOverviewService {
     @Resource
     private BusinessInfoMapper businessInfoMapper;
 
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
     @Override
     @DataScope(userAlias = "u",deptAlias = "d")
     public Map<String, Object> statistics(BusinessSearchDto dto) {
@@ -39,4 +47,16 @@ public class BusinessOverviewServiceImpl implements IBusinessOverviewService {
         resultMap.put("bidCount",businessInfoMapper.selectCountByStatus(dto));
         return resultMap;
     }
+
+    @Override
+    public AjaxResult countGroupByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/project/countGroupByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult rangByMoney(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/project/rangByMoney", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }