Merge remote-tracking branch 'origin/zuhuduan' into zuhuduan

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/service/impl/BusinessInfoServiceImpl.java

@@ -12,8 +12,10 @@ import com.dsk.biz.domain.bo.BusinessListDto;
 import com.dsk.biz.domain.bo.CustomerBusinessSearchDto;
 import com.dsk.biz.domain.vo.*;
 import com.dsk.biz.utils.ExcelUtils;
+import com.dsk.biz.utils.OldFileUtils;
 import com.dsk.common.annotation.DataColumn;
 import com.dsk.common.annotation.DataPermission;
+import com.dsk.common.utils.file.FileUploadUtils;
 import com.dsk.jsk.service.EnterpriseService;
 import com.dsk.biz.mapper.BusinessInfoMapper;
 import com.dsk.biz.mapper.BusinessLabelMapper;
@@ -131,7 +133,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         businessBrowseVo.setFollowRecordCount(total.getFollowRecordCount());
         businessBrowseVo.setRelateCompanyCount(total.getRelateCompanyCount());
         //资料文档统计
-//        businessBrowseVo.setFileCount(FileUtils.getAllFileNames(ShuZhiHuaConfig.getProfile() + businessId).size());
+        businessBrowseVo.setFileCount(OldFileUtils.getAllFileNames(FileUploadUtils.getDefaultBaseDir() + businessId).size());
         return businessBrowseVo;
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/JskCombineInfoController.java

@@ -10,6 +10,7 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.core.service.OssService;
 import com.dsk.jsk.domain.JskCombineBidPageDto;
 import com.dsk.jsk.domain.JskCombineCertificateDto;
+import com.dsk.jsk.domain.JskCombineCountDto;
 import com.dsk.jsk.domain.JskCombineSearchDto;
 import com.dsk.jsk.domain.vo.JskCombineBidProjectExportVo;
 import com.dsk.jsk.domain.vo.JskCombineWinBidProjectExportVo;
@@ -228,7 +229,7 @@ public class JskCombineInfoController extends BaseController {
      *@date: 2023/9/12 16:05
      */
     @RequestMapping(value = "/memberCount", method = RequestMethod.POST)
-    public R memberCount(@RequestBody JskCombineSearchDto dto) throws Exception {
+    public R memberCount(@RequestBody JskCombineCountDto dto) throws Exception {
         return baseService.memberCount(dto);
     }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCombineCountDto.java

+package com.dsk.jsk.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 集团户相关查询条件实体类
+ *
+ * @author lcl
+ * @create 2023/8/7
+ */
+@Data
+public class JskCombineCountDto implements Serializable {
+    /**
+     * 集团id
+     */
+    @NotNull(message = "集团id不能为空！")
+    private String combineId;
+    /**
+     * 截止时间
+     */
+    private String endTime;
+
+    /**
+     * 资质类型
+     */
+    private Integer qualificationType;
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/JskCombineInfoService.java

 package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.dsk.common.constant.CacheConstants;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
@@ -11,9 +13,11 @@ import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.jsk.domain.JskCombineBidPageDto;
 import com.dsk.jsk.domain.JskCombineCertificateDto;
+import com.dsk.jsk.domain.JskCombineCountDto;
 import com.dsk.jsk.domain.JskCombineSearchDto;
 import com.dsk.jsk.domain.vo.JskCombineBidProjectExportVo;
 import com.dsk.jsk.domain.vo.JskCombineWinBidProjectExportVo;
+import com.dsk.jsk.util.RedisCache;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,9 +25,12 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author lcl
@@ -38,6 +45,9 @@ public class JskCombineInfoService {
     @Autowired
     private EnterpriseService enterpriseService;
 
+    @Resource
+    private RedisCache redisCache;
+
     public TableDataInfo memberList(JskCombineSearchDto dto) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/memberList", BeanUtil.beanToMap(dto, false, false));
         return dskOpenApiUtil.responsePage(map);
@@ -236,12 +246,23 @@ public class JskCombineInfoService {
      *@Author: Dgm
      *@date: 2023/9/12 16:05
      */
-    public R memberCount(JskCombineSearchDto dto) {
+    public R memberCount(JskCombineCountDto dto) {
+        String redisKey = CacheConstants.PERSONAL_LOCATION + dto.getCombineId();
+        if (ObjectUtil.isNotEmpty(redisKey)) {
+            Map<String, Object> cacheMap = redisCache.getCacheObject(redisKey);
+            if (MapUtils.isNotEmpty(cacheMap)) {
+                return R.ok(cacheMap);
+            }
+        }
+        dto.setQualificationType(209);
+        dto.setEndTime(DateUtil.formatDate(new Date()));
         Map<String, Object> paramsMap = BeanUtil.beanToMap(dto, false, false);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/memberCount", paramsMap);
         if (ObjectUtil.isNotEmpty(map.get("data"))) {
             Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
             data.put("performance", businessCount(paramsMap));
+            map.put("data", data);
+            redisCache.setCacheObject(redisKey, data,24, TimeUnit.HOURS);
         }
         return BeanUtil.toBean(map, R.class);
     }

dsk-operate-ui/src/api/detail/groupAccount/groupAccount.js

 import request from "@/utils/request";
 
-//企业数据统计
-export function statistic(data) {
+//集团数据统计
+export function infoMemberCount(data) {
   return request({
-    url: '/enterprise/statistic',
+    url: '/combine/info/memberCount',
     method: 'post',
     data: data
   })

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

@@ -94,31 +94,29 @@ export default {
         this.sideRoute = JSON.parse(JSON.stringify(this.defaultRoute))
         let arr = JSON.parse(JSON.stringify(val))
         for(var i in arr){
-          for(var j in arr[i]){
-            // switch (j) {
-            //   case 'ownershipStructure':
-            //     if(arr[i][j]<1){
-            //       this.sideRoute[0].disabled = true;
-            //     }
-            //     break;
-            //   case 'qualification':
-            //     if(arr[i][j]<1){
-            //       this.sideRoute[1].disabled = true;
-            //     }
-            //     break;
-            //   case 'performance':
-            //     if(arr[i][j]<1){
-            //       this.sideRoute[2].disabled = true;
-            //     }
-            //     break;
-            //   case 'biddingAnnouncement':
-            //     if(arr[i][j]<1){
-            //       this.sideRoute[3].disabled = true;
-            //     }
-            //     break;
-            //   default:
-            //     break;
-            // }
+          switch (i) {
+            case 'member':
+              if(arr[i]<1){
+                this.sideRoute[0].disabled = true;
+              }
+              break;
+            case 'qualification':
+              if(arr[i]<1){
+                this.sideRoute[1].disabled = true;
+              }
+              break;
+            case 'performance':
+              if(arr[i]<1){
+                this.sideRoute[2].disabled = true;
+              }
+              break;
+            case 'biddingAnnouncement':
+              if(arr[i]<1){
+                this.sideRoute[3].disabled = true;
+              }
+              break;
+            default:
+              break;
           }
         }
         this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute))

dsk-operate-ui/src/views/detail/groupAccount/index.vue

 <template>
   <div class="app-container group-container">
-    <div class="header-container" ref="header">
+    <div class="header-container">
       <div class="flex-box part-header">
-        <img class="header-logo" :src="require('@/assets/images/detail/company_logo.png')">
+        <img class="header-logo" :src="details && details.logoUrl || require('@/assets/images/detail/company_logo.png')">
         {{name || '--'}}
       </div>
     </div>
@@ -30,7 +30,7 @@
   import Performance from "./component/performance"
   import Zhaobiao from "./component/zhaobiao"
   import { infoHeader } from '@/api/detail/party-a/index'
-  import {combineMemberLogo,statistic} from '@/api/detail/groupAccount/groupAccount'
+  import {combineMemberLogo,infoMemberCount} from '@/api/detail/groupAccount/groupAccount'
   import elementResizeDetectorMaker from "element-resize-detector"
   export default {
     name: 'GroupAccount',
@@ -49,6 +49,7 @@
         isCompany: false,
         isSkeleton: false,
         name:'',
+        details:{},
       }
     },
     created() {
@@ -56,9 +57,9 @@
         this.customerId = this.$route.params.id
       }
       combineMemberLogo({combineId: this.customerId}).then(res=>{
-        console.log(res.data)
+        this.details=res.data;
       })
-      statistic({companyId: this.$route.query.cid}).then(res=>{
+      infoMemberCount({combineId: this.customerId}).then(res=>{
         console.log(res.data)
         if(res.code==200){
           this.statisticObj = res.data
@@ -67,13 +68,9 @@
       // if (this.$route.query.path) { // 获取跳转对应板块
       //   this.currentPath.pathName = this.$route.query.path
       // }
-      // this.$route.query.name=''
-      this.name=this.$route.query.name ? this.$route.query.name : '中建集团'
-    },
-    mounted(){
-      // this.mainWidth=this.$refs.header.offsetWidth;
-      // this.width=this.$refs.contentData.offsetWidth -160;
+      this.name=this.$route.query.name ? this.$route.query.name : this.details.companyName
     },
+    mounted(){},
     methods: {
       showPartPage(e){
         this.currentPath = e

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -643,9 +643,9 @@
 		  for (var i in arr) {
 			  if (arr[i].parent) {
 				  if (!arr[i].parent.checked) {
-					  arr[i].hasChildren && cityIds.push(arr[i].value)&&provinceIds.push(arr[i].parent.value);
+					  arr[i].hasChildren && cityIds.push(arr[i].value);
 					  arr[i].hasChildren && this.domicile.push(arr[i].label);
-					  !arr[i].hasChildren && areaIds.push(arr[i].value)&& cityIds.push(arr[i].parent.value)&&provinceIds.push(arr[i].parent.parent.value);
+					  !arr[i].hasChildren && areaIds.push(arr[i].value);
 					  !arr[i].hasChildren && this.domicile.push(arr[i].label);
 				  }
 			  } else {

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

@@ -1386,7 +1386,7 @@ export default {
     handleUrl(item){
       switch (item.name) {
         case '项目管理':
-          if(this.permissions.includes('project:btn')){
+          if(this.permissions.includes('project:info')){
             this.$router.push({ path: item.url })
           }else {
             this.$message({
@@ -1396,7 +1396,7 @@ export default {
           }
           break;
         case '客户管理':
-          if(this.permissions.includes('custom:btn')){
+          if(this.permissions.includes('customer:info')){
             this.$router.push({ path: item.url })
           }else {
             this.$message({
@@ -1406,7 +1406,7 @@ export default {
           }
           break;
         case '全国经济大全':
-          if(this.permissions.includes('nationalEconomies:btn')){
+          if(this.permissions.includes('nationalEconomies:query')){
             this.$router.push({ path: item.url })
           }else {
             this.$message({
@@ -1416,7 +1416,7 @@ export default {
           }
           break;
         case '集团户':
-          if(this.permissions.includes('group:btn')){
+          if(this.permissions.includes('group:query')){
             this.$router.push({ path: item.url })
           }else {
             this.$message({
@@ -1426,7 +1426,7 @@ export default {
           }
           break;
         case '查城投平台':
-          if(this.permissions.includes('owner:btn')){
+          if(this.permissions.includes('owner:query')){
             this.$router.push({ path: item.url })
           }else {
             this.$message({
@@ -1436,7 +1436,7 @@ export default {
           }
           break;
         case '商机雷达':
-          if(this.permissions.includes('radar:btn')){
+          if(this.permissions.includes('radar:query')){
             this.$router.push({ path: item.url })
           }else {
             this.$message({