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

dsk-common/src/main/java/com/dsk/common/constant/CacheConstants.java

@@ -51,4 +51,12 @@ public class CacheConstants
      * 查甲方 菜单选线
      */
     public static final String PERSONAL_LOCATION = "personal:location";
+
+    /**
+     * 查甲方 财务数据
+     */
+    public static final String DATA_FINANCIAL = "data:financial";
+
+
+
 }

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

@@ -1220,10 +1220,6 @@
     top: 56px;
     z-index: 9;
   }
-  .el-table__fixed-header-wrapper {
-    z-index: 9;
-  }
-
   .el-table__fixed-header-wrapper{
     position: sticky;
     z-index: 9;

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

@@ -75,10 +75,10 @@
           projectName:'',//	项目名称
           companyId:'',//企业id
           ownerCompany:'',//业主单位
-          projectStage:'',//项目阶段
-          projectType:'',//项目类型
-          projectCategory:'',//项目类别
-          investmentAmount:'',//投资估算
+          projectStage:null,//项目阶段
+          projectType:null,//项目类型
+          projectCategory:null,//项目类别
+          investmentAmount:null,//投资估算
           isPrivate:0,//可见范围(0 仅自己可见，1 他人可见)
         },
         rules:{
@@ -169,10 +169,10 @@
           projectName:'',//	项目名称
           companyId:'',//企业id
           ownerCompany:'',//业主单位
-          projectStage:'',//项目阶段
-          projectType:'',//项目类型
-          projectCategory:'',//项目类别
-          investmentAmount:'',//投资估算
+          projectStage:null,//项目阶段
+          projectType:null,//项目类型
+          projectCategory:null,//项目类别
+          investmentAmount:null,//投资估算
           isPrivate:0,//可见范围(0 仅自己可见，1 他人可见)
         },
         this.showlist = false

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

 <template>
   <div>
     <el-card class="box-card noborder">
-      <div class="cardtitles">基本信息</div>
+      <div class="cardtitles">联系人</div>
 
       <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
       <div class="tables" v-else>

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

@@ -340,7 +340,7 @@
 
       getXMSL(){
         getXMSL(this.id).then(result=> {
-          this.xmjd = result.data.projectStage
+          this.xmjd = !result.data.projectStage?'待添加':result.data.projectStage
           if(result.data.labelList == null || result.data.labelList == "" || result.data.labelList == undefined){
             this.tipslit = []
           }else {

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

@@ -600,6 +600,7 @@ export default {
         font-size: 16px;
         font-weight: 700;
         line-height: 23px;
+        padding-right: 190px;
         .people{
           padding-left: 10px;
           color: #4f4f4f;

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

@@ -12,7 +12,6 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.core.redis.RedisCache;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.EncodeIdUtil;
-import com.dsk.common.utils.StringUtils;
 import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
 import com.dsk.system.service.ICustomerService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -20,6 +19,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -321,7 +321,21 @@ public class EnterpriseService {
         if (body.isValidateCid()) {
             return R.ok();
         }
+        String redisKey = CacheConstants.DATA_FINANCIAL + body.getCid();
+        List cacheMap = redisCache.getCacheList(redisKey);
+        if (ObjectUtil.isNotEmpty(cacheMap)) {
+            return R.ok(cacheMap);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/financialData", BeanUtil.beanToMap(body, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (!code.equals(HttpStatus.OK.value())) {
+            throw new RuntimeException();
+        }
+        Object data = map.get("data");
+        if (ObjectUtil.isNotEmpty(data)) {
+            redisCache.setCacheList(redisKey, (List)data);
+            redisCache.expire(redisKey, 24, TimeUnit.HOURS);
+        }
         return BeanUtil.toBean(map, R.class);
     }
 }

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

@@ -76,8 +76,8 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
     public int deleteBusinessInfoById(Long id);
 
     /**
-     * 批量删除项目详情
-     *
+     * 批量删除项目
+     * 项目关联的其他所有表数据一并删除
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

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

@@ -228,15 +228,17 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     }
 
     /**
-     * 批量删除项目详情
-     *
+     * 批量删除项目
+     * 项目关联的其他所有表数据一并删除
      * @param ids 需要删除的项目详情主键
      * @return 结果
      */
     @Override
     @Transactional
     public int deleteBusinessInfoByIds(Long[] ids) {
+        //删除项目详情，用户关联项目，项目工作代办，项目联系人，项目跟进记录，项目标签，项目相关企业
         return businessInfoMapper.deleteBusinessInfoByIds(ids);
+        //TODO 删除项目上传的文件
     }
 
     /**

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

@@ -15,6 +15,8 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -373,7 +373,15 @@
     </delete>
 
     <delete id="deleteBusinessInfoByIds" parameterType="Long">
-        delete from business_info where id in
+        delete i,b,co,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
+        left join business_user u on u.business_id = i.id
+        where i.id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>