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

dsk-common/src/main/java/com/dsk/common/dtos/SpecialPurposeBondsDto.java

@@ -41,4 +41,9 @@ public class SpecialPurposeBondsDto {
      * 排序 (降序desc 升序asc)
      */
     private String order;
+    /**
+     * 是否为历史（1是，0否）
+     */
+    private Integer isHistory;
+
 }

dsk-common/src/main/java/com/dsk/common/dtos/SpecialPurposeBondsPageDto.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * @ClassName SpecialPurposeBonds
- * @Description 专项债-项目类别统计
+ * @Description 专项债-项目分页列表
  * @Author Dgm
  * @Date 2023/5/23 14:05
  * @Version
@@ -16,4 +16,18 @@ public class SpecialPurposeBondsPageDto extends BasePage {
      * 省Id
      */
     private Integer provinceId;
+
+    /**
+     * 排序字段 默认-投资金额
+     */
+    private String field;
+    /**
+     * 排序 (降序desc 升序asc)
+     */
+    private String order;
+    /**
+     * 是否为历史（1是，0否）
+     */
+    private Integer isHistory;
+
 }

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

@@ -1130,3 +1130,30 @@
   padding-top: 14px;
   padding-bottom: 18px;
 }
+
+.tables{
+  ::-webkit-scrollbar-track-piece {
+    //滚动条凹槽的颜色，还可以设置边框属性
+    background-color: #F3F4F5;
+    height: 16px;
+    padding: 0 4px;
+  }
+  //滚动条的宽度
+  ::-webkit-scrollbar {
+    width: 8px;
+    height: 16px;
+    background-color: #F3F4F5;
+    border-radius: 6px;
+  }
+  //滚动条的滑块
+  ::-webkit-scrollbar-thumb {
+    border-radius: 8px;
+    height: 8px;
+    margin: 0 4px;
+    background: rgba(98,110,126,0.2);
+    border: 4px solid #F3F4F5;
+    &:hover{
+      background: #566380;
+    }
+  }
+}

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

@@ -54,12 +54,12 @@
                 label="名称">
               </el-table-column>
               <el-table-column
-                prop="name"
-                label="数量（家）">
+                prop="sum"
+                label="数量（家）" align="right">
               </el-table-column>
               <el-table-column
                 prop="point"
-                label="占比">
+                label="占比" align="right">
               </el-table-column>
             </el-table>
           </div>
@@ -333,6 +333,12 @@ export default {
           axisTick: {
             show: false
           },
+          boundaryGap: false,
+          nameLocation:'end',
+          nameTextStyle: {
+            fontSize:12,
+            padding: [0, 0, 0, -30]
+          },
         },
         yAxis: {
           type: 'value',

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

@@ -317,6 +317,7 @@ export default {
       //客户跟进动态
       this.option = {
         xAxis: {
+          boundaryGap: false,
           type: 'category',
           data: labels,
           axisTick: {
@@ -334,7 +335,7 @@ export default {
         },
         grid:{
           left:'4%',
-          top:'20%',
+          top:'21%',
           right:'2%',
           bottom:'15%',
         },
@@ -345,8 +346,8 @@ export default {
           // trigger: 'axis'
         },
         legend: {
-          left: '12px',
-          top:"15px",
+          right: '20px',
+          top:"30px",
           data: ['成交金额', '储备项目', '跟进动态'],
           itemHeight: 8, // 修改icon图形大小
           itemGap: 20

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

@@ -122,7 +122,14 @@
       onSuccess(res, file, fileList) {
         if (res.code == 200) {
           this.successCount = res.successCount
+
+          if(this.importtype == 'project'){//项目管理
             this.messages = res.msg
+          }
+          if(this.importtype == 'custom'){//客户管理
+            let str = '成功导入客户条数'+res.successCount+',客户去重条数'+res.data?res.data.length:0
+            this.messages = str
+          }
           this.addsuccess = true
         }else {
           this.importCancel()

dsk-system/src/main/java/com/dsk/system/domain/BusinessListDto.java

@@ -22,9 +22,9 @@ public class BusinessListDto {
     private Integer userId;
 
     /**
-     * 部门id
+     * 用户查看全部他人可见项目标示
      */
-    private Integer deptId;
+    private Integer others;
 
     /**
      * 省id

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

 package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
@@ -12,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -52,6 +54,30 @@ public class EnterpriseBussinessService {
 
     public R tenderDetail(EnterpriseBussinessTenderDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderDetail", BeanUtil.beanToMap(body, false, false));
+        Map data = MapUtils.getMap(map, "data", null);
+        String mongoContentId = MapUtils.getString(data, "mongoContentId");
+        if (ObjectUtil.isEmpty(mongoContentId)) {
+            return BeanUtil.toBean(map, R.class);
+        }
+
+        HashMap<String, Object> contentParam = new HashMap<>();
+        contentParam.put("data_type", "kaibiao");
+        contentParam.put("filter_type", 2);
+        contentParam.put("strategy_id", mongoContentId);
+        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
+
+        Map contentData = MapUtils.getMap(contentMap, "data", null);
+        log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
+
+        if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
+            return BeanUtil.toBean(map, R.class);
+        }
+
+        String htmlContent = MapUtils.getString(contentData, "htmlContent");
+
+        data.put("content", htmlContent);
+        map.put("data", data);
+
         return BeanUtil.toBean(map, R.class);
     }
 

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

@@ -2,6 +2,7 @@ package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
@@ -124,9 +125,10 @@ public class EnterpriseProjectService {
         contentParam.put("data_type", "bid_plan");
         contentParam.put("filter_type", 2);
         contentParam.put("strategy_id", contentId);
-        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", BeanUtil.beanToMap(contentParam, false, false));
+        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
 
         Map contentData = MapUtils.getMap(contentMap, "data", null);
+        log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
 
         if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
             return BeanUtil.toBean(map, R.class);
@@ -134,7 +136,8 @@ public class EnterpriseProjectService {
 
         String htmlContent = MapUtils.getString(contentData, "htmlContent");
 
-        map.put("content", htmlContent);
+        data.put("content", htmlContent);
+        map.put("data", data);
 
         return BeanUtil.toBean(map, R.class);
     }

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

@@ -32,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -80,13 +81,21 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      */
     @Override
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
-        //userId不传值，就查询全部门项目
-//        if (dto.getUserId() == null) {
-//            Long deptId = SecurityUtils.getLoginUser().getDeptId();
-//            if (deptId == null) throw new BaseException("请登录");
-//            dto.setDeptId(deptId.intValue());
-//        }
-        return businessInfoMapper.selectBusinessInfoList(dto);
+        List<BusinessListVo> othersList = new ArrayList<>();
+        //userId不传值，就查询全部他人可见项目+自己的
+        if (dto.getUserId() == null) {
+            Long userId = SecurityUtils.getLoginUser().getUserId();
+            if (userId == null) throw new BaseException("请登录");
+            dto.setOthers(userId.intValue());
+            //查询他人可见项目
+            othersList = businessInfoMapper.selectBusinessInfoList(dto);
+
+        }
+        dto.setOthers(null);
+        //查询自己参与的项目
+        List<BusinessListVo> businessList = businessInfoMapper.selectBusinessInfoList(dto);
+        businessList.addAll(othersList);
+        return businessList;
     }
 
     @Override

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

@@ -131,8 +131,8 @@
             <if test="userId != null">
                 and bu.user_id = #{userId}
             </if>
-            <if test="userId == null">
-                 and i.is_private = 1
+            <if test="others != null">
+                 and bu.user_id != #{others} and i.is_private = 1
             </if>
 
             <if test="provinceId != null and provinceId.size > 0 and cityId == null and districtId == null">