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

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;
 
@@ -25,10 +27,43 @@ public class BusinessOverviewController extends BaseController {
     private IBusinessOverviewService baseService;
 
     /**
-     * 项目统计
+     * 项目状态统计
      */
-    @GetMapping("/statistics")
-    public AjaxResult statistics(){
-        return AjaxResult.success(baseService.statistics(new BusinessSearchDto(SecurityUtils.getUserId())));
+    @GetMapping("/status/statistics")
+    public AjaxResult statusStatistics(){
+        return AjaxResult.success(baseService.statusStatistics(new BusinessSearchDto(SecurityUtils.getUserId())));
+    }
+    /**
+     * 项目资金分析
+     */
+    @GetMapping("/amount/analyze")
+    public AjaxResult amountAnalyze(){
+        return AjaxResult.success(baseService.amountAnalyze(new BusinessSearchDto(SecurityUtils.getUserId(),0)));
+    }
+
+    /**
+     * 项目类型分析
+     */
+    @GetMapping("/type/analyze")
+    public AjaxResult typeAnalyze(){
+        return AjaxResult.success(baseService.typeAnalyze(new BusinessSearchDto(SecurityUtils.getUserId(),2)));
+    }
+
+    /**
+     * 公招项目地区统计
+     * @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-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java

@@ -43,7 +43,7 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "客户项目列表（openApi）")
     @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
-    public Map<String, Object> clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
+    public TableDataInfo clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientProjectPage(paramMap);
     }
 
@@ -67,7 +67,7 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "供应商项目列表（openApi）")
     @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
-    public Map<String, Object> supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
+    public TableDataInfo supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierProjectPage(paramMap);
     }
 
@@ -102,4 +102,24 @@ public class EnterpriseBussinessController {
     }
 
 
+    @ApiOperation(value = "中标公示详情")
+    @RequestMapping(value = "/bidWinMergeDetail", method = RequestMethod.POST)
+    public R bidWinMergeDetail(@RequestBody EnterpriseBusinessBidWinMergeDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.bidWinMergeDetail(paramMap);
+    }
+
+
+    @ApiOperation(value = "四库业绩详情")
+    @RequestMapping(value = "/skyProjectDetail", method = RequestMethod.POST)
+    public R skyProjectDetail(@RequestBody EnterpriseBusinessSkyProjectDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.skyProjectDetail(paramMap);
+    }
+
+    @ApiOperation(value = "荣誉奖项详情")
+    @RequestMapping(value = "/awardDetail", method = RequestMethod.POST)
+    public R awardDetail(@RequestBody EnterpriseBusinessAwardDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.awardDetail(paramMap);
+    }
+
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessAwardDetailBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessAwardDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String sourceId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessAwardDetailVo.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessAwardDetailVo {
+    /**
+     * 来源名称
+     */
+    private String sourceName;
+
+    /**
+     * 来源url
+     */
+    private String sourceUrl;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessBidWinMergeDetailBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessBidWinMergeDetailBody {
+    /**
+     * 来源id
+     */
+    @NotNull(message = "id不能为空")
+    private String sourceId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessSkyProjectDetailBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessSkyProjectDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private Long sourceId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientPageBody.java

@@ -36,4 +36,15 @@ public class EnterpriseBussinessClientPageBody extends BasePage {
         return 0 == cid;
     }
 
+    /**
+     * 来源
+     */
+    private List<String> sources;
+
+
+    /**
+     * 项目类型
+     */
+    private List<String> projects;
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientProjectPageBody.java

@@ -7,6 +7,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 @ToString
@@ -20,10 +21,10 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
     private Integer cid;
 
     /**
-     * 企业id
+     * 客户企业Id
      */
     @NotNull(message = "企业id不能为空")
-    private Integer unitId;
+    private Integer companyId;
 
     /**
      * 查询关键字
@@ -32,7 +33,29 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
 
 
     public boolean isVaildCid() {
-        return 0 == cid || 0 == unitId;
+        return 0 == cid || 0 == companyId;
     }
 
+    /**
+     * 来源
+     */
+    private List<String> sources;
+
+
+    /**
+     * 项目类型
+     */
+    private List<String> projects;
+
+    /**
+     * 金额起
+     */
+    private Double amountStart;
+
+    /**
+     * 金额止
+     */
+    private Double amountEnd;
+
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierPageBody.java

@@ -7,6 +7,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 @ToString
@@ -34,4 +35,15 @@ public class EnterpriseBussinessSupplierPageBody extends BasePage {
     public boolean isVaildCid() {
         return 0 == cid;
     }
+
+    /**
+     * 来源
+     */
+    private List<String> sources;
+
+
+    /**
+     * 项目类型
+     */
+    private List<String> projects;
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierProjectPageBody.java

@@ -7,6 +7,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 @ToString
@@ -20,10 +21,10 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
     private Integer cid;
 
     /**
-     * 企业id
+     * 供应商企业Id
      */
     @NotNull(message = "企业id不能为空")
-    private Integer unitId;
+    private Integer companyId;
 
     /**
      * 查询关键字
@@ -32,8 +33,28 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
 
 
     public boolean isVaildCid() {
-        return 0 == cid || 0 == unitId;
+        return 0 == cid || 0 == companyId;
     }
-    
 
+
+    /**
+     * 来源
+     */
+    private List<String> sources;
+
+
+    /**
+     * 项目类型
+     */
+    private List<String> projects;
+
+    /**
+     * 金额起
+     */
+    private Double amountStart;
+
+    /**
+     * 金额止
+     */
+    private Double amountEnd;
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessVo.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessVo {
+    /**
+     * 来源Id
+     */
+    private String source_id;
+
+    /**
+     * 类型
+     */
+    private String source_type;
+
+}

dsk-operate-ui/src/views/project/projectList/component/addProject.vue

@@ -19,9 +19,9 @@
         </div>
       </el-form-item>
       <el-form-item label="招采单位：" class="row"  prop="ownerCompany">
-        <el-input type="text" placeholder="请输入" v-model="queryParam.ownerCompany" @input="getCompany" :οnkeyup="queryParam.ownerCompany=queryParam.ownerCompany.replace(/^\s+|\s+$/g,'')"></el-input>
-        <div class="resultlist" v-if="showlist" id="box">
-          <div v-for="(item,index) in companData" @click="selCompany(item)"><span  v-html="item.name"></span></div>
+        <el-input type="text" placeholder="请输入" v-model="queryParam.ownerCompany" @input="getCompany(1)" :οnkeyup="queryParam.ownerCompany=queryParam.ownerCompany.replace(/^\s+|\s+$/g,'')"></el-input>
+        <div class="resultlist infinite-list" v-if="showlist" v-infinite-scroll="load" id="box" style="overflow:auto">
+          <div class="infinite-list-item" v-for="(item,index) in companData" @click="selCompany(item)"><span  v-html="item.name" :key="companypage"></span></div>
         </div>
       </el-form-item>
       <el-form-item label="项目阶段：" class="row">
@@ -96,6 +96,8 @@
         projectType:[],//项目类型
         projectCategory:[],//项目类别
         proList:[],//项目列表
+        companypage:1,
+        isscroll:false,
       }
     },
     mounted(){
@@ -135,20 +137,41 @@
       },
       //获取建设库客户
       getCompany(value){
-        this.queryParam.companyId = ''
-        if (value.length>=2){
+        this.queryParam.companyId = null
+        if(value == 1){
+          this.companData = []
+          this.companypage = 1
+        }
+        if (this.queryParam.ownerCompany.length>=2){
           let param = {
-            keyword:value,
+            keyword:this.queryParam.ownerCompany,
             page:{
               limit:20,
-              page:1
+              page:this.companypage
             }
           }
           getEnterprise(JSON.stringify(param)).then(result=>{
-            if(result.code != 200)
-              return
-            this.showlist = true
-            this.companData = result.data.list
+            if(result.code != 200){
+              return false
+            }
+            if(result.data.list != null && result.data.list.length>0){
+              this.isscroll = true
+              if (this.companData.length===0) {
+                this.companData = result.data.list
+              } else {
+                let arr2 = result.data.list
+                arr2.unshift(2, 0);
+                Array.prototype.splice.apply(this.companData, arr2);
+              }
+              if(this.companData.length===0) {
+                this.showlist = false
+              }else{
+                this.showlist = true
+              }
+              this.companypage += 1
+            }else{
+              this.isscroll = false
+            }
           })
         }
       },
@@ -167,6 +190,11 @@
           })
         }
       },
+      load(){
+        if(this.isscroll){
+          this.getCompany(2)
+        }
+      },
       selCompany(item){
         this.queryParam.companyId = item.jskEid
         this.queryParam.ownerCompany = item.name.replace(/<[^>]+>/g, '')

dsk-operate-ui/src/views/project/projectList/component/xmsl.vue

@@ -40,7 +40,7 @@
               <div style="position: relative">
               <el-input placeholder="待添加" id="biaoqian" :disabled="isDisabled" v-model="tipsvalue" @input="getValue" :style="spanWidth"></el-input><span class="spanText">{{ tipsvalue }}</span>
               </div>
-              <div class="addbtn" v-if="isDisabled == false" @click="addtips"></div>
+              <!--<div class="addbtn" v-if="isDisabled == false" @click="addtips"></div>-->
             </div>
           </div>
         </div>

dsk-system/src/main/java/com/dsk/system/domain/business/dto/BusinessListDto.java

@@ -3,6 +3,7 @@ package com.dsk.system.domain.business.dto;
 import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -72,4 +73,16 @@ public class BusinessListDto extends BaseEntity {
      * 业主单位
      */
     private String ownerCompany;
+    /**
+     * 项目状态
+     */
+    private Integer status;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
 }

dsk-system/src/main/java/com/dsk/system/domain/business/dto/BusinessSearchDto.java

 package com.dsk.system.domain.business.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,30 +15,33 @@ import java.util.Map;
 @Data
 @NoArgsConstructor
 public class BusinessSearchDto implements Serializable {
-
-    /**
-     * 状态
-     */
-    private Integer status;
     /**
      * 用户id
      */
     private Long userId;
+    /**
+     * 状态
+     */
+    private Integer status;
+
     /**
      * 数据权限
      */
-    private Map<String,Object> params;
+    private Map<String, Object> params;
 
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
+    public Map<String, Object> getParams() {
+        if (params == null) {
             params = new HashMap<>();
         }
         return params;
     }
 
-    public BusinessSearchDto(Long userId){
+    public BusinessSearchDto(Long userId) {
+        this.userId = userId;
+    }
+
+    public BusinessSearchDto(Long userId, Integer status) {
         this.userId = userId;
+        this.status = status;
     }
 }

dsk-system/src/main/java/com/dsk/system/domain/business/vo/BusinessAnalyzeVo.java

+package com.dsk.system.domain.business.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 项目金额分析
+ *
+ * @author lcl
+ * @create 2023/8/15
+ */
+@Data
+public class BusinessAnalyzeVo implements Serializable {
+    /**
+     * 项目类型
+     */
+    private String projectType;
+    /**
+     * 资金来源
+     */
+    private String amountSource;
+    /**
+     * 项目数量
+     */
+    private Integer businessCount;
+    /**
+     * 总投资金额
+     */
+    private Double totalAmount;
+}

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -3,10 +3,12 @@ package com.dsk.system.dskService;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
+import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,23 +58,40 @@ public class EnterpriseBussinessService {
 
     public TableDataInfo clientPage(EnterpriseBussinessClientPageBody body) throws Exception {
         if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage2", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public Map<String, Object> clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
+    public TableDataInfo clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
         if (body.isVaildCid()) return null;
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage2", BeanUtil.beanToMap(body, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
+
         Map data = MapUtils.getMap(map, "data", null);
-        if (200 != code) throw new RuntimeException();
-        Integer count = MapUtils.getInteger(data, "totalCount", 0);
-        Object list = MapUtils.getObject(data, "list", "");
-        TableDataInfo tableDataInfo = new TableDataInfo((List<?>) list, count);
-        Map<String, Object> resMap = BeanUtil.beanToMap(tableDataInfo);
-        resMap.put("totalAmount", MapUtils.getDouble(data, "totalAmount", 0.0));
-        return resMap;
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+
+        for (Object supplierProject : list) {
+            Map<String, Object> dataMap = CommonUtils.assertAsMap(supplierProject);
+            dataMap.put("sourceId", null);
+            dataMap.put("sourceType", null);
+            String source = MapUtils.getString(dataMap, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBussinessVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBussinessVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBussinessVo vo = enterpriseBussinessVoList.get(0);
+                    dataMap.put("sourceId", vo.getSource_id());
+                    dataMap.put("sourceType", vo.getSource_type());
+                }
+            }
+        }
+        return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
     }
 
 
@@ -121,25 +140,46 @@ public class EnterpriseBussinessService {
 
 
     public TableDataInfo supplierPage(EnterpriseBussinessSupplierPageBody body) throws Exception {
-        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage", BeanUtil.beanToMap(body, false, false));
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage2", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public Map<String, Object> supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
-        if (body.isVaildCid()) return null;
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false));
+    public TableDataInfo supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage2", BeanUtil.beanToMap(body, false, false));
         log.info(JSONUtil.toJsonStr(map));
+
         Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
         Map data = MapUtils.getMap(map, "data", null);
-        if (200 != code) throw new RuntimeException();
-        Integer count = MapUtils.getInteger(data, "totalCount", 0);
-        Object list = MapUtils.getObject(data, "list", "");
-        TableDataInfo tableDataInfo = new TableDataInfo((List<?>) list, count);
-        Map<String, Object> resMap = BeanUtil.beanToMap(tableDataInfo);
-        resMap.put("totalAmount", MapUtils.getDouble(data, "totalAmount", 0.0));
-        return resMap;
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+
+        for (Object supplierProject : list) {
+            Map<String, Object> dataMap = CommonUtils.assertAsMap(supplierProject);
+            dataMap.put("sourceId", null);
+            dataMap.put("sourceType", null);
+            String source = MapUtils.getString(dataMap, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBussinessVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBussinessVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBussinessVo vo = enterpriseBussinessVoList.get(0);
+                    dataMap.put("sourceId", vo.getSource_id());
+                    dataMap.put("sourceType", vo.getSource_type());
+                }
+            }
+        }
+        return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
     }
 
 
@@ -175,4 +215,34 @@ public class EnterpriseBussinessService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendProvince", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
+
+    public R bidWinMergeDetail(EnterpriseBusinessBidWinMergeDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/bidWinMergeDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R skyProjectDetail(EnterpriseBusinessSkyProjectDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/skyProjectDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R awardDetail(EnterpriseBusinessAwardDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/awardDetail", BeanUtil.beanToMap(body, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
+        Map data = MapUtils.getMap(map, "data", null);
+        if (ObjectUtil.isNotEmpty(data)) {
+            String source = MapUtils.getString(data, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBusinessAwardDetailVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBusinessAwardDetailVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBusinessAwardDetailVo vo = enterpriseBussinessVoList.get(0);
+                    return R.ok(vo);
+                }
+            }
+        }
+        return BeanUtil.toBean(map, R.class);
+    }
 }

dsk-system/src/main/java/com/dsk/system/mapper/BusinessInfoMapper.java

 package com.dsk.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsk.common.annotation.DataScope;
 import com.dsk.common.core.domain.entity.BusinessInfo;
 import com.dsk.system.domain.business.dto.BusinessListDto;
 import com.dsk.system.domain.business.dto.BusinessSearchDto;
+import com.dsk.system.domain.business.vo.BusinessAnalyzeVo;
 import com.dsk.system.domain.business.vo.BusinessLikeProjectNameListVo;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.vo.CustomerBusinessListVo;
@@ -112,4 +112,8 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo> {
 
     int selectCountByStatus(BusinessSearchDto dto);
 
+    List<BusinessAnalyzeVo> selectAmountAnalyze(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> selectTypeAnalyze(BusinessSearchDto dto);
+
 }

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 com.dsk.system.domain.business.vo.BusinessAnalyzeVo;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -10,6 +14,14 @@ import java.util.Map;
  */
 public interface IBusinessOverviewService {
 
-    Map<String, Object> statistics(BusinessSearchDto dto);
+    Map<String, Object> statusStatistics(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> amountAnalyze(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> typeAnalyze(BusinessSearchDto dto);
+
+    AjaxResult countGroupByProvince(JSONObject object);
+
+    AjaxResult rangByMoney(JSONObject object);
 
 }

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

 package com.dsk.system.service.impl;
 
+import com.dsk.common.annotation.DataScope;
 import com.dsk.common.core.domain.entity.BusinessFollowRecord;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.system.domain.business.dto.BusinessIdDto;
@@ -44,6 +45,7 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
     }
 
     @Override
+    @DataScope(userAlias = "u",deptAlias = "d")
     public List<BusinessFollowRecord> allFollow(BusinessListDto dto) {
         //userId不传值，就查询全部
 //        if (dto.getUserId() == null) {

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.BaseEntity;
-import com.dsk.common.utils.SecurityUtils;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.system.domain.business.dto.BusinessSearchDto;
+import com.dsk.system.domain.business.vo.BusinessAnalyzeVo;
 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;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,9 +27,12 @@ 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) {
+    public Map<String, Object> statusStatistics(BusinessSearchDto dto) {
         Map<String, Object> resultMap = new HashMap<>();
         //总
         resultMap.put("totalCount",businessInfoMapper.selectCountByStatus(dto));
@@ -39,4 +47,28 @@ public class BusinessOverviewServiceImpl implements IBusinessOverviewService {
         resultMap.put("bidCount",businessInfoMapper.selectCountByStatus(dto));
         return resultMap;
     }
+
+    @Override
+    @DataScope(userAlias = "u",deptAlias = "d")
+    public List<BusinessAnalyzeVo> amountAnalyze(BusinessSearchDto dto) {
+        return businessInfoMapper.selectAmountAnalyze(dto);
+    }
+
+    @Override
+    @DataScope(userAlias = "u",deptAlias = "d")
+    public List<BusinessAnalyzeVo> typeAnalyze(BusinessSearchDto dto) {
+        return businessInfoMapper.selectTypeAnalyze(dto);
+    }
+
+    @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);
+    }
 }

dsk-system/src/main/resources/mapper/business/BusinessFollowRecordMapper.xml

@@ -68,10 +68,12 @@
         from business_follow_record f
         left join business_info i on i.id = f.business_id
         left join sys_user u on f.user_id = u.user_id
+        left join sys_dept d on u.dept_id = d.dept_id
         <where>
-            <if test="userId != null">
-                and f.user_id = #{userId}
-            </if>
+            <if test="userId != null"> and (f.user_id = #{userId} or i.is_private = 1)</if>
+            <if test="startTime != null and startTime != '' "> and f.creat_time &gt;= #{startTime} </if>
+            <if test="endTime != null and endTime != '' "> and f.creat_time &lt;= #{endTime} </if>
+            ${params.dataScope}
         </where>
         ORDER BY f.creat_time DESC
     </select>

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -114,6 +114,7 @@
             </if>
             <if test="minAmount != null and minAmount != ''"> and i.investment_amount &gt;= #{minAmount} </if>
             <if test="maxAmount != null and maxAmount != ''">  and i.investment_amount &lt;= #{maxAmount}</if>
+            <if test="status != null ">  and i.status = #{status}</if>
             <if test="projectStage != null and projectStage != ''">
                 and i.project_stage in
                 <foreach collection="projectStage" item="projectStage" open="(" separator="," close=")">
@@ -374,15 +375,32 @@
         <if test="companyName != null and companyName != '' "> and ct.company_name =#{companyName}</if>
     </select>
 
-    <select id="selectCountByStatus" resultType="java.lang.Integer">
-        select
-            count(bi.id)
+    <sql id="businessSearchSql">
         from business_info bi
         join business_user bu on bu.business_id = bi.id
         left join sys_user u on bu.user_id = u.user_id
         left join sys_dept d on u.dept_id = d.dept_id
         where (bu.user_id = #{userId} or bi.is_private = 1)
-        <if test="status != null"> and bi.status = #{status}</if>
+        <if test="status != null"> and bi.status = #{status} </if>
         ${params.dataScope}
+    </sql>
+
+    <select id="selectCountByStatus" resultType="java.lang.Integer">
+        select count(bi.id) <include refid="businessSearchSql"/>
+    </select>
+
+    <select id="selectAmountAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
+        select
+            bi.amount_source,count(bi.id) businessCount,sum(bi.investment_amount) totalAmount
+        <include refid="businessSearchSql"/>
+        group by bi.amount_source
+    </select>
+
+    <select id="selectTypeAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
+        select
+        bi.project_type,count(bi.id) businessCount,sum(bi.investment_amount) totalAmount
+        <include refid="businessSearchSql"/>
+        group by bi.project_type
     </select>
+
 </mapper>