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

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

 package com.dsk.web.controller.customer;
 
 import cn.hutool.core.bean.BeanException;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.http.HttpException;
 import com.dsk.common.annotation.Log;
 import com.dsk.common.annotation.RepeatSubmit;
 import com.dsk.common.core.controller.BaseController;
@@ -14,7 +11,6 @@ import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
-import com.dsk.system.searchService.BusinessOpportunityRadarService;
 import com.dsk.system.service.ICustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,8 +35,6 @@ public class CustomerController extends BaseController {
 
     @Autowired
     private ICustomerService baseService;
-//    @Autowired
-//    private BusinessOpportunityRadarService opportunityRadarService;
 
     /**
      * 查询客户列表
@@ -128,21 +122,6 @@ public class CustomerController extends BaseController {
                 continue;
             }
             try {
-//                Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
-//                if (ObjectUtils.isEmpty(map)) {
-//                    throw new HttpException("远程调用匹配接口失败！");
-//                }
-//                Map<String, Object> obj = BeanUtil.beanToMap(map.get("data"));
-//                if (!ObjectUtils.isEmpty(obj)) {
-//                    customer.setCompanyId(MapUtil.getInt(obj, "jskEid"));
-//                    customer.setLegalPerson(MapUtil.getStr(obj, "legalPerson"));
-//                    customer.setRegisterCapital(MapUtil.getStr(obj, "registeredCapitalStr"));
-//                    customer.setProvinceId(MapUtil.getInt(obj, "provinceId"));
-//                    customer.setCityId(MapUtil.getInt(obj, "cityId"));
-//                    customer.setDistrictId(MapUtil.getInt(obj, "countyId"));
-//                    customer.setRegisterAddress(MapUtil.getStr(obj, "domicile"));
-//                    customer.setCreditCode(MapUtil.getStr(obj, "creditCode"));
-//                }
                 baseService.add(customer);
                 successCount++;
             } catch (Exception e) {

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java

@@ -28,6 +28,13 @@ public class EnterpriseBussinessController {
     @Autowired
     EnterpriseBussinessService enterpriseBussinessService;
 
+
+    @ApiOperation(value = "客户-下拉选项（openApi）")
+    @RequestMapping(value = "/customSelect", method = RequestMethod.GET)
+    public R customSelect() throws Exception {
+        return enterpriseBussinessService.customSelect();
+    }
+
     @ApiOperation(value = "客户信息列表（openApi）")
     @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
     public TableDataInfo clientPage(@RequestBody @Valid EnterpriseBussinessClientPageBody paramMap) throws Exception {

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

@@ -72,17 +72,53 @@ public class MarketAnalysisController extends BaseController {
         return marketAnalysisService.bidMoneyGroupByProjectType(object);
     }
 
+    /*
+     * 全国各地区中标统计TOP10
+     */
+    @RequestMapping("/countBidGroupByProvince")
+    public AjaxResult countBidGroupByProvince(@RequestBody JSONObject object) {
+        return marketAnalysisService.countBidGroupByProvince(object);
+    }
 
 
+    //央企数字化经营系统     土地交易
+    @RequestMapping("/countLandMarketByType")
+    public AjaxResult countLandMarketByType(@RequestBody JSONObject object){
+        return marketAnalysisService.countLandMarketByType(object);
+    }
 
+    //央企数字化经营系统     全国土地交易项目地区
+    @RequestMapping("/countLandMarketByProvince")
+    public AjaxResult countLandMarketByProvince(@RequestBody JSONObject object){
+        return marketAnalysisService.countLandMarketByProvince(object);
+    }
 
+    //央企数字化经营系统     全国土地交易项目地区
+    @RequestMapping("/countLandMarketByYear")
+    public AjaxResult countLandMarketByYear(){
+        return marketAnalysisService.countLandMarketByYear();
+    }
 
+    //央企数字化经营系统     全国公招项目统计
+    @RequestMapping("/countNewsBidByYear")
+    public AjaxResult countNewsBidByYear(){
+        return marketAnalysisService.countNewsBidByYear();
+    }
 
+    //央企数字化经营系统     招标公告  全国各地区项目统计TOP10
+    @RequestMapping("/countNewsBidByProvince")
+    public AjaxResult countNewsBidByProvince(@RequestBody JSONObject object){
+        return marketAnalysisService.countNewsBidByProvince(object);
+    }
 
-
+    //央企数字化经营系统     招标公告  月度统计
+    @RequestMapping("/countNewsBidByMonth")
+    public AjaxResult countNewsBidByMonth(@RequestBody JSONObject object){
+        return marketAnalysisService.countNewsBidByMonth(object);
+    }
 
     /*
-     * 中标数量按省份分组
+     * 招标数量按省份分组
      */
     @RequestMapping("/countGroupByProvince")
     public AjaxResult countGroupByProvince(@RequestBody JSONObject object) {

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

-//package com.dsk.web.controller.search.service;
-//
-//import com.alibaba.fastjson2.JSONObject;
-//import com.dsk.common.core.domain.AjaxResult;
-//import com.dsk.common.dtos.ComposeQueryDto;
-//
-///**
-// * @Author liujie
-// * @ClassName MarketAnalysisService
-// * @Date 2023/5/15 16:39
-// **/
-//public interface BusinessOpportunityRadarService {
-//
-//
-//    AjaxResult jskBidNewsPage(JSONObject object);
-//
-//    AjaxResult jskBidTenderPage(JSONObject object);
-//
-//    AjaxResult jskBidPage(JSONObject object);
-//
-//    AjaxResult landMarketPage( JSONObject object);
-//
-//    AjaxResult establishmentPage(JSONObject object);
-//
-//    AjaxResult enterpriseIndex(JSONObject object);
-//
-//    AjaxResult enterpriseByName(String keyword);
-//
-//    AjaxResult enterprisePage(JSONObject object);
-//
-//    AjaxResult bondProjectPage( JSONObject object);
-//
-//    AjaxResult jskBidPlanPage( JSONObject object);
-//
-//    AjaxResult getCapitalSourceSelect();
-//
-//    AjaxResult keywordList();
-//
-//    AjaxResult bidSourceList( JSONObject object);
-//
-//}

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

-//package com.dsk.web.controller.search.service;
-//
-//import com.alibaba.fastjson2.JSONObject;
-//import com.dsk.common.core.domain.AjaxResult;
-//import com.dsk.common.dtos.ComposeQueryDto;
-//
-///**
-// * @Author liujie
-// * @ClassName MarketAnalysisService
-// * @Date 2023/5/15 16:39
-// **/
-//public interface MarketAnalysisService {
-//
-//    AjaxResult areaGroupByProvince();
-//
-//    AjaxResult certGroupByMajorAndLevel();
-//
-//    AjaxResult certGroupByMajorProvinceLevel();
-//
-//    AjaxResult countGroupByProvince(JSONObject object);
-//
-//    AjaxResult countGroupByMonth(JSONObject object);
-//
-//    AjaxResult bidMoneyGroupByProjectType(JSONObject object);
-//
-//    AjaxResult bidGroupCountByProjectType(JSONObject object);
-//}

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

-//package com.dsk.web.controller.search.service.impl;
-//
-//import cn.hutool.core.bean.BeanUtil;
-//import com.alibaba.fastjson2.JSONObject;
-//import com.dsk.common.core.domain.AjaxResult;
-//import com.dsk.common.dtos.ComposeQueryDto;
-//import com.dsk.common.utils.DskOpenApiUtil;
-//import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
-//import com.dsk.web.controller.search.service.MarketAnalysisService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * @Author liujie
-// * @ClassName MarketAnalysisServiceImpl
-// * @Date 2023/5/15 16:40
-// **/
-//@Service
-//public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityRadarService {
-//
-//    @Autowired
-//    private DskOpenApiUtil dskOpenApiUtil;
-//
-//
-//    @Override
-//    public AjaxResult jskBidNewsPage(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//
-//    @Override
-//    public AjaxResult jskBidTenderPage(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult establishmentPage(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult jskBidPage(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page",object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult landMarketPage(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult enterpriseIndex(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult enterprisePage(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//
-//    @Override
-//    public AjaxResult enterpriseByName(String keyword){
-//        Map<String,Object> params = new HashMap<>();
-//        params.put("keyword",keyword);
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult bondProjectPage(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/page", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult jskBidPlanPage(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page",object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult getCapitalSourceSelect() {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult keywordList() {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/keywordList", null);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult bidSourceList(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source",object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//}

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

-//package com.dsk.web.controller.search.service.impl;
-//
-//import cn.hutool.core.bean.BeanUtil;
-//import com.alibaba.fastjson2.JSONObject;
-//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;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.Map;
-//
-///**
-// * @Author liujie
-// * @ClassName MarketAnalysisServiceImpl
-// * @Date 2023/5/15 16:40
-// **/
-//@Service
-//public class MarketAnalysisServiceImpl implements MarketAnalysisService {
-//
-//    @Autowired
-//    private DskOpenApiUtil dskOpenApiUtil;
-//    @Override
-//    public AjaxResult areaGroupByProvince() {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", null);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult certGroupByMajorAndLevel() {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//
-//    @Override
-//    public AjaxResult certGroupByMajorProvinceLevel()  {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//
-//    @Override
-//    public AjaxResult bidMoneyGroupByProjectType(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidMoneyGroupByProjectType", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    public AjaxResult bidGroupCountByProjectType(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidGroupCountByProjectType", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//
-//    @Override
-//    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(JSONObject object) {
-//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", object);
-//        return BeanUtil.toBean(map, AjaxResult.class);
-//    }
-//}

dsk-common/src/main/java/com/dsk/common/core/domain/entity/SysUser.java

@@ -69,9 +69,6 @@ public class SysUser extends BaseEntity
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT)
     private Date loginDate;
 
-    //是否体验用户 0否 1是
-    private Integer isExperience;
-
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Excel.Type.EXPORT),
@@ -299,14 +296,6 @@ public class SysUser extends BaseEntity
         this.roleId = roleId;
     }
 
-    public Integer getIsExperience() {
-        return isExperience;
-    }
-
-    public void setIsExperience(Integer isExperience) {
-        this.isExperience = isExperience;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -323,7 +312,6 @@ public class SysUser extends BaseEntity
             .append("delFlag", getDelFlag())
             .append("loginIp", getLoginIp())
             .append("loginDate", getLoginDate())
-            .append("isExperience", getIsExperience())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

dsk-common/src/main/java/com/dsk/common/utils/StringUtils.java

@@ -612,4 +612,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
         return sb.toString();
     }
+
+    //字符串标红
+    public static String markInRed(String oldStr, String str) {
+        return oldStr.replace(str, "<font color='#FF204E'>" + str + "</font>");
+    }
 }

dsk-operate-ui/src/views/detail/party-a/overview/branch.vue

 <template>
-  <div class="app-container detail-container">
+  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <head-form
       title="分支机构"
       :form-data="formData"
@@ -68,6 +69,7 @@ export default {
   },
   methods: {
     async handleQuery(params) {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       if(param.hasBid=='noLimit'){
@@ -76,6 +78,7 @@ export default {
       let res = await affiliates(param)
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         this.tableData = res.rows
       }
       this.tableDataTotal = res.total

dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue

 <template xmlns="http://www.w3.org/1999/html">
-  <div class="app-container detail-container">
+  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
       <el-tab-pane label="工商信息" name="first"></el-tab-pane>
       <el-tab-pane label="工商变更" :disabled="tableDataTotal>0" name="second"></el-tab-pane>
@@ -104,11 +105,13 @@ export default {
       this.handleQuery()
     },
     async handleQuery() {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = this.baseParams;
       let res = await icInfo(param);
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         this.forInfo = res.data
       }
     },

dsk-operate-ui/src/views/detail/party-a/overview/execuinfo.vue

 <template>
-  <div class="app-container detail-container">
+  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <head-form
       title="高管信息"
       :form-data="formData"
@@ -66,11 +67,13 @@ export default {
   },
   methods: {
     async handleQuery(params) {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await keymembers(param)
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         let tempRows = []
         if(res.rows&&res.rows.length>0){
           let arrLength = res.rows.length%2==0?(res.rows.length/2):(Math.floor(res.rows.length/2)+1)

dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue

 <template>
-  <div class="app-container detail-container">
+<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <head-form
       title=""
       :form-data="formData"
@@ -78,12 +79,14 @@ export default {
       this.handleQuery()
     },
     async handleQuery(params) {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       param.isHistory = this.activeName == 'first' ? 0 : 1
       let res = await bestStockPage(param)
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         this.tableData = res.rows
       }
       this.tableDataTotal = res.total

dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue

 <template>
-  <div class="app-container detail-container">
+  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+  <div class="app-container detail-container" v-else>
     <head-form
       title="对外投资"
       :form-data="formData"
@@ -97,11 +98,13 @@ export default {
   },
   methods: {
     async handleQuery(params) {
+      this.isSkeleton = true;
       this.tableLoading = true
       let param = params?params:this.queryParams
       let res = await investment(param)
       this.tableLoading = false
       if(res.code==200){
+        this.isSkeleton = false;
         this.tableData = res.rows
       }
       this.tableDataTotal = res.total

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -139,8 +139,8 @@
             </div>
             <div class="det-con" v-if="item.ownerCompany ">
               <span>业主单位：</span>
-              <span class="wordprimary" v-if="item.ownerCompanyCid||item.ownerCompanyUipId" @click="toEnterprise(item)">{{item.ownerCompany}}</span>
-              <span v-else>{{item.ownerCompany}}</span>
+              <span class="wordprimary" v-if="item.ownerCompanyCid||item.ownerCompanyUipId" @click="toEnterprise(item)" v-html="item.ownerCompany"></span>
+              <span v-else v-html="item.ownerCompany"></span>
             </div>
           </div>
           <el-divider v-if="index != datalist.length-1"></el-divider>

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

 package com.dsk.system.domain.business.dto;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lxl
@@ -10,7 +12,7 @@ import java.util.List;
  * @Date 2023/5/16 上午 9:10
  **/
 @Data
-public class BusinessListDto {
+public class BusinessListDto extends BaseEntity {
 
     /**
      * 是否私人数据 0：否 1：是

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/CustomerStatusListVo.java

@@ -24,5 +24,9 @@ public class CustomerStatusListVo implements Serializable {
      * 企业名称
      */
     private String companyName;
+    /**
+     * 企业名称
+     */
+    private Integer status;
 
 }

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

@@ -26,6 +26,33 @@ public class EnterpriseBussinessService {
     @Autowired
     private DskOpenApiUtil dskOpenApiUtil;
 
+    public R customSelect() throws Exception {
+        Map<String, Object> objectMap = new HashMap<>(2);
+        List<String> sourceList = new ArrayList<>();
+        sourceList.add("四库业绩");
+        sourceList.add("中标业绩");
+        sourceList.add("水利业绩");
+        sourceList.add("中标公示");
+        sourceList.add("荣誉奖项");
+        objectMap.put("sourceList", sourceList);
+        List<String> projectTypeList = new ArrayList<>();
+
+        projectTypeList.add("房建工程");
+        projectTypeList.add("市政工程");
+        projectTypeList.add("公路工程");
+        projectTypeList.add("水利工程");
+        projectTypeList.add("铁路工程");
+        projectTypeList.add("通信工程");
+        projectTypeList.add("电力工程");
+        projectTypeList.add("机电工程");
+        projectTypeList.add("冶金工程");
+        projectTypeList.add("矿山工程");
+        projectTypeList.add("石油化工工程");
+        projectTypeList.add("港口与航道工程");
+        projectTypeList.add("其他");
+        objectMap.put("projectTypeList", projectTypeList);
+        return BeanUtil.toBean(objectMap, R.class);
+    }
 
     public TableDataInfo clientPage(EnterpriseBussinessClientPageBody body) throws Exception {
         if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);

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

@@ -71,10 +71,11 @@ public class EnterpriseService {
         Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
         String uipId = MapUtils.getString(uipData, "uipId", null);
         companyData.put("uipId", uipId);
-        Integer status = iCustomerService.status(companyName);
-        if (ObjectUtil.isNotEmpty(status)) {
-            companyData.put("claimStatus", status.equals(0) ? 1 : 0);
-        }
+        companyData.put("claimStatus", iCustomerService.status(companyName));
+//        Integer status = iCustomerService.status(companyName);
+//        if (ObjectUtil.isNotEmpty(status)) {
+//            companyData.put("claimStatus", status.equals(0) ? 1 : 0);
+//        }
         Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", map);
         Integer bondCreditRatingCode = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
         if (200 != bondCreditRatingCode) return R.ok(companyData);
@@ -317,10 +318,10 @@ public class EnterpriseService {
             companyMap.put("guaranteeAmount",MapUtils.getDouble(companyMap, "guaranteeAmount")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "guaranteeAmount")));
             companyMap.put("guaranteeRatio",MapUtils.getDouble(companyMap, "guaranteeRatio")==null?null:String.format("%.2f", MapUtils.getDouble(companyMap, "guaranteeRatio")));
 
-            companyMap.put("claimStatus", 0);
+            companyMap.put("claimStatus", null);
             for (CustomerStatusListVo vo : claimStatusList) {
                 if (companyName.equals(vo.getCompanyName())) {
-                    companyMap.put("claimStatus", 1);
+                    companyMap.put("claimStatus", vo.getStatus());
                 }
             }
             for (Map<String, Object> m : objArrayList) {

dsk-system/src/main/java/com/dsk/system/searchService/MarketAnalysisService.java

@@ -54,4 +54,39 @@ public class MarketAnalysisService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    public AjaxResult countNewsBidByMonth(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countNewsBidByMonth", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countNewsBidByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countNewsBidByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countNewsBidByYear() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countNewsBidByYear", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countLandMarketByYear() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByYear", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countLandMarketByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countBidGroupByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countBidGroupByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult countLandMarketByType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByType", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.acc.openapi.client.util.CommonUtils;
+import com.dsk.common.annotation.DataScope;
 import com.dsk.common.config.RuoYiConfig;
 import com.dsk.common.constant.HttpStatus;
 import com.dsk.common.core.domain.AjaxResult;
@@ -91,13 +92,17 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      * @return 项目详情
      */
     @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        dto.setUserId(user.getUserId());
-        if(user.getIsExperience() == 1){
-            dto.setIsPrivate(1);
+        dto.setUserId(SecurityUtils.getUserId());
+        List<BusinessListVo> businessListVos = businessInfoMapper.selectBusinessInfoList(dto);
+        if (!CollectionUtils.isEmpty(businessListVos) && ObjectUtil.isNotEmpty(dto.getProjectName())) {
+            for (BusinessListVo vo : businessListVos) {
+                vo.setProjectName(StringUtils.markInRed(vo.getProjectName(),dto.getProjectName()));
+                vo.setOwnerCompany(StringUtils.markInRed(vo.getOwnerCompany(),dto.getProjectName()));
+            }
         }
-        return businessInfoMapper.selectBusinessInfoList(dto);
+        return businessListVos;
     }
 
     @Override
@@ -139,7 +144,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                 if (!CollectionUtils.isEmpty(list)) {
                     for (Map<String, Object> map : list) {
                         BusinessLikeProjectNameListVo vo = new BusinessLikeProjectNameListVo();
-                        vo.setProjectName(MapUtil.getStr(map, "projectName").replace(dto.getProjectName(), "<font color='#FF204E'>" + dto.getProjectName() + "</font>"));
+                        vo.setProjectName(StringUtils.markInRed(MapUtil.getStr(map, "projectName"),dto.getProjectName()));
                         vo.setCompanyName(MapUtil.getStr(map, "tenderee"));
                         vo.setInvestmentAmount(Double.parseDouble(MapUtil.getStr(map, "projectContractAmount")));
                         vo.setProjectType(MapUtil.getStr(map, "projectType"));
@@ -148,7 +153,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                     }
                 }
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             log.error("模糊查询项目名称调用失败！");
         }
 
@@ -414,7 +419,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         return map;
     }
 
-
     private BusinessRelateCompany dealwithCustomer(BusinessInfo bean) {
         BusinessRelateCompany relateCompany = new BusinessRelateCompany();
         relateCompany.setBusinessId(bean.getId());

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

@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
@@ -59,7 +60,13 @@ public class CustomerServiceImpl implements ICustomerService {
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
         dto.setUserId(SecurityUtils.getUserId());
         dto.setStatus(ObjectUtils.isEmpty(dto.getStatus()) ? 0 : dto.getStatus());
-        return baseMapper.selectList(dto);
+        List<CustomerListVo> customerListVos = baseMapper.selectList(dto);
+        if (!CollectionUtils.isEmpty(customerListVos) && ObjectUtil.isNotEmpty(dto.getCompanyName())) {
+            for (CustomerListVo vo : customerListVos) {
+                vo.setCompanyName(StringUtils.markInRed(vo.getCompanyName(), dto.getCompanyName()));
+            }
+        }
+        return customerListVos;
     }
 
     @Override
@@ -78,14 +85,14 @@ public class CustomerServiceImpl implements ICustomerService {
         dealWithcustomerData(customer);
         if (ObjectUtils.isEmpty(customer.getUipId())) {
             try {
-                List<Integer> list=new ArrayList<>();
+                List<Integer> list = new ArrayList<>();
                 list.add(customer.getCompanyId());
                 R res = enterpriseService.getUipIdByCid(list);
-                if (!ObjectUtils.isEmpty(res.getData())){
-                    List<Map<String,Object>> data = (List<Map<String, Object>>) res.getData();
+                if (!ObjectUtils.isEmpty(res.getData())) {
+                    List<Map<String, Object>> data = (List<Map<String, Object>>) res.getData();
                     customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId"));
                 }
-                if(ObjectUtils.isEmpty(customer.getUipId())){
+                if (ObjectUtils.isEmpty(customer.getUipId())) {
                     res = enterpriseService.getUipId(customer.getCompanyName());
                     if (!ObjectUtils.isEmpty(res.getData())) {
                         customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(res.getData()), "uipId"));
@@ -199,7 +206,7 @@ public class CustomerServiceImpl implements ICustomerService {
             if (!ObjectUtils.isEmpty(map.get("data"))) {
                 Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
                 Integer companyId = MapUtil.getInt(data, "jskEid");
-                if(ObjectUtil.isNotEmpty(customer.getCompanyId()) && !customer.getCompanyId().equals(companyId)) {
+                if (ObjectUtil.isNotEmpty(customer.getCompanyId()) && !customer.getCompanyId().equals(companyId)) {
                     return;
                 }
                 customer.setCompanyId(companyId);
@@ -219,9 +226,9 @@ public class CustomerServiceImpl implements ICustomerService {
                     customer.setDistrictId(MapUtil.getInt(data, "countyId"));
                 }
                 if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
-                    if(ObjectUtil.isNotEmpty(MapUtil.getStr(data, "domicile"))){
+                    if (ObjectUtil.isNotEmpty(MapUtil.getStr(data, "domicile"))) {
                         customer.setRegisterAddress(MapUtil.getStr(data, "domicile"));
-                    }else {
+                    } else {
                         String address = null;
                         if (ObjectUtils.isEmpty(MapUtil.getStr(data, "province"))) {
                             address = MapUtil.getStr(data, "province");

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

@@ -35,6 +35,12 @@ public class EconomicServiceImpl implements EconomicService {
     @Resource
     private RedisCache redisCache;
 
+    /**
+     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     */
+    private static final Integer TYPE = 1;
+
+
     @Override
     public AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto) {
         if (ObjectUtil.isEmpty(dto.getYear())) {
@@ -52,7 +58,7 @@ public class EconomicServiceImpl implements EconomicService {
         }
         Map data = MapUtils.getMap(map, "data", null);
         List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
-        if (ObjectUtil.isNotEmpty(list)) {
+        if (ObjectUtil.isNotEmpty(list) && TYPE.equals(dto.getType())) {
             if (ObjectUtil.isEmpty(dto.getProvinceIds()) && ObjectUtil.isEmpty(dto.getCityIds()) && ObjectUtil.isEmpty(dto.getAreaIds())) {
                 redisCache.setCacheObject(redisKey, map);
             }

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

@@ -85,11 +85,11 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
                 companyName = companyName.replace("<font color='red'>","");
                 companyName = companyName.replace("</font>","");
             }
-            companyMap.put("claimStatus", 0);
+            companyMap.put("claimStatus", null);
             companyMap.put("bratingSubjectLevel", null);
             for (CustomerStatusListVo vo : customerStatusListVos) {
                 if (companyName.equals(vo.getCompanyName())) {
-                    companyMap.put("claimStatus", 1);
+                    companyMap.put("claimStatus", vo.getStatus());
                 }
             }
             // 去除重复的数据

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

@@ -104,13 +104,8 @@
         LEFT JOIN business_follow_record f on f.business_id = i.id
         LEFT JOIN business_label l on l.business_id = i.id
         LEFT JOIN sys_user u on u.user_id = bu.user_id
+        LEFT JOIN sys_dept d on d.dept_id = u.dept_id
         <where>
-            <if test="isPrivate == 1 ">
-                and bu.user_id = #{userId}
-            </if>
-            <if test="isPrivate == 0 ">
-                and (bu.user_id = #{userId} or i.is_private = 1)
-            </if>
             <if test="projectType != null and projectType != ''">
                 and i.project_type in
                 <foreach collection="projectType" item="projectType" open="(" separator="," close=")">
@@ -147,6 +142,11 @@
                     #{districtId}
                 </foreach>
             </if>
+            <choose>
+                <when test="isPrivate == 1"> and bu.user_id = #{userId} </when>
+                <!-- 数据范围过滤 -->
+                <otherwise> and (bu.user_id = #{userId} or i.is_private = 1) ${params.dataScope} </otherwise>
+            </choose>
         </where>
         GROUP BY i.id
         ORDER BY i.create_time DESC

dsk-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag"      column="del_flag"     />
         <result property="loginIp"      column="login_ip"     />
         <result property="loginDate"    column="login_date"   />
-        <result property="isExperience" column="is_experience"/>
         <result property="createBy"     column="create_by"    />
         <result property="createTime"   column="create_time"  />
         <result property="updateBy"     column="update_by"    />
@@ -49,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber,
-        u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.is_experience, u.create_by, u.create_time, u.remark,
+        u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -60,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
-		 u.del_flag, u.login_ip, u.login_date, u.is_experience, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+		 u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
@@ -158,7 +157,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="sex != null and sex != ''">sex,</if>
  			<if test="password != null and password != ''">password,</if>
  			<if test="status != null and status != ''">status,</if>
- 			<if test="isExperience != null ">is_experience,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
@@ -173,7 +171,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="sex != null and sex != ''">#{sex},</if>
  			<if test="password != null and password != ''">#{password},</if>
  			<if test="status != null and status != ''">#{status},</if>
-			<if test="isExperience != null ">#{isExperience},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			sysdate()
@@ -194,7 +191,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
  			<if test="loginDate != null">login_date = #{loginDate},</if>
- 			<if test="isExperience != null">is_experience = #{isExperience},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -60,10 +60,10 @@
 
     <select id="selectStatusListByCompanyName" resultType="com.dsk.system.domain.customer.vo.CustomerStatusListVo">
         select
-            ct.customer_id, ct.company_name
+            ct.customer_id, ct.company_name, ctu.status
         from customer ct
         join customer_user ctu on ct.customer_id = ctu.customer_id
-        where ctu.user_id = #{userId} and ctu.status = 0 and ct.company_name in
+        where ctu.user_id = #{userId} and ct.company_name in
         <foreach collection="companyNames" item="companyName" open="(" separator="," close=")">
             #{companyName}
         </foreach>