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

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

 package com.dsk.web.controller.dsk;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
@@ -61,5 +63,15 @@ public class IndexController {
         return enterpriseService.bigBidProjectType(paramMap);
     }
 
+    @ApiOperation(value = "集团中标统计")
+    @PostMapping("/countByCompany")
+    public AjaxResult countByCompany(@RequestBody JSONObject object) {
+        return enterpriseService.countByCompany(object);
+    }
 
+    @ApiOperation(value = "建筑企业中标排行榜")
+    @PostMapping("/bidRank")
+    public AjaxResult bidRank(@RequestBody JSONObject object) {
+        return enterpriseService.bidRank(object);
+    }
 }

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

@@ -18,11 +18,11 @@ public class IndexBigBidPageBody extends BasePage
     /**
      * 开始时间
      */
-    private Date timeStart = DateUtils.addDays(new Date(), -7);
+    private String timeStart = DateUtils.dateTime(DateUtils.addDays(new Date(), -6));
     /**
      * 截止时间
      */
-    private Date timeEnd = new Date();
+    private String timeEnd = DateUtils.getDate();
     /**
      * 金额起 默认2亿
      */

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

@@ -17,11 +17,11 @@ public class IndexBigWinningBidsPageBody extends BasePage {
     /**
      * 开始时间
      */
-    private Date timeStart = DateUtils.addDays(new Date(), -7);
+    private String timeStart = DateUtils.dateTime(DateUtils.addDays(new Date(), -6));
     /**
      * 截止时间
      */
-    private Date timeEnd = new Date();
+    private String timeEnd = DateUtils.getDate();
     /**
      * 金额起 默认2亿
      */

dsk-operate-ui/src/layout/index.vue

@@ -128,4 +128,7 @@ export default {
   .mobile .fixed-header {
     width: 100%;
   }
+  .EnterpriseData{
+    min-width: 1648px;
+  }
 </style>

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

@@ -101,9 +101,12 @@
                 <div class="flex-box" @click="linkTo(statistic.combineMember)">
                   <img src="@/assets/images/detail/overview/company_ssjt.png" alt="所属集团" title="所属集团" class="swiper-img">
                   <div class="swiper-item">
-                    <span class="swiper-name">
-                      所属集团-{{statistic.combineMember.companyName}}
-                    </span>
+                    <el-popover v-if="statistic.combineMember.companyName.length>9" trigger="hover" :content="'所属集团-'+statistic.combineMember.companyName">
+                      <span class="swiper-name" slot="reference">
+                        所属集团-{{ statistic.combineMember.companyName }}
+                      </span>
+                    </el-popover>
+                    <span v-else class="swiper-name">所属集团-{{statistic.combineMember.companyName}}</span>
                     <div  >
                         <span >集团成员：</span><i class="num" >{{statistic.combineMember.memberNum}}</i>
                       </div>

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

@@ -9,7 +9,7 @@
         <div class="empty" v-if="total==0">
           <img src="@/assets/images/project/empty.png">
           <div class="p1">暂无数据展示</div>
-          <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
+          <div class="p2" v-if="isDisabled==false">抱歉，你还未添加相关数据，快去添加吧</div>
           <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds == false">新增联系人</div>
         </div>
         <el-table class="fixed-table" v-else max-height="640"
@@ -36,7 +36,7 @@
             label="姓名"
             width="113">
             <template slot-scope="scope">
-              <div class="wordprimary"><span @click="getDetail(scope.row)">{{scope.row.name || '--'}} </span><img v-if="isDisabled == false" @click="deltip(scope.row.id)" src="@/assets/images/delete.png"></div>
+              <div :class="isDisabled==false?'wordprimary':''"><span @click="getDetail(scope.row)">{{scope.row.name || '--'}} </span><img v-if="isDisabled == false" @click="deltip(scope.row.id)" src="@/assets/images/delete.png"></div>
             </template>
           </el-table-column>
           <!--<el-table-column-->

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

@@ -24,6 +24,14 @@ public class CustomerFollowRecordListVo implements Serializable {
      * 客户id
      */
     private String customerId;
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+    /**
+     * 城投id
+     */
+    private String uipId;
     /**
      * 客户名称
      */

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

 package com.dsk.system.dskService;
 
 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.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
@@ -51,4 +53,14 @@ public class IndexService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bigBidProjectType", paramMap);
         return BeanUtil.toBean(map, R.class);
     }
+
+    public AjaxResult countByCompany(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/centralEnterprse/countByCompany", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult bidRank(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/bidRank", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

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

@@ -9,7 +9,7 @@
 
     <select id="selectAuthList" resultType="com.dsk.system.domain.customer.vo.CustomerFollowRecordListVo">
         select
-            ct.company_name, u.nick_name,
+            ct.company_id, ct.uip_id, ct.company_name, u.nick_name,
             <include refid="Base_Bean"></include>
         from customer_follow_record cfr
         join customer ct on ct.customer_id = cfr.customer_id