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

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

@@ -30,7 +30,7 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
      * 供应商企业
      */
     @NotNull(message = "企业不能为空")
-    private Integer companyName;
+    private String companyName;
 
     /**
      * 查询关键字

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

@@ -30,7 +30,7 @@
     </ul>
     <div class="alltags" v-if="visitedViews.length > 0">
       <div class="" @click="closeall"><i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i></div>
-      <div class="tagslist" v-if="showall">
+      <div class="tagslist" v-show="showall">
         <!--<div v-for="(tag, index) in visitedViews"-->
              <!--:key="tag.path"-->
              <!--:class="isActive(tag)?'active':''"-->
@@ -50,7 +50,7 @@
         >
           <div @click="changetags">
           <i class="el-icon-check"></i>
-          <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+          <span :id="isActive(tag)?'tagTitles':''">{{ tag.title }}</span>
           </div>
         </router-link>
         <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
@@ -120,7 +120,6 @@ export default {
   },
   methods: {
     changetags(){
-      console.log(88)
       this.showall = false
     },
     closeall(){

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

@@ -70,7 +70,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'index',noCache: true }
+        meta: { title: '首页', icon: 'index',noCache: false }
       }
     ]
   },

dsk-operate-ui/src/views/component/CustomMoneySelect.vue

@@ -51,6 +51,10 @@ export default {
       type: String,
       default: '请选择'
     },
+    'moneyValue': {
+      type: String,
+      default: ''
+    },
     'ref-str': {
       type: String,
       default: `timeselect${String(Math.random(0, 100)).slice(2)}`,
@@ -92,6 +96,9 @@ export default {
     if(this.moneyList&&this.moneyList.length>0){
       this.options = this.moneyList
     }
+    if(this.moneyValue){
+      this.value = this.moneyValue
+    }
   },
   destroyed() {
     const app = document.getElementById('app')
@@ -411,20 +418,20 @@ export default {
       width: 186px;
       color: #606266;
       text-indent: 0;
-      padding: 16px;
+      padding: 14px;
       padding-top: 0px;
       border: 1px solid #e0e0e0;
       .popper_wrap {
         margin-top: 16px;
         display: inline-block;
         .popper_input {
-          width: 100px;
+          width: 90px;
           display: inline-block;
           margin: 0px 8px;
           line-height: 34px;
         }
         .el-input__inner {
-          width: 100px;
+          width: 90px;
         }
       }
       input::-webkit-outer-spin-button,

dsk-operate-ui/src/views/component/CustomTimeSelect.vue

@@ -46,6 +46,10 @@ export default {
       type: String,
       default: '请选择',
     },
+    'timeValue': {
+      type: String,
+      default: '',
+    },
     'ref-str': {
       type: String,
       default: `timeselect${String(Math.random(0, 100)).slice(2)}`,
@@ -106,6 +110,9 @@ export default {
     if(this.dateTo){
       this.defaultValue = new Date(this.dateTo)
     }
+    if(this.timeValue){
+      this.value = this.timeValue
+    }
     this.handleAppClick()
     if(this.timeList&&this.timeList.length>0){
       this.options = this.timeList

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

@@ -212,12 +212,12 @@
       pageSize:10,
       recordlist:[],
       timeList:['今日','近三天','近七天','自定义'],
-      datatype:0,
+      datatype:'',
       defaultValue:new Date(),
       pickerValue: [],
       params:{
-        startTime:this.formatDate(new Date()),
-        endTime:this.formatDate(new Date())
+        startTime:'',
+        endTime:'',
       },
       data:{
         open:false
@@ -301,88 +301,120 @@
         self.myChart1.resize()
       }, 10)
     },
-    initChart(data){
-
+    initChart(list){
+      let data=[]
+      if(list.length > 10){
+        for(var i=0;i<10;i++){
+          data.push(list[i])
+        }
+      }else {
+        data=list
+      }
       //业主单位合作情况
-      this.option = {
-        legend: {
-          show: false,
-          x:'center',
-          y:'bottom',
-          padding:[10,0,10,0],
-          itemWidth: 24,
-          itemHeight: 10,
-          textStyle:{
-            borderRadius:30,
+      this.option ={
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
           }
         },
-        yAxis: {
+        xAxis: {
           type: 'category',
-          inverse: true, // 反向坐标
-          data: data.map(item => item.companyName),
-          axisLine: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
+          axisLabel: { //坐标轴刻度标签的相关设置
+            margin: 15, //刻度标签与轴线之间的距离
+            color:"#666666"
           },
+          axisTick: false, //坐标轴刻度
           axisPointer: {
-            label: {
-              show: true,
-              margin: 30
+            type: 'shadow'
+          },
+          data: data.map(item => item.companyName),
+        },
+        yAxis: [
+          {
+            type: 'value',
+            axisLabel: { //坐标轴刻度标签的相关设置
+              color:"#666666"
+            },
+            name: '单位：次',
+            nameLocation: 'end',
+            nameTextStyle: {
+              padding: [0, 10, 0, -60],    // 四个数字分别为上右下左与原位置距离
+              color: '#666666',
             }
           },
-          axisLabel: {
-            margin: 200,
-            textStyle: {
-              align: 'left',
+          {
+            type: 'value',
+            axisLabel: { //坐标轴刻度标签的相关设置
+              color:"#666666"
             },
-            formatter: function (value,index) {
-              if (value.length > 15) {
-                value=`${value.slice(0, 15)}...`
-              }
-              return value
+            name: '单位：万元',
+            nameLocation: 'end',
+            nameTextStyle: {
+              padding: [0, 0, 0, 100],    // 四个数字分别为上右下左与原位置距离
+              color: '#666666',
             },
-          },
-        },
-        xAxis: {
-          type: 'value',
-          axisLabel: { //坐标轴刻度标签的相关设置
-            // color:"#666666"
-          },
-          name: '单位/万元',
-          // nameLocation: 'start',
-          nameLocation: 'end',
-          nameTextStyle: {
-            padding: [0, 0, 0, 0],    // 四个数字分别为上右下左与原位置距离
-            // color: '#666666',
-          },
-        },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                type: 'dashed',
+                color: ['#FFFFFF']
+              }
+            }
+          }
+        ],
         grid: {
-          left: '22%',
-          top: 60,
-          right: 80,
-          bottom: 60,
-        },
-        tooltip: {
-          show: true,
-          // backgroundColor: 'rgba(0,0,0,.7)',
-          borderWidth: 0,
-          // textStyle: {
-          //   color: '#fff',
-          // },
+          top:30,
+          left:80,
+          right:90,
+          bottom:30,
         },
-        series: {
-          name:'合同总额',
-          data: data.map(item => item.totalAmount),
-          barGap: 0,
-          type: 'bar',
-          itemStyle:{
-            color: '#92C9FF',
-            barBorderRadius:[0, 20, 20, 0]
+        series: [
+          {
+            name:'合作金额（万元）',
+            smooth: false, //平滑
+            type:"line",
+            symbolSize: 6,
+            yAxisIndex: 1,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + '万元'
+              }
+            },
+            itemStyle: {
+              normal:{
+                color: '#67B3FD',
+                lineStyle: {
+                  width:3
+                },
+              }
+            },
+            data:data.map(item => item.totalAmount),
           },
-          barWidth: 8,
-        },
+          {
+            name:'合作次数（次）',
+            type: 'bar',
+            barWidth: 20,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + '次';
+              }
+            },
+            itemStyle: {
+              normal:{
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                  offset: 0,
+                  color: '#56A5FF'
+                }, {
+                  offset: 1,
+                  color: '#1B8EFF'
+                }]),
+                barBorderRadius:[20,20, 0, 0]
+              }
+            },
+            data:data.map(item => item.businessCount),
+          }
+        ]
       }
       this.option && this.myChart.setOption(this.option)
     },

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

@@ -188,6 +188,15 @@ export default {
                       companyName: this.customerInfo.companyName
                     }
                     document.getElementById('tagTitle').innerText = this.customerInfo.companyName
+                    // let lists = this.$store.state.tagsView.visitedViews
+                    // lists.forEach(item=>{
+                    //   if(item.fullPath == this.$route.fullPath){
+                        let titlename = document.getElementById('tagTitles')
+                        if(titlename){
+                          titlename.innerText = this.customerInfo.companyName
+                        }
+                      // }
+                    // })
                   })
                 }
               }
@@ -273,6 +282,15 @@ export default {
         if(this.companyInfo && this.companyInfo.companyName){
           this.$nextTick(()=>{
             document.getElementById('tagTitle').innerText = this.companyInfo.companyName
+            // let lists = this.$store.state.tagsView.visitedViews
+            // lists.forEach(item=>{
+            //   if(item.fullPath == this.$route.fullPath){
+               let titlename = document.getElementById('tagTitles')
+                if(titlename){
+                  titlename.innerText = this.companyInfo.companyName
+                }
+            //   }
+            // })
           })
         }
       }
@@ -313,6 +331,15 @@ export default {
                     companyName: this.customerInfo.companyName
                   }
                   document.getElementById('tagTitle').innerText = this.customerInfo.companyName
+                  // let lists = this.$store.state.tagsView.visitedViews
+                  // lists.forEach(item=>{
+                  //   if(item.fullPath == this.$route.fullPath){
+                      let titlename = document.getElementById('tagTitles')
+                      if(titlename){
+                        titlename.innerText = this.customerInfo.companyName
+                      }
+                  //   }
+                  // })
                 })
               }
             } else {

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

@@ -33,6 +33,9 @@
       <template slot="stockPercent" slot-scope="scope">
         <span>{{scope.row.stockPercent?parseFloat(Number(scope.row.stockPercent*100).toFixed(4))+'%':'--'}}</span>
       </template>
+      <template slot="shouldCapiConv" slot-scope="scope">
+        <span>{{scope.row.shouldCapiConv === '0.00万元人民币'? '--':scope.row.shouldCapiConv}}</span>
+      </template>
     </tables>
   </div>
 </template>
@@ -56,7 +59,7 @@ export default {
       forData: [
         {label: '发起人/股东', prop: 'stockName', minWidth: '230', slot: true},
         {label: '持股比例', prop: 'stockPercent', slot: true},
-        {label: '认缴出资', prop: 'shouldCapiConv'},
+        {label: '认缴出资', prop: 'shouldCapiConv', slot: true},
         {label: '实缴出资额', prop: 'realCapi'},
         {label: '认缴出资日期', prop: 'conDate'},
         {label: '参股日期', prop: 'realCapiDate', width: '150'}

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

 package com.dsk.system.domain.business.dto;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -14,7 +15,7 @@ import java.util.Map;
  */
 @Data
 @NoArgsConstructor
-public class BusinessSearchDto implements Serializable {
+public class BusinessSearchDto extends BaseEntity implements Serializable {
     /**
      * 用户id
      */
@@ -24,18 +25,6 @@ public class BusinessSearchDto implements Serializable {
      */
     private Integer status;
 
-    /**
-     * 数据权限
-     */
-    private Map<String, Object> params;
-
-    public Map<String, Object> getParams() {
-        if (params == null) {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
     public BusinessSearchDto(Long userId) {
         this.userId = userId;
     }

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

 package com.dsk.system.domain.customer.dto;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,7 +15,7 @@ import java.util.Map;
  */
 @Data
 @NoArgsConstructor
-public class CustomerSearchDto implements Serializable {
+public class CustomerSearchDto extends BaseEntity implements Serializable {
     /**
      * 企业id
      */
@@ -67,17 +68,4 @@ public class CustomerSearchDto implements Serializable {
      * 信资等级
      */
     private List<String> creditLevels;
-
-
-    /**
-     * 数据权限
-     */
-    private Map<String, Object> params;
-
-    public Map<String, Object> getParams() {
-        if (params == null) {
-            params = new HashMap<>();
-        }
-        return params;
-    }
 }

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

@@ -93,8 +93,11 @@ public class EnterpriseBussinessService {
                     dataMap.put("sourceList", enterpriseBussinessVoList);
                     if (ObjectUtil.isNotEmpty(body.getSources())) {
                         for (EnterpriseBussinessVo bussinessVo : enterpriseBussinessVoList) {
+                            String source_id = bussinessVo.getSource_id();
                             String source_type = bussinessVo.getSource_type();
                             if (body.getSources().contains(source_type)) {
+                                dataMap.put("sourceId", source_id);
+                                dataMap.put("sourceType", source_type);
                                 enterpriseSource.add(bussinessVo);
                             }
                         }
@@ -194,6 +197,8 @@ public class EnterpriseBussinessService {
                         for (EnterpriseBussinessVo bussinessVo : enterpriseBussinessVoList) {
                             String source_type = bussinessVo.getSource_type();
                             if (body.getSources().contains(source_type)) {
+                                dataMap.put("sourceId", bussinessVo.getSource_id());
+                                dataMap.put("sourceType", bussinessVo.getSource_type());
                                 enterpriseSource.add(bussinessVo);
                             }
                         }

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

@@ -71,11 +71,11 @@
         left join sys_dept d on u.dept_id = d.dept_id
         <where>
             <if test="userId != null"> and (f.user_id = #{userId} or i.is_private = 1)</if>
-            <if test="startTime != null and startTime != '' "> and f.creat_time &gt;= #{startTime} </if>
-            <if test="endTime != null and endTime != '' "> and f.creat_time &lt;= #{endTime} </if>
+            <if test="startTime != null and startTime != '' "> and f.visit_time &gt;= #{startTime} </if>
+            <if test="endTime != null and endTime != '' "> and f.visit_time &lt;= #{endTime} </if>
             ${params.dataScope}
         </where>
-        ORDER BY f.creat_time DESC
+        ORDER BY f.visit_time DESC
     </select>
     <select id="selectRelateProject" resultType="com.dsk.system.domain.business.vo.BusinessListVo">
         select i.id,i.project_name as projectName

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

@@ -314,10 +314,9 @@
     </delete>
 
     <delete id="deleteBusinessInfoByIds" parameterType="Long">
-        delete i,b,co,f,l,r,u
+        delete i,b,f,l,r,u
         from business_info i
         left join business_backlog b on b.business_id = i.id
-        left join business_contacts co on co.business_id = i.id
         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 business_relate_company r on r.business_id = i.id
@@ -392,14 +391,17 @@
     <select id="selectAmountAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
         select
             bi.amount_source,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
-        <include refid="businessSearchSql"/>
+            <include refid="businessSearchSql"/>
+        and bi.amount_source is not null
         group by bi.amount_source
+        having businessCount > 0
     </select>
 
     <select id="selectTypeAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
         select
             bi.project_type,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
         <include refid="businessSearchSql"/>
+        and bi.project_type is not null
         group by bi.project_type
         <if test="status != null and status == 0 "> order by businessCount desc </if>
         <if test="status != null and status == 2 "> order by totalAmount desc </if>
@@ -409,6 +411,7 @@
         select
             bi.project_category,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
         <include refid="businessSearchSql"/>
+        and bi.project_category is not null
         group by bi.project_category
         <if test="status != null and status == 0 "> order by businessCount desc </if>
         <if test="status != null and status == 2 "> order by totalAmount desc </if>

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

@@ -23,7 +23,7 @@
             <!-- 数据范围过滤 -->
             <if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope} </if>
         </where>
-        order by cfr.create_time desc
+        order by cfr.visit_time desc
     </select>
 
 </mapper>

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

@@ -118,6 +118,7 @@
         left join business_info bi on (bi.customer_id = ct.customer_id and bi.status = 2)
         where ctu.status = 0 and ctu.user_id = #{userId}
         group by ct.customer_id
+        having businessCount > 0
         order by totalAmount desc
         limit 10
     </select>