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

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFollowRecordController.java

@@ -27,6 +27,24 @@ public class BusinessFollowRecordController extends BaseController
 
 
 
+    /**
+     * 查询关联项目
+     */
+    @GetMapping("/relate/project/{userId}")
+    public AjaxResult selectRelateProject(@PathVariable("userId") Integer userId)
+    {
+        return success(businessFollowRecordService.selectRelateProject(userId));
+    }
+
+    /**
+     * 查询关联业主企业
+     */
+    @GetMapping("/relate/company/{userId}")
+    public AjaxResult selectRelateCompany(@PathVariable("userId") Integer userId)
+    {
+        return success(businessFollowRecordService.selectRelateCompany(userId));
+    }
+
     /**
      * 新增项目跟进记录
      */

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

@@ -115,13 +115,13 @@ public class EnterpriseProjectController {
 
     @ApiOperation(value = "招标计划列表")
     @RequestMapping(value = "/bidPlanPage",method = RequestMethod.POST)
-    public TableDataInfo bidPlanPage(@RequestBody @Valid Object body) throws Exception {
+    public TableDataInfo bidPlanPage(@RequestBody @Valid EnterpriseProjectBidPlanPageBody body) throws Exception {
         return enterpriseProjectService.bidPlanPage(body);
     }
 
     @ApiOperation(value = "招标计划详情")
     @RequestMapping(value = "/bidPlanDetail", method = RequestMethod.POST)
-    public R bidPlanDetail(@RequestBody @Valid Object body) throws Exception {
+    public R bidPlanDetail(@RequestBody @Valid EnterpriseProjectBidPlanDetailBody body) throws Exception {
         return enterpriseProjectService.bidPlanDetail(body);
     }
 

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

@@ -6,6 +6,7 @@ import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 
@@ -60,6 +61,19 @@ public class RegionalEconomicDataController {
         return economicService.details(detailsDto);
     }
 
+    /***
+     *@Description: 获取当前地区
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping(value = "location")
+    public AjaxResult location(@RequestBody OpRegionalLocalDto vo, HttpServletRequest request){
+//        String ip = IpUtil.getIpAddr(request);
+        return economicService.location(vo);
+    }
+
 
     /***
      *@Description: 地区经济-统计
@@ -85,5 +99,16 @@ public class RegionalEconomicDataController {
         return economicService.regionalList(dto);
     }
 
+    /***
+     *@Description: 地区经济
+     *@Param:
+     *@return: com.dsk.acc.security.common.msg.RestResponse
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/regional/compare")
+    public AjaxResult regionalCompare(@RequestBody OpRegionalEconomicDataStatisticsRegionalDto dto) {
+        return economicService.regionalCompare(dto);
+    }
 
 }

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

+package com.dsk.common.core.domain.entity;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/6/7 上午 11:05
+ **/
+@Data
+public class BusinessFileVo {
+
+    private String filePath;
+    private String creatTime;
+
+    public BusinessFileVo(String filePath, String creatTime) {
+        this.filePath = filePath;
+        this.creatTime = creatTime;
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidPlanDetailBody.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 EnterpriseProjectBidPlanDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidPlanPageBody.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;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidPlanPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+    /*
+     * 排序字段：1金额倒序，2金额正序，3发布时间倒序，4发布时间正序，15预计招标时间倒序，16预计招标时间正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalLocalDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * @ClassName OpRegionalLocalDto
+ * @Description 获取当前地区
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalLocalDto {
+    /**
+     * 省Id
+     */
+    private Integer provinceId;
+}

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

@@ -17,7 +17,10 @@
           </template>
           <el-menu-item :index="index+'-'+idx" v-for="(it, idx) in item.children" :key="idx" @click="handleItem(it)" :disabled="it.disabled">{{it.title}}</el-menu-item>
         </el-submenu>
-        <el-menu-item :index="index.toString()" @click="handleItem(item)" :disabled="item.disabled" v-else>{{item.title}}</el-menu-item>
+        <template v-else>
+          <el-menu-item :index="index.toString()" @click="handleItem(item)" :disabled="item.disabled" v-if="isCustomerId(item.pathName)">{{item.title}}</el-menu-item>
+        </template>
+
       </template>
     </el-menu>
   </div>
@@ -35,6 +38,10 @@ export default {
       type: String,
       default: null
     },
+    customerId: {
+      type: String,
+      default: ''
+    }
   },
   data() {
     return {
@@ -78,14 +85,20 @@ export default {
           {title: '裁判文书', pathName: 'judgment'},
           {title: '法院公告', pathName: 'courtNotice'},
           {title: '开庭公告', pathName: 'openacourtsessionNotice'},
-          {title: '信用中国', pathName: ''}
+          // {title: '信用中国', pathName: ''}
         ]},
         // {title: '商务信息', pathName: 'business'},
         {title: '招标偏好', pathName: 'preference'},
         {title: '合作情况', pathName: 'cooperate'},
         {title: '决策链条', pathName: 'decisionMaking'},
         {title: '跟进记录', pathName: 'gjjl'}
-      ]
+      ],
+      customer:[
+        'preference',
+        'cooperate',
+        'decisionMaking',
+        'gjjl'
+      ],
     }
   },
   computed: {
@@ -127,6 +140,15 @@ export default {
     },
     handleSearch(){
       console.log('开始搜索了')
+    },
+    isCustomerId(name){
+      if(this.customer.indexOf(name) != -1){
+        if(this.customerId){
+          return true
+        }
+        return false
+      }
+      return true
     }
   }
 }

dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue

@@ -25,8 +25,10 @@
         :queryParams="queryParams"
         @handle-current-change="handleCurrentChange"
       >
-        <template slot="projcetName" slot-scope="scope">
-          {{scope}}
+        <template slot="projectName" slot-scope="scope">
+          <span class="link-type" @click="clickDetail(scope.row.id)">
+            {{ scope.row.projectName }}
+          </span>
 <!--          <router-link :to="'' + scope.row.dictId" class="link-type">-->
 <!--            <span>{{ scope.row.dictType }}</span>-->
 <!--          </router-link>-->
@@ -42,9 +44,6 @@
         <el-button type="primary" class="empty-b" @click="drawer = true">添加合作情况</el-button>
       </div>
     </template>
-
-<!--    <Detail />-->
-
     <!-- 弹窗关联项目 -->
     <el-drawer
       title="添加合作情况"
@@ -120,6 +119,8 @@
       </div>
     </el-drawer>
 
+<!--      <Detail :detailId="detailId" v-if="isDetailId" />-->
+
   </div>
 </template>
 
@@ -139,16 +140,22 @@ export default {
   components: {
     Detail
   },
+  props: {
+    customerIds: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       ifEmpty:false,
       queryParams: {
-        customerId: 'f25219e73249eea0d9fddc5c7f04f97f',
+        customerId: this.customerIds,
         pageNum: 1,
         pageSize: 10
       },
       forData: [
-        {label: '项目名称', prop: 'projcetName'},
+        {label: '项目名称', prop: 'projectName', slot: true},
         {label: '项目阶段', prop: 'projectStage', width: '120'},
         {label: '投资金额(万元)', prop: 'investmentAmount', width: '140'},
         {label: '项目状态', prop: 'status', width: '90'}
@@ -208,7 +215,10 @@ export default {
         }
       ],//可见访问
       //客户详情
-      info: {}
+      info: {},
+      //
+      detailId: null,
+      isDetailId: false,
     }
   },
   created() {
@@ -273,7 +283,6 @@ export default {
           this.addParam.customerId = this.queryParams.customerId
           this.addParam.companyId = this.info.companyId
           this.addParam.userId = this.info.userId
-          console.log(this.addParam)
           addProject(this.addParam).then(result=>{
             if(result.code == 200){
               this.$message.success('添加成功！')
@@ -346,6 +355,11 @@ export default {
     //输入数字
     number(value){
       this.addParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')//输入2位小数
+    },
+    //打开详情
+    clickDetail(id){
+      this.detailId = id
+      this.isDetailId = true
     }
   }
 }

dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue

@@ -81,11 +81,17 @@ export default {
   components: {
     Tables
   },
+  props: {
+    customerIds: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       ifEmpty:false,
       queryParams:{
-        customerId:'f25219e73249eea0d9fddc5c7f04f97f',
+        customerId:this.customerIds,
         pageNum:1,
         pageSize:10,
       },
@@ -316,5 +322,8 @@ export default {
     }
   }
 }
+::v-deep .el-table__fixed::before, ::v-deep .el-table__fixed-right::before{
+  background-color:unset;
+}
 
 </style>

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

@@ -3,7 +3,7 @@
     <Header :company-id="companyId" v-if="companyId" />
     <div class="flex-box part-main">
       <div class="part-left">
-        <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" />
+        <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
       </div>
       <div class="part-right">
         <div id="partBox" v-if="companyId">
@@ -42,14 +42,17 @@
           <Judgment v-if="currentPath.pathName=='judgment'" :company-id="companyId" />
           <CourtNotice v-if="currentPath.pathName=='courtNotice'" :company-id="companyId" />
           <OpenacourtsessionNotice v-if="currentPath.pathName=='openacourtsessionNotice'" :company-id="companyId" />
-          <!-- 招标偏好 -->
-          <Preference v-if="currentPath.pathName=='preference'" :company-id="companyId" />
-          <!-- 合作情况 -->
-          <Cooperate v-if="currentPath.pathName=='cooperate'" :company-id="companyId" />
-          <!-- 决策链条 -->
-          <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :company-id="companyId" />
-          <!-- 跟进记录 -->
-          <Gjjl v-if="currentPath.pathName=='gjjl'" :company-id="companyId" />
+          <template v-if="customerId">
+            <!-- 招标偏好 -->
+            <Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" />
+            <!-- 合作情况 -->
+            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" />
+            <!-- 决策链条 -->
+            <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" />
+            <!-- 跟进记录 -->
+            <Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" :customer-ids="customerId" />
+          </template>
+
         </div>
       </div>
     </div>
@@ -137,7 +140,8 @@ export default {
   },
   data() {
     return {
-      companyId: 3068,  //企业Id（测试默认3068）
+      companyId: 10361319,  //企业Id（测试默认3068）
+      customerId: '',  //企业Id（测试默认'a00d582a6041f32c16aac804e4924736'）
       currentPath: {
         pathName: 'overview'  //默认展示页
       },
@@ -152,6 +156,9 @@ export default {
     if (this.$route.query.path) { // 获取跳转对应板块
       this.currentPath.pathName = this.$route.query.path
     }
+    if (this.$route.query.customerId) { // 判断是否显示
+      this.customerId = this.$route.query.customerId
+    }
   },
   mounted() {
     const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("partBox")

dsk-operate-ui/src/views/detail/party-a/preference/index.vue

@@ -159,6 +159,12 @@ export default {
   name: 'Preference',
   components: {
 
+  },
+  props: {
+    customerIds: {
+      type: String,
+      default: ''
+    }
   },
   data() {
     return {
@@ -166,7 +172,7 @@ export default {
         minRows: 8,
         maxRows: 8
       },
-      customerId: 'f25219e73249eea0d9fddc5c7f04f97f',
+      customerId: this.customerIds,
       queryParams:{
         customerId: '',
         businessCharacteristic: '',

dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue

@@ -42,7 +42,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 382724726,
+        cid: this.companyId,//382724726
         pageNum: 1,
         pageSize: 10
       },

dsk-operate-ui/src/views/detail/party-a/riskInformation/courtNotice.vue

@@ -44,7 +44,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 20734,
+        cid: this.companyId, //20734
         pageNum: 1,
         pageSize: 10
       },
@@ -52,7 +52,6 @@ export default {
         {label: '案由', prop: 'caseReason'},
         {label: '公告时间', prop: 'date', width: '95'},
         {label: '当事人', prop: 'people', width: '240'},
-        {label: '案号', prop: 'objId', width: '210'},
         {label: '公告类型', prop: 'type', width: '210'},
         {label: '公告法院', prop: 'court', width: '280'}
       ],
@@ -60,8 +59,7 @@ export default {
         { type: 1, fieldName: 'type', value: '', placeholder: '公告类型', options: []},
         { type: 1, fieldName: 'caseReason', value: '', placeholder: '案由', options: []},
         { type: 1, fieldName: 'role', value: '', placeholder: '身份', options: []},
-        { type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo'},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词'},
+        { type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo'}
       ],
       //列表
       tableLoading:false,

dsk-operate-ui/src/views/detail/party-a/riskInformation/dishonesty.vue

@@ -42,7 +42,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 5504335,
+        cid: this.companyId,//5504335
         pageNum: 1,
         pageSize: 10
       },

dsk-operate-ui/src/views/detail/party-a/riskInformation/ifThePerson.vue

@@ -41,7 +41,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 194738907,
+        cid: this.companyId,//194738907
         pageNum: 1,
         pageSize: 10
       },

dsk-operate-ui/src/views/detail/party-a/riskInformation/judgment.vue

 <template>
   <div class="corePersonnel">
     <head-form
-      title="判决文书"
+      title="裁判文书"
       :form-data="formData"
       :query-params="queryParams"
       :total="tableDataTotal"
@@ -50,7 +50,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 5504335,
+        cid: this.companyId,//5504335
         pageNum: 1,
         pageSize: 10
       },

dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue

@@ -50,7 +50,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 20734,
+        cid: this.companyId,//20734
         pageNum: 1,
         pageSize: 10
       },
@@ -59,12 +59,12 @@ export default {
         {label: '开庭日期', prop: 'hearingDate', width: '95'},
         {label: '当事人', prop: 'relatedCompanies', width: '428', slot: true},
         {label: '身份', prop: 'pureRole', width: '120'},
-        {label: '公告内容', prop: '', width: '508'},
+        {label: '公告内容', prop: 'content', width: '508'},
         {label: '案号', prop: 'caseNo', width: '210'},
         {label: '法院', prop: 'court', width: '280'},
-        {label: '法庭', prop: '', width: '180'},
-        {label: '承办部门', prop: '', width: '280'},
-        {label: '审判长/主判人', prop: '', width: '106'}
+        {label: '法庭', prop: 'tribunal', width: '180'},
+        {label: '承办部门', prop: 'department', width: '280'},
+        {label: '审判长/主判人', prop: 'judge', width: '106'}
       ],
       formData: [
         { type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []},

dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue

@@ -59,9 +59,8 @@ export default {
         {label: '决定日期', prop: 'punishBegin', width: '95'},
         {label: '处罚结果', prop: 'punishResult', width: '264'},
         {label: '处罚文书号', prop: 'fileNum', width: '200'},
-        {label: '相关人员', prop: '', width: '88'},
         {label: '处罚机关', prop: 'office', width: '264'},
-        {label: '处罚结束日期', prop: '', width: '100'},
+        {label: '处罚结束日期', prop: 'punishEnd', width: '100'},
       ],
       formData: [
         { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别', options: []},

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/landAcquisition.vue

@@ -36,11 +36,17 @@ export default {
   mixins: [mixin],
   components: {
 
+  },
+  props: {
+    companyId: {
+      type: Number,
+      default: 0
+    }
   },
   data() {
     return {
       queryParams: {
-        cid: 3068,
+        cid: this.companyId,//3068
         sort: 3,
         pageNum: 1,
         pageSize: 10

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue

@@ -4,7 +4,7 @@
       <div class="flex-box query-params">
         <span class="common-title">区域经济</span>
       </div>
-      <div class="params-dw"><img src="@/assets/images/addree.png" />广东省-广州市</div>
+      <div class="params-dw"><img src="@/assets/images/addree.png" />{{ addressList }}</div>
     </div>
     <div class="table-item">
       <el-table
@@ -26,16 +26,27 @@
 </template>
 
 <script>
+import dataRegion from '@/assets/json/dataRegion'
 import {
   regionalEconomy
 } from '@/api/detail/party-a/urbanLnvestment'
+import {
+  infoHeader
+} from '@/api/detail/party-a/overview'
 export default {
   name: 'regionalEconomies',
   components: {
 
+  },
+  props: {
+    companyId: {
+      type: Number,
+      default: 0
+    }
   },
   data() {
     return {
+      addressList:'',
       params: {
         provinceId: 500000,
         cityId: 500100
@@ -204,7 +215,7 @@ export default {
     }
   },
   created() {
-    this.dataRegion()
+    this.regionalEconomys()
   },
   computed: {
     getHeaders() {
@@ -218,12 +229,36 @@ export default {
   },
   methods: {
     //地区
-    dataRegion() {
-      regionalEconomy(this.params).then(res => {
-        this.tableData = res.data
-        this.tableLoading = false
+    regionalEconomys() {
+      this.tableLoading = true
+      infoHeader({companyId: this.companyId}).then(res => {
+        regionalEconomy({
+          provinceId: res.data.provinceId,
+          cityId: res.data.cityId
+        }).then(res => {
+          this.tableData = res.data
+          this.tableLoading = false
+        })
+        this.dataRegion(res.data.provinceId, res.data.cityId)
       })
     },
+    dataRegion(p,c) {
+      var str = [];
+      for (let x = 0; x < 2; x++) {
+        for (let i = 0; i < dataRegion.length; i++) {
+          if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
+            if(p == dataRegion[i].id){
+              str.push(dataRegion[i].regionName)
+            }
+          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
+            if(c == dataRegion[i].id){
+              str.push(dataRegion[i].regionName)
+            }
+          }
+        }
+      }
+      this.addressList = str.join(' - ');
+    },
   }
 }
 </script>

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -112,17 +112,26 @@ import {
   urbanInvestmentPage,
   uipGroupData
 } from '@/api/detail/party-a/urbanLnvestment'
+import {
+  infoHeader
+} from '@/api/detail/party-a/overview'
 export default {
   name: 'SameRegion',
   mixins: [mixin],
   components: {
 
+  },
+  props: {
+    companyId: {
+      type: Number,
+      default: 0
+    }
   },
   data() {
     return {
       queryParams: {
-        provinceId: 500000,
-        cityId: 500100,
+        provinceId: '',
+        cityId: '',
         uipExecutiveLevel: '',
         uipBusinessType: [],
         bratingSubjectLevel: [],
@@ -191,23 +200,18 @@ export default {
     }
   },
   created() {
-    this.handleQuery()
-    this.getScreen()
+    infoHeader({companyId: this.companyId}).then(res => {
+      this.queryParams.provinceId = res.data.provinceId
+      this.queryParams.cityId = res.data.cityId
+      this.handleQuery()
+      this.getScreen()
+    })
   },
   computed: {
 
   },
   methods: {
     dataRegion() {
-      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
-      //   headers: {
-      //     'Content-Type': 'application/json'
-      //   }
-      // }).then(res => {
-      //   if (res.data.code == 200) {
-      //     console.log(res.data.data)
-      //   }
-      // })
       var str = [];
       for (let x = 0; x < 3; x++) {
         for (let i = 0; i < dataRegion.length; i++) {

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

@@ -18,10 +18,12 @@
                 <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_1.png"></i>
                   <el-option v-for="(item,index) in bffslist" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
               </el-select>
-              <el-select v-if="showtype == 'gjdt'" v-model="addParam.customerId" class="w128" placeholder="关联企业">
-                <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_1.png"></i>
-                  <el-option v-for="(item,index) in glqylist" :key="index" :label="item.companyName" :value="item.customerId"></el-option>
-              </el-select>
+              <template v-if="!customerIds">
+                <el-select v-if="showtype == 'gjdt'" v-model="addParam.customerId" class="w128" placeholder="关联企业">
+                  <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_1.png"></i>
+                    <el-option v-for="(item,index) in glqylist" :key="index" :label="item.companyName" :value="item.customerId"></el-option>
+                </el-select>
+              </template>
               <el-input v-model="addParam.name" placeholder="拜访对象" style="width: 100px;">
                 <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_2.png"></i>
               </el-input>
@@ -55,7 +57,7 @@
               <div><span>{{item.content}}</span></div>
               <div class="rec_text">
                 <span v-if="item.name">拜访对象：{{item.name||'--'}}</span>
-                <span v-if="showtype == 'gjdt' && companyName != ''">关联企业：{{item.companyName}}</span>
+                <span v-if="showtype == 'gjdt' && item.companyName != ''">关联企业：{{item.companyName}}</span>
                 <span v-if="item.position">职位：{{item.position}}</span>
                 <span v-if="item.createTime">拜访时间：{{item.createTime.slice(0, 10)}}</span>
                 <span v-if="item.nextVisitTime">下次拜访时间：{{item.createTime.slice(0, 10)}}</span>
@@ -122,6 +124,10 @@
         type: String,
         default: ""
       },
+      customerIds: { //客户id
+        type: String,
+        default: ""
+      },
       datas:[],//数据源
     },
     name: 'gjjl',
@@ -174,6 +180,9 @@
       //添加跟进动态
       addFollow(){
         if(this.types == 'gjdt'){
+          if(this.customerIds){
+            this.addParam.customerId = this.customerIds
+          }
           addFollowRecord(this.addParam).then(result=>{
             if(result.code == 200){
               this.$message.success(result.msg)
@@ -236,6 +245,9 @@
           pageNum:this.pageNum,//页码
           pageSize:this.pageSize,
         }
+        if(this.customerIds){
+          param.customerId = this.customerIds
+        }
         getFollowList(param).then(result=>{
           this.recordlist = result.code == 200?result:[]
           this.recordlist.rows.forEach(item=>{

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

@@ -27,7 +27,7 @@
             <div class="wj wj1"></div>上传文件
           </el-upload>
         </div>
-        <div>
+        <div style="display: none">
           <el-upload
             class="upload-demo"
             :action="action"
@@ -274,7 +274,7 @@
   .uploadbox{
     position: absolute;
     width: 124px;
-    height: 73px;
+    height: 36px;
     background: #FFFFFF;
     box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.08);
     border-radius: 2px;

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

@@ -106,13 +106,13 @@ public class EnterpriseProjectService {
     }
 
 
-    public TableDataInfo bidPlanPage(Object body) throws Exception {
+    public TableDataInfo bidPlanPage(EnterpriseProjectBidPlanPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R bidPlanDetail(Object body) throws Exception {
+    public R bidPlanDetail(EnterpriseProjectBidPlanDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanDetail", BeanUtil.beanToMap(body, false, false));
         Map data = MapUtils.getMap(map, "data", null);
         String contentId = MapUtils.getString(data, "contentId");

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

@@ -14,6 +14,21 @@ import java.util.List;
  */
 public interface BusinessFollowRecordMapper 
 {
+
+    /**
+     * 查询关联项目
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateProject (Integer userId);
+
+    /**
+     * 查询关联业主企业
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateCompany (Integer userId);
+
     /**
      * 查询项目跟进记录
      * 

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

@@ -42,6 +42,16 @@ public interface EconomicService {
     AjaxResult details(OpRegionalEconomicDataDetailsDto detailsDto);
 
 
+    /***
+     *@Description: 获取当前地区
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:25
+     */
+    AjaxResult location(OpRegionalLocalDto detailsDto);
+
+
     /***
      *@Description: 地区经济统计
      *@Param:
@@ -61,12 +71,12 @@ public interface EconomicService {
     AjaxResult regionalList(OpRegionalEconomicDataRegionalListDto dto);
 
     /***
-     *@Description: 地区经济-分页列表
+     *@Description: 对比经济
      *@Param:
      *@return: com.dsk.common.core.domain.AjaxResult
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult regionalComparison(OpRegionalEconomicDataV1Dto dto);
+    AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto);
 
 }

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

@@ -54,6 +54,20 @@ public interface IBusinessFollowRecordService
      */
     public int insertBusinessFollowRecord(BusinessFollowRecord businessFollowRecord);
 
+    /**
+     * 查询关联项目
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateProject (Integer userId);
+
+    /**
+     * 查询关联业主企业
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateCompany (Integer userId);
+
     /**
      * 修改项目跟进记录
      * 

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

@@ -71,6 +71,16 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
         return businessFollowRecordMapper.insertBusinessFollowRecord(businessFollowRecord);
     }
 
+    @Override
+    public List<String> selectRelateProject(Integer userId) {
+        return businessFollowRecordMapper.selectRelateProject(userId);
+    }
+
+    @Override
+    public List<String> selectRelateCompany(Integer userId) {
+        return businessFollowRecordMapper.selectRelateCompany(userId);
+    }
+
     /**
      * 修改项目跟进记录
      *

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

@@ -46,6 +46,12 @@ public class EconomicServiceImpl implements EconomicService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    @Override
+    public AjaxResult location(OpRegionalLocalDto detailsDto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/location", BeanUtil.beanToMap(detailsDto, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
     @Override
     public AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/statistics/regional",  BeanUtil.beanToMap(dto, false, false));
@@ -59,8 +65,8 @@ public class EconomicServiceImpl implements EconomicService {
     }
 
     @Override
-    public AjaxResult regionalComparison(OpRegionalEconomicDataV1Dto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/xx",  BeanUtil.beanToMap(dto, false, false));
+    public AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/regional/compare",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

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

@@ -87,6 +87,18 @@
         </where>
         ORDER BY f.creat_time DESC
     </select>
+    <select id="selectRelateProject" resultType="java.lang.String">
+        select i.project_name
+        from business_info i
+        left join business_follow_record f on f.business_id = i.id
+        where f.user_id = #{userId}
+    </select>
+    <select id="selectRelateCompany" resultType="java.lang.String">
+        select i.construction_unit
+        from business_info i
+        left join business_follow_record f on f.business_id = i.id
+        where f.user_id = #{userId}
+    </select>
 
     <insert id="insertBusinessFollowRecord" parameterType="com.dsk.common.core.domain.entity.BusinessFollowRecord" useGeneratedKeys="true"
             keyProperty="id">