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

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

@@ -4,8 +4,8 @@
       <tags-view />
     </div>
     <div ref="rightMenu" class="flex-box right-menu">
-      <!--<div class="menu-bells"><img src="@/assets/images/message.png"><i /></div>-->
-      <i class="menu-line" />
+<!--      <div class="menu-bells"><img src="@/assets/images/message.png"><i /></div>-->
+<!--      <i class="menu-line" />-->
       <el-dropdown class="avatar-container" trigger="hover">
         <div class="flex-box avatar-wrapper">
           <img v-if="avatar" class="pic-avatar" :src="avatar">

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

@@ -4,6 +4,7 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
         <el-breadcrumb-item :to="{ path: fromPath }" v-if="fromName">{{fromName}}</el-breadcrumb-item>
+        <el-breadcrumb-item v-if="cooDetail"><el-link :underline="false" @click="cooperateList">合作情况</el-link></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>
@@ -18,7 +19,7 @@
 <script>
 export default {
   name: 'Header',
-  props: ['companyId', 'companyInfo', 'fromPath', 'fromName'],
+  props: ['companyId', 'companyInfo', 'fromPath', 'fromName', 'cooDetail'],
   data() {
     return {
     }
@@ -26,6 +27,10 @@ export default {
   created() {
   },
   methods: {
+    // 跳转到企业详情合作情况
+    cooperateList(){
+      this.$emit('close-detail')
+    },
   }
 }
 </script>

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

@@ -146,14 +146,14 @@ export default {
   components: {
     Detail
   },
-  props: ['customerIds','companyInfo'],
+  props: ['customerIds','companyInfo','cooDetail'],
   data() {
     return {
       ifEmpty:false,
       queryParams: {
         customerId: this.customerIds,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '项目名称', prop: 'projectName', slot: true},
@@ -222,6 +222,11 @@ export default {
       isDetailId: false,
     }
   },
+  watch:{
+    cooDetail(newVal, oldVal){
+      this.isDetailId = newVal
+    }
+  },
   created() {
     this.list()
     this.customerInfos()
@@ -301,10 +306,6 @@ export default {
       if (value.length>=2){
         let param = {
           projectName:value,
-          // page:{
-          //   limit:20,
-          //   page:1
-          // }
         }
         queryProject(JSON.stringify(param)).then(result=>{
           if(result.code != 200)
@@ -361,6 +362,7 @@ export default {
     clickDetail(id){
       this.detailId = id
       this.isDetailId = true
+      this.$emit('detail')
     },
     //关闭详情
     closeDetail(){
@@ -369,7 +371,7 @@ export default {
     },
     // 转科学计算
     numbers(v){
-      return new Number(v);
+      return Number(v);
     }
 
   }

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

@@ -88,7 +88,7 @@ export default {
       queryParams:{
         customerId:this.customerIds,
         pageNum:1,
-        pageSize:10,
+        pageSize:20,
       },
       forData: [
         {label: '姓名', prop: 'name', width: '124'},
@@ -96,7 +96,7 @@ export default {
         {label: '公司/机关', prop: 'position', width: '268'},
         {label: '职位', prop: 'workUnit', width: '110'},
         {label: '联系方式', prop: 'contactInformation', width: '105'},
-        {label: '内部维护人', prop: 'updateBy', width: '88'},
+        {label: '内部维护人', prop: 'updateBy', width: '100'},
         {label: '备注', prop: 'remark'},
       ],
       addRorm: {

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

 <template>
   <div class="app-container part-container">
-    <Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" v-if="companyId" />
+    <Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" :cooDetail="cooDetail" v-if="companyId" @close-detail="closeDetail" />
     <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" :companyInfo="companyInfo" />
+            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" :cooDetail="cooDetail" @detail="cooperateDetail" />
             <!-- 决策链条 -->
             <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
             <!-- 跟进记录 -->
@@ -149,13 +149,19 @@ export default {
       },
       partBoxHeight: null,
       fromPath: '',
-      fromName: ''
+      fromName: '',
+      cooDetail: false
     }
   },
   beforeRouteEnter(to, from, next) {
     next(vm => {
       vm.fromPath = from.path
       vm.fromName = from.meta.title
+      if(from.name == 'CustomList'){
+        if (to.query.path){
+          vm.currentPath.pathName = to.query.path
+        }
+      }
     })
   },
   created() {
@@ -173,14 +179,6 @@ export default {
   mounted() {
   },
   activated(){
-    if (this.$route.query.path) { // 获取跳转对应板块
-      this.currentPath.pathName = this.$route.query.path
-    }else{
-      this.currentPath.pathName = 'overview'
-    }
-    if (this.$route.query.customerId) { // 判断是否显示
-      this.customerId = this.$route.query.customerId
-    }
   },
   methods: {
     showPartPage(e){
@@ -208,6 +206,12 @@ export default {
       erd.listenTo(partBox, element => {
         _this.partBoxHeight = partBox.offsetHeight
       })
+    },
+    cooperateDetail(){
+      this.cooDetail = true
+    },
+    closeDetail(){
+      this.cooDetail = false
     }
   }
 }

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

@@ -57,8 +57,8 @@ export default {
       typeList:[
         {name: '土地交易', pathName: 'landtransaction', ico: require("@/assets/images/detail/overview/clue_ico1.png"), count: 0, category:'global', field:'landInfo', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico1.png")},
         {name: '拟建项目', pathName: 'proposed', ico: require("@/assets/images/detail/overview/clue_ico2.png"), count: 0, category:'global', field:'proposedProject', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico2.png")},
-        {name: '专项债项目', pathName: 'bond', ico: require("@//assets/images/detail/overview/clue_ico3.png"), count: 0, category:'xxx', field:'yy', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico3.png")},
-        {name: '招标计划', pathName: 'biddingplan', ico: require("@/assets/images/detail/overview/clue_ico4.png"), count: 0, category:'xxx', field:'zz', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico4.png")},
+        {name: '专项债项目', pathName: 'bond', ico: require("@//assets/images/detail/overview/clue_ico3.png"), count: 0, category:'performance', field:'specialDebt', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico3.png")},
+        {name: '招标计划', pathName: 'biddingplan', ico: require("@/assets/images/detail/overview/clue_ico4.png"), count: 0, category:'performance', field:'bidPlan', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico4.png")},
         {name: '招标公告', pathName: 'announcement', ico: require("@/assets/images/detail/overview/clue_ico5.png"), count: 0, category:'business', field:'biddingAnnouncement', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico5.png")},
         {name: '标讯Pro', pathName: 'tencent', ico: require("@/assets/images/detail/overview/clue_ico6.png"), count: 0, category:'business', field:'proCount', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico6.png")},
         {name: '行政许可', pathName: 'administrative', ico: require("@/assets/images/detail/overview/clue_ico7.png"), count: 0, category:'business', field:'adminLicensing', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico7.png")},
@@ -148,8 +148,8 @@ export default {
       this.typeList.forEach((item, index) => {
         item.count = this.statistic[item.category]?this.statistic[item.category][item.field]:0
       })
-      this.typeList[2].count = 10 //写死代表有数据，英文统计里面没这项
-      this.typeList[3].count = 10 //写死代表有数据，英文统计里面没这项
+      //this.typeList[2].count = 10 //写死代表有数据，英文统计里面没这项
+      //this.typeList[3].count = 10 //写死代表有数据，英文统计里面没这项
     },
     handleType(it, idx){
       if(it.count){

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

@@ -39,7 +39,7 @@ export default {
       queryParams: {
         cid: this.companyId,//382724726
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '列入原因', prop: 'inReason', width: '508'},

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

@@ -41,7 +41,7 @@ export default {
       queryParams: {
         cid: this.companyId, //20734
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '案由', prop: 'caseReason'},

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

@@ -39,7 +39,7 @@ export default {
       queryParams: {
         cid: this.companyId,//5504335
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '失信被执行人行为具体情形', prop: 'executionDesc', width: '508', fixed: true},

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

@@ -38,7 +38,7 @@ export default {
       queryParams: {
         cid: this.companyId,//194738907
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '执行标的（元）', prop: 'amount', width: '140'},

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

@@ -47,7 +47,7 @@ export default {
       queryParams: {
         cid: this.companyId,//5504335
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '案由', prop: 'causeAction', width: '240'},

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

@@ -47,7 +47,7 @@ export default {
       queryParams: {
         cid: this.companyId,//20734
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '案由', prop: 'causeAction', width: '240', fixed: true},

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

@@ -47,7 +47,7 @@ export default {
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '处罚原因', prop: 'punishReason', width: '508', slot: true, fixed: true},

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

@@ -45,7 +45,7 @@ export default {
         cid: this.companyId,//3068
         sort: 3,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '项目名称', prop: 'projectName', width: '508', slot: true},

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

@@ -143,7 +143,7 @@ export default {
         platformImportance: [],
         developmentZone: [],
         pageNum: 1,
-        pageSize: 15
+        pageSize: 20
       },
       forData: [
         {label: '企业名称', prop: 'companyName', width: '369', slot: true},

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

@@ -4,9 +4,10 @@
       <template v-if="!detailId">
         <span>项目管理</span>
         <span class="on" @click="tolist"> / 商机列表</span>
-      </template>
-      <span class="on" v-else @click="cooperateList">合作情况</span>
         <span> / 项目详情</span>
+      </template>
+<!--      <span class="on" v-else @click="cooperateList">合作情况</span>-->
+<!--      <span> / 项目详情</span>-->
     </div>
     <div class="app-container" v-if="ProjectData">
       <el-card class="box-card noborder pad16 overflows">

dsk-operate-ui/src/views/system/user/profile/resetPwd.vue

@@ -18,6 +18,8 @@
 
 <script>
 import { updateUserPwd } from "@/api/system/user";
+import {removeToken} from "@/utils/auth";
+import store from "@/store";
 
 export default {
   data() {
@@ -56,6 +58,11 @@ export default {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
             this.$modal.msgSuccess("修改成功");
+            store.commit('SET_TOKEN', '')
+            store.commit('SET_ROLES', [])
+            store.commit('SET_PERMISSIONS', [])
+            removeToken()
+            location.href = '/index'
           });
         }
       });

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

 package com.dsk.system.mapper;
 
 import com.dsk.common.core.domain.entity.BusinessBacklog;
+
 import java.util.List;
 
 /**
@@ -17,7 +18,7 @@ public interface BusinessBacklogMapper
      * @param id 项目工作待办主键
      * @return 项目工作待办
      */
-    public BusinessBacklog selectBusinessBacklogById(Long id);
+    public BusinessBacklog selectBusinessBacklogById(Integer id);
 
     /**
      * 查询项目工作待办列表

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

 package com.dsk.system.service;
 
-import java.util.List;
 import com.dsk.common.core.domain.entity.BusinessBacklog;
 
+import java.util.List;
+
 /**
  * 项目工作待办Service接口
  * 
@@ -17,7 +18,7 @@ public interface IBusinessBacklogService
      * @param id 项目工作待办主键
      * @return 项目工作待办
      */
-    public BusinessBacklog selectBusinessBacklogById(Long id);
+    public BusinessBacklog selectBusinessBacklogById(Integer id);
 
     /**
      * 查询项目工作待办列表

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

 package com.dsk.system.service.impl;
 
 import com.dsk.common.core.domain.entity.BusinessBacklog;
+import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.system.mapper.BusinessBacklogMapper;
 import com.dsk.system.service.IBusinessBacklogService;
@@ -10,6 +11,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,7 +34,7 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService
      * @return 项目工作待办
      */
     @Override
-    public BusinessBacklog selectBusinessBacklogById(Long id)
+    public BusinessBacklog selectBusinessBacklogById(Integer id)
     {
         return businessBacklogMapper.selectBusinessBacklogById(id);
     }
@@ -59,6 +61,7 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService
     @Transactional
     public int insertBusinessBacklog(BusinessBacklog businessBacklog)
     {
+        if(businessBacklog.getFinishTime().before(new Date())) throw new BaseException("完成时间必须大于当前时间");
         businessBacklog.setCreateTime(DateUtils.getNowDate());
         //新增记录，状态默认 进行中
         businessBacklog.setState(1);
@@ -75,7 +78,14 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService
     @Transactional
     public int updateBusinessBacklog(BusinessBacklog businessBacklog)
     {
-        businessBacklog.setUpdateTime(DateUtils.getNowDate());
+        //从完成状态修改到为完成，判断是否已逾期
+        BusinessBacklog backlog = selectBusinessBacklogById(businessBacklog.getId());
+        if (businessBacklog.getState() == 1 && backlog.getState() == 2 && backlog.getFinishTime().before(new Date())) {
+            businessBacklog.setState(0);
+            businessBacklog.setUpdateTime(new Date());
+            return businessBacklogMapper.updateBusinessBacklog(businessBacklog);
+        }
+        businessBacklog.setUpdateTime(new Date());
         return businessBacklogMapper.updateBusinessBacklog(businessBacklog);
     }
 

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

@@ -29,7 +29,8 @@ public class CustomerDecisionChainServiceImpl implements ICustomerDecisionChainS
     @Override
     public List<CustomerDecisionChain> selectList(CustomerDecisionChainSearchDto dto) {
         return baseMapper.selectList(Wrappers.<CustomerDecisionChain>lambdaQuery()
-                .eq(CustomerDecisionChain::getCustomerId,dto.getCustomerId()));
+                .eq(CustomerDecisionChain::getCustomerId, dto.getCustomerId())
+                .orderByDesc(CustomerDecisionChain::getCreateTime));
     }
 
     /**
@@ -63,7 +64,7 @@ public class CustomerDecisionChainServiceImpl implements ICustomerDecisionChainS
      */
     @Override
     public boolean update(CustomerDecisionChain customerDecisionChain) {
-        if(ObjectUtils.isEmpty(customerDecisionChain.getId())) throw new BeanException("id不能为空！");
+        if (ObjectUtils.isEmpty(customerDecisionChain.getId())) throw new BeanException("id不能为空！");
         verifyParameter(customerDecisionChain);
         return baseMapper.updateById(customerDecisionChain) > 0;
     }
@@ -81,10 +82,11 @@ public class CustomerDecisionChainServiceImpl implements ICustomerDecisionChainS
 
     /**
      * 参数验证
+     *
      * @param customerDecisionChain
      */
-    private void verifyParameter(CustomerDecisionChain customerDecisionChain){
-        if(ObjectUtils.isEmpty(customerDecisionChain.getCustomerId())) throw new BeanException("客户id不能为空！");
+    private void verifyParameter(CustomerDecisionChain customerDecisionChain) {
+        if (ObjectUtils.isEmpty(customerDecisionChain.getCustomerId())) throw new BeanException("客户id不能为空！");
         customerDecisionChain.setUpdateId(SecurityUtils.getUserId());
         customerDecisionChain.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
     }

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

@@ -84,7 +84,8 @@
     <update id="updateBacklogState">
         update business_backlog
         set state = 0
-        where finish_time &lt; CURRENT_TIMESTAMP
+        where state = 1
+             and finish_time &lt; CURRENT_TIMESTAMP
     </update>
 
     <delete id="deleteBusinessBacklogById" parameterType="Long">

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

@@ -111,7 +111,7 @@
                 and i.investment_amount >= #{minAmount}
             </if>
             <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount">
-                and i.investment_amount &lt;= #{maxAmount}
+                and i.investment_amount &lt; #{maxAmount}
             </if>
             <if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
                 and i.investment_amount = #{minAmount}

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

@@ -39,6 +39,7 @@
         ) bi3 on bi3.customer_id = ct.customer_id
         where ctu.user_id = #{dto.userId}
         <if test="dto.companyName != null and dto.companyName != '' "> and ct.company_name like concat('%',#{dto.companyName},'%')</if>
+        order by ct.create_time desc
     </select>
 
     <select id="selectUserList" resultType="com.dsk.system.domain.customer.Customer">