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

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

@@ -44,6 +44,8 @@ public class CompanySearchController {
     public AjaxResult page(@RequestBody ComposeQueryDto compose) {
         compose.getPage().setPage(compose.getPageNum());
         compose.getPage().setLimit(compose.getPageSize());
+        compose.getPage().setField(compose.getField());
+        compose.getPage().setOrder(compose.getOrder());
         return opportunityRadarService.enterprisePage(compose);
     }
 }

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

@@ -74,7 +74,6 @@ public class RegionalEconomicDataController {
     public AjaxResult location(@RequestBody OpRegionalLocalDto vo, HttpServletRequest request){
         String ip = IpUtil.getIpAddr(request);
         vo.setIp(ip);
-        log.info("location====================================>" +ip);
         return economicService.location(vo);
     }
 

dsk-admin/src/main/resources/application-dev.yml

@@ -157,7 +157,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 240
 
 
 #mybatis:

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

@@ -34,6 +34,10 @@ public class BasePage {
 	 */
 	private Integer pageMaxSize;
 
+	private String field;
+
+	private String order;
+
 	
 	public Integer getPageIndex() {
 		return pageNum;
@@ -74,6 +78,22 @@ public class BasePage {
 		this.pageIndex = pageNum;
 	}
 
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public String getOrder() {
+		return order;
+	}
+
+	public void setOrder(String order) {
+		this.order = order;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();

dsk-operate-ui/src/assets/styles/project.scss

@@ -28,7 +28,7 @@
   width: 200px;
   height: 114px;
   background: #FFFFFF;
-  box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1608);
+  box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.12);
   border-radius: 2px;
   position: absolute;
   z-index: 3;
@@ -279,12 +279,15 @@
 //表格样式
 .tables{
   padding:  0 16px 24px;
-  .el-table .el-table__header-wrapper th{
+  .el-table .el-table__header-wrapper th,.el-table th.el-table__cell.is-leaf{
     color: #4f4f4f;
     background: #F0F3FA;
     font-size: 12px;
     font-weight: 400;
   }
+  .el-table__fixed::before{
+    background: none;
+  }
   .is-sortable .sort-caret.ascending{
     border-bottom-color: #0081FF;
     opacity: 0.4;
@@ -315,6 +318,9 @@
   .el-table th.el-table__cell.is-leaf{
     border-bottom: 0;
   }
+  .el-table__body tr.hover-row > td.el-table__cell,.el-table__body tr.el-table__row--striped.hover-row > td.el-table__cell{
+    background: #DCEBFF;
+  }
   .has-gutter{
     th{
       height: 40px;
@@ -339,7 +345,7 @@
       font-weight: 400;
       color: #333333;
       line-height: 21px;
-      margin-bottom: 4px;
+      margin-bottom: 8px;
     }
     .p2{
       height: 18px;

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
+      this.$confirm('确定退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

dsk-operate-ui/src/router/index.js

@@ -99,7 +99,7 @@ export const constantRoutes = [
         path: '/enterprise/:id',
         component: () => import('@/views/detail/party-a/index'),
         name: 'PartyA',
-        meta: { title: '甲方详情' },
+        meta: { title: '甲方详情', icon: 'enterprise' },
       }
     ]
   },
@@ -113,7 +113,7 @@ export const constantRoutes = [
         path: '/company/:id',
         component: () => import('@/views/detail/party-b/index'),
         name: 'Company',
-        meta: { title: '已方详情' }
+        meta: { title: '乙方详情' }
       }
     ]
   },

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -34,6 +34,7 @@
             <el-table-column
               prop="index"
               label="序号"
+              fixed="left"
               width="47">
               <template slot-scope='scope'>
                 <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
@@ -42,6 +43,7 @@
             <el-table-column
               prop="date"
               label="企业名称"
+              fixed="left"
               width="441">
             <template slot-scope="scope">
               <div class="ps1">
@@ -515,7 +517,7 @@ export default {
       transform: translate(-50%,-50%);
       .btn{
         margin-right: 8px;
-        margin-top: 12px;
+        margin-top: 16px;
       }
     }
   }

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

@@ -45,7 +45,7 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
                 <span :id="'detailFocus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>
@@ -197,7 +197,6 @@ export default {
         ::v-deep .el-input__inner {
           border-right: 0;
           border-radius: 2px 0 2px 0;
-          width: 180px;
         }
       }
       .fromTime{

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

@@ -28,14 +28,14 @@
                 prefix-icon="fromTime-icon"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
-                start-placeholder="开始月份"
-                end-placeholder="结束月份">
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
               </el-date-picker>
             </template>
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
                 <span :id="'focus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>
@@ -230,7 +230,6 @@ export default {
         }
         ::v-deep .el-input__inner {
           border-radius: 2px 0 2px 0;
-          width: 180px;
           border: 1px solid #D9D9D9;
           border-right: 0;
         }

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

@@ -2,8 +2,9 @@
   <div class="header-container">
     <div class="bread-crumb">
       <el-breadcrumb separator="/">
-        <el-breadcrumb-item :to="{ path: '/enterpriseData' }">企业数据</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: fromPath }" v-if="fromName">{{fromName}}</el-breadcrumb-item>
+<!--        <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>-->
         <el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '--'}}</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
@@ -17,7 +18,7 @@
 <script>
 export default {
   name: 'Header',
-  props: ['companyId', 'companyInfo'],
+  props: ['companyId', 'companyInfo', 'fromPath', 'fromName'],
   data() {
     return {
     }

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

@@ -14,7 +14,7 @@
         <el-table-column
           v-if="isIndex"
           label="序号"
-          width="50"
+          :width="flexWidth(tableData)"
           align="left"
           :fixed="indexFixed"
           :resizable="false">
@@ -112,7 +112,6 @@ export default {
   },
   data() {
     return {
-
     }
   },
   methods:{
@@ -124,6 +123,14 @@ export default {
     },
     sortChange(e){
       this.$emit('sort-change',e)
+    },
+    flexWidth(tableData) {
+      let currentMax = this.queryParams.pageNum*this.queryParams.pageSize - this.queryParams.pageSize + tableData.length, wdth = 50
+      // return currentMax.toString().length*25 + 'px'
+      if(currentMax.toString().length>3){
+        wdth = wdth + (currentMax.toString().length-3)*10
+      }
+      return wdth+'px'
     }
   }
 }
@@ -136,4 +143,36 @@ export default {
 /*::v-deep .el-table__fixed{
   height: calc(100% - 16px) !important;
 }*/
+
+::v-deep .el-table__row{
+  &:nth-child(even){
+    background-color: #F9FCFF;
+    .more{
+      background: #F8FBFF;
+      span{
+        color: #0081FF;
+      }
+    }
+  }
+  &:nth-child(odd){
+    .more{
+      span{
+        color: #0081FF;
+      }
+    }
+  }
+}
+::v-deep .el-table th.el-table__cell.is-leaf,::v-deep .el-table td.el-table__cell {
+  border-bottom: 1px solid #E6EAF1;
+}
+::v-deep .el-table--border .el-table__cell {
+   border-right: 1px solid #E6EAF1;
+}
+::v-deep .el-table__body tr.hover-row.current-row>td,::v-deep .el-table__body tr.hover-row.el-table__row--striped.current-row>td,::v-deep .el-table__body tr.hover-row.el-table__row--striped>td,::v-deep .el-table__body tr.hover-row>td{
+  background-color:#DCEBFF;
+  .more{
+    background: #DCEBFF;
+  }
+}
+
 </style>

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

@@ -46,7 +46,7 @@
         <!-- 弹窗关联项目 -->
         <el-drawer
           title="添加合作情况"
-          size="40%"
+          size="45%"
           :visible.sync="drawer"
           :direction="direction"
           :with-header="false"
@@ -55,19 +55,19 @@
             <div class="addhzqk_top">
               <div class="addhzqk_top_t">
                 <div class="top_t_h1">
-                  <img src="@/assets/images/economies/icon.png" />{{ info.companyName }}
+                  <img src="@/assets/images/economies/icon.png" />{{ companyInfo.companyName }}
                 </div>
                 <div class="top_t_close"><i class="el-icon-close" @click="handleClose"></i></div>
               </div>
               <div class="addhzqk_top_d">
                 <div class="top_d_item">
-                  法定代表人：<span>{{ info.legalPerson }}</span>
+                  法定代表人：<span>{{ companyInfo.corporatePerson }}</span>
                 </div>
                 <div class="top_d_item">
-                  注册资本：<span>{{ info.registerCapital }}万</span>
+                  注册资本：<span>{{ companyInfo.regCapital }}</span>
                 </div>
                 <div class="top_d_item">
-                  注册地址：<span>{{ info.registerAddress }}</span>
+                  注册地址：<span>{{ companyInfo.addressDetail }}</span>
                 </div>
               </div>
             </div>
@@ -143,7 +143,7 @@ export default {
   components: {
     Detail
   },
-  props: ['customerIds'],
+  props: ['customerIds','companyInfo'],
   data() {
     return {
       ifEmpty:false,
@@ -161,7 +161,7 @@ export default {
       formData: [
         { type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
         { type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入企业名称查询'},
+        { type: 3, fieldName: 'projectName', value: '', placeholder: '输入项目名称关键字搜索'},
       ],
       stageOptions:[],
       statusOptions:[],
@@ -352,7 +352,7 @@ export default {
     },
     //输入数字
     number(value){
-      this.addParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')//输入2位小数
+      this.addParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入2位小数
     },
     //打开详情
     clickDetail(id){

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

@@ -63,7 +63,7 @@ export default {
         pageSize: 20
       },
       formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
       ],
       forData: [
         {label: '合作项目/工程名称', prop: 'dealTitle', width: '720', slot: true},

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

@@ -68,7 +68,7 @@ export default {
         pageSize: 20
       },
       formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
       ],
       forData: [
         {label: '合作项目/工程名称', prop: 'projectAllName', width: '720', fixed: true, slot: true},

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

 <template>
   <div class="app-container part-container">
-    <Header :company-id="companyId" :companyInfo="companyInfo" v-if="companyId" />
+    <Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" v-if="companyId" />
     <div class="flex-box part-main">
       <div class="part-left">
         <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
@@ -46,7 +46,7 @@
             <!-- 招标偏好 -->
             <Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" />
             <!-- 合作情况 -->
-            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" />
+            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" />
             <!-- 决策链条 -->
             <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
             <!-- 跟进记录 -->
@@ -147,9 +147,17 @@ export default {
       currentPath: {
         pathName: 'overview'  //默认展示页
       },
-      partBoxHeight: null
+      partBoxHeight: null,
+      fromPath: '',
+      fromName: ''
     }
   },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.fromPath = from.path
+      vm.fromName = from.meta.title
+    })
+  },
   created() {
     if (this.$route.params.id) { // 获取companyId
       let companyId = this.$route.params.id

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

@@ -54,7 +54,7 @@ export default {
         {label: '专项债用作资本金（亿元）', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'}
       ],
       formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
       ],
       //列表
       tableLoading:false,

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

@@ -60,7 +60,7 @@ export default {
       ],
       formData: [
         { type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []}
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220}
       ],
       //列表
       tableLoading:false,

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

@@ -60,7 +60,7 @@ export default {
         {label: '是否为民间推介项目', prop: 'isProjcet', width: '150', slot: true}
       ],
       formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
       ],
       //列表
       tableLoading:false,

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

@@ -56,6 +56,7 @@ export default {
       },
       forData: [
         {label: '项目名称', prop: 'projectName', minWidth: '320', slot: true},
+        {label: '发布日期', prop: 'pubdate', width: '110'},
         {label: '金额（万元）', prop: '', children: [
           { label: '建安费暂估', prop: 'projectSafeAmount', width: '88px'},
           { label: '勘察费暂估', prop: 'projectSurveyAmount', width: '88px'},
@@ -74,8 +75,7 @@ export default {
         {label: '分部分项', prop: 'projectSub', width: '130'},
         {label: '项目级别', prop: 'projectLevel', width: '130'},
         {label: '评标办法', prop: 'bidAssessmentWay', width: '130'},
-        {label: '项目属地', prop: 'province', width: '130', slot: true},
-        {label: '发布日期', prop: 'pubdate', width: '130'}
+        {label: '项目属地', prop: 'province', width: '130', slot: true}
       ],
       formData: [
         { type: 1, fieldName: 'projectType', value: '', placeholder: '项目类别', options: []},
@@ -131,6 +131,13 @@ export default {
       this.tableLoading = false
       if(res.code==200){
         this.tableData = res.rows
+        if(this.tableData&&this.tableData.length>0){
+          this.tableData.forEach(item => {
+            item.projectSafeAmount ? item.projectSafeAmount = parseFloat(parseFloat(item.projectSafeAmount).toFixed(4)) : ''
+            item.projectSurveyAmount ? item.projectSurveyAmount = parseFloat(parseFloat(item.projectSurveyAmount).toFixed(4)) : ''
+            item.projectEnsureAmount ? item.projectEnsureAmount = parseFloat(parseFloat(item.projectEnsureAmount).toFixed(4)) : ''
+          })
+        }
       }
       this.tableDataTotal = res.total
     }

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

-<template>
+<template xmlns="http://www.w3.org/1999/html">
   <div class="app-container detail-container">
     <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
       <el-tab-pane label="工商信息" name="first"></el-tab-pane>
@@ -10,6 +10,22 @@
       <template slot="provinceCode" slot-scope="scope">
         <span>{{showRegion(scope.data.provinceCode)}}</span>
       </template>
+      <template slot="term" slot-scope="scope">
+        <span v-if="scope.data.termStart&&scope.data.termEnd">{{ scope.data.termStart }} ~ {{ scope.data.termEnd }}</span>
+        <span v-else-if="scope.data.termStart&&!scope.data.termEnd">{{ scope.data.termStart }}起</span>
+        <span v-else-if="!scope.data.termStart&&scope.data.termEnd">{{ scope.data.termEnd }}止</span>
+        <span v-else>--</span>
+      </template>
+      <template slot="actualCapi" slot-scope="scope">
+        <span>
+          {{ scope.data.actualCapi?scope.data.actualCapi+'万元人民币':'--' }}
+        </span>
+      </template>
+      <template slot="colleguesNum" slot-scope="scope">
+        <span>
+          {{ scope.data.colleguesNum?scope.data.colleguesNum+'人':'--' }}
+        </span>
+      </template>
     </info-table>
     <tables
       :tableLoading="tableLoading"
@@ -53,18 +69,18 @@ export default {
         { name: '登记状态', prop: 'status' },
         { name: '成立日期', prop: 'startDate' },
         { name: '注册资本', prop: 'registCapi' },
-        { name: '实缴资本', prop: 'actualCapi' },
+        { name: '实缴资本', prop: 'actualCapi', slot: true },
         { name: '核准日期', prop: 'checkDate' },
         { name: '组织机构代码', prop: 'orgNo' },
         { name: '工商注册号', prop: 'regNo' },
         { name: '纳税人识别号', prop: 'creditNo' },
         { name: '企业类型', prop: 'econKind' },
-        { name: '营业期限', prop: 'termEnd' },
+        { name: '营业期限', prop: 'term', slot: true },
         { name: '纳税人资质', prop: 'qualification' },
         { name: '所属地区', prop: 'provinceCode', slot: true },
         { name: '登记机关', prop: 'belongOrg' },
-        { name: '人员规模', prop: 'colleguesNum' },
-        { name: '参保人数', prop: 'colleguesNum' },
+        { name: '人员规模', prop: 'colleguesNum', slot: true },
+        { name: '参保人数', prop: 'colleguesNum', slot: true },
         { name: '经营范围', prop: 'scope', style: true }
       ],
       forData: [

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

@@ -185,7 +185,7 @@ export default {
         this.tableLoading = false
         if(res.code==200){
           this.dialogVisible=true
-          this.ifClaim = true
+          this.ifClaim = 1
         }
       }else{
         this.$message.warning('对不起，当前不能认领')
@@ -226,7 +226,7 @@ export default {
     },
     //获取认领状态
     getClaimStatus(){
-      this.ifClaim = this.companyInfo.regCapital
+      this.ifClaim = this.companyInfo.claimStatus
     },
     handleWidth(){
       if(this.companyInfo.introduction){

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

@@ -11,7 +11,12 @@
         <el-table-column label="序号" width="55" align="left" fixed>
           <template slot-scope="scope">{{ holderParams.pageNum * holderParams.pageSize - holderParams.pageSize + scope.$index + 1 }}</template>
         </el-table-column>
-        <el-table-column prop="stockName" min-width="140" label="股东名称"></el-table-column>
+        <el-table-column min-width="140" label="股东名称">
+          <template slot-scope="scope">
+            <router-link :to="`/enterprise/${encodeStr(scope.row.stockId)}`" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName" v-html="scope.row.stockName"></router-link>
+            <div v-else v-html="scope.row.stockName  || '--'"></div>
+          </template>
+        </el-table-column>
         <el-table-column prop="shouldCapiConv" label="应缴金额"></el-table-column>
         <el-table-column prop="stockPercent" label="持股比例"></el-table-column>
         <el-table-column prop="" label="法定代表人">

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

@@ -46,8 +46,8 @@ export default {
         {label: '列入日期', prop: 'inDate', width: '95'},
         {label: '做出决定机关（移入）', prop: 'department', width: '264'},
         {label: '移出经营异常名录原因', prop: 'outReason', width: '320'},
-        {label: '移除日期', prop: 'outDate', width: '95'},
-        {label: '做出决定机关（移除）', prop: 'outDepartment', width: '264'}
+        {label: '移出日期', prop: 'outDate', width: '95'},
+        {label: '做出决定机关（移出）', prop: 'outDepartment', width: '264'}
       ],
       formData: [
         { type: 4, fieldName: 'years', value: '', placeholder: '列入时间', options: []}

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

@@ -21,7 +21,7 @@
       <template slot="punishReason" slot-scope="scope">
         <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
           <div v-html="scope.row.punishReason"></div>
-          <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
+          <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)" class="more">...<span>更多</span></span>
         </span>
       </template>
     </tables>

dsk-system/src/main/java/com/dsk/system/domain/customer/dto/CustomerBusinessSearchDto.java

@@ -19,6 +19,10 @@ public class CustomerBusinessSearchDto implements Serializable {
      * 企业id
      */
     private Long userId;
+    /**
+     * 项目名称
+     */
+    private String projectName;
     /**
      * 项目阶段
      */

dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessBrowseVo.java

@@ -130,5 +130,10 @@ public class BusinessBrowseVo {
      */
     private Integer fileCount;
 
+    /**
+     * 是否创建人(1 是,0 否)
+     */
+    private Integer isFounder;
+
 
 }

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

@@ -56,7 +56,10 @@ public class EnterpriseService {
         companyData.put("claimStatus", 0);
         companyData.put("uipId", null);
 
-        Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = BeanUtil.beanToMap(body, false, false);
+        map.put("cid", body.getCompanyId());
+
+        Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", map);
         Integer uipCode = MapUtils.getInteger(uipMap, "code", 300);
         if (200 != uipCode) return R.ok(companyData);
 

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

 package com.dsk.system.mapper;
 
 import com.dsk.common.core.domain.entity.BusinessUser;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -65,4 +67,11 @@ public interface BusinessUserMapper
      * @return
      */
     String selectCreatorByBusinessId(Integer businessId);
+
+    /**
+     * 查询是否为项目的创建人
+     * @param businessId
+     * @return
+     */
+    Integer selectFounder(@Param("businessId") Integer businessId,@Param("userId") Long userId);
 }

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

@@ -89,7 +89,6 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
             dto.setOthers(userId.intValue());
             //查询他人可见项目
             othersList = businessInfoMapper.selectBusinessInfoList(dto);
-
         }
         dto.setOthers(null);
         //查询自己参与的项目
@@ -106,6 +105,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         BeanUtil.copyProperties(businessInfo, businessBrowseVo);
         //商务团队
         businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
+        //查询是否是项目创建人
+        Long userId = SecurityUtils.getLoginUser().getUserId();
+        if (userId == null) throw new BaseException("请登录");
+        Integer founder = businessUserMapper.selectFounder(businessId, userId);
+        businessBrowseVo.setIsFounder(founder == null ? 0 : founder);
         //查询项目标签
         businessBrowseVo.setLabelList(businessLabelMapper.selectBusinessLabelList(new BusinessLabel(businessId)).stream().map(p -> p.getLabel()).collect(Collectors.toList()));
         //相关数据统计

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

@@ -388,6 +388,7 @@
         from business_info bi
         left join business_user bu on bi.id = bu.business_id
         where bi.customer_id = #{customerId} and (bu.user_id = #{userId} or bi.is_private = 1)
+        <if test="projectName != null and projectName != '' "> and bi.project_name like concat('%',#{projectName},'%') </if>
         <if test="projectStage != null and projectStage != '' "> and bi.project_stage = #{projectStage}</if>
         <if test="status != null "> and bi.status = #{status}</if>
         order by bi.create_time desc

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

@@ -41,6 +41,12 @@
         where bu.is_founder = 1
         and i.id = #{BusinessId}
     </select>
+    <select id="selectFounder" resultType="java.lang.Integer">
+        select is_founder
+        from business_user
+        where business_id = #{businessId}
+        and user_id = #{userId}
+    </select>
 
     <insert id="insertBusinessUser" parameterType="com.dsk.common.core.domain.entity.BusinessUser" useGeneratedKeys="true" keyProperty="id">
         insert into business_user