Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/FSupplierLimitedController.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/SupplierLimitedController.java

@@ -21,19 +21,19 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("fSupplierLimited")
-public class FSupplierLimitedController {
+public class SupplierLimitedController {
     /**
      * 服务对象
      */
     @Resource
-    private FSupplierLimitedService fSupplierLimitedService;
+    private FSupplierLimitedService supplierLimitedService;
 
     /**
      * 获取涉诉限用禁用名单
      */
     @GetMapping("/getSupplierLimitedList")
     public TableDataInfo<SupplierLimitedSearchVo> getSupplierLimitedList(SupplierLimitedSearchBo searchBo, PageQuery pageQuery) {
-        return fSupplierLimitedService.querySupplierLimitedList(searchBo, pageQuery);
+        return supplierLimitedService.querySupplierLimitedList(searchBo, pageQuery);
     }
 
     /**
@@ -41,7 +41,7 @@ public class FSupplierLimitedController {
      */
     @GetMapping("/getSupplierUnlimitedList")
     public TableDataInfo<SupplierUnlimitedSearchVo> getSupplierUnlimitedList(SupplierUnlimitedSearchBo searchBo, PageQuery pageQuery) {
-        return fSupplierLimitedService.querySupplierUnlimitedList(searchBo, pageQuery);
+        return supplierLimitedService.querySupplierUnlimitedList(searchBo, pageQuery);
     }
 }
 

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

@@ -83,6 +83,10 @@ public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMap
                 //查不到则抛异常
                 //throw new ServiceException("未查询到该供应商Cid");
             }
+            //关键字标红
+            if (StringUtils.isNotBlank(searchBo.getSupplierName())) {
+                searchVo.setFsuppliername(StringUtils.markInRed(searchVo.getFsuppliername(), searchBo.getSupplierName()));
+            }
         }
         return TableDataInfo.build(page);
     }

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

@@ -77,4 +77,17 @@ public class JskCompanyRelationTableV1DetailPageDto extends BasePage {
      * 成员Id（常合作集团成员详情）
      */
     private Integer memberId;
+
+
+    /**
+     * 集团名称（集团查看详情需传）
+     */
+    private String combineName;
+
+    /**
+     * 成员名称（常合作集团成员详情传
+     */
+    private String memberName;
+
+
 }

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

@@ -72,5 +72,10 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
      */
     private String combineId;
 
+    /**
+     * 集团名称（集团查看详情需传）
+     */
+    private String combineName;
+
 
 }

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

@@ -71,12 +71,19 @@ public class EnterpriseService {
     }
 
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
-        if (body.isVaildCid()) return R.ok();
+        if (body.isVaildCid()) {
+            return R.ok();
+        }
         Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
         Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
-        if (200 != companyCode) return R.ok();
+        if (200 != companyCode) {
+            return R.ok();
+        }
 
         Map companyData = MapUtils.getMap(companyMap, "data", null);
+        if (ObjectUtil.isEmpty(companyData)) {
+            return R.ok();
+        }
         companyData.put("uipId", null);
         companyData.put("claimStatus", 0);
         companyData.put("bratingSubjectLevel", null);
@@ -102,14 +109,20 @@ public class EnterpriseService {
     }
 
     public R statistic(EnterpriseStatisticBody body) throws Exception {
-        if (body.isVaildCid()) return R.ok();
+        if (body.isVaildCid()) {
+            return R.ok();
+        }
         Map<String, Object> statisticMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/statistic", BeanUtil.beanToMap(body, false, false));
 
         Integer statisticMapCode = MapUtils.getInteger(statisticMap, "code", 300);
-        if (200 != statisticMapCode) throw new RuntimeException();
+        if (200 != statisticMapCode) {
+            return R.ok();
+        }
 
         Map statisticMapData = MapUtils.getMap(statisticMap, "data", null);
-        if (MapUtils.isEmpty(statisticMapData)) return R.ok();
+        if (MapUtils.isEmpty(statisticMapData)) {
+            return R.ok();
+        }
 
         //内部合作
         Map<String,Object> cooperation = iCustomerInfoService.cooperationStatistic(body.getCompanyName());
@@ -122,7 +135,9 @@ public class EnterpriseService {
         paramMap.put("cid", body.getCompanyId());
         Map<String, Object> projectStatisticMap = dskOpenApiUtil.requestBody("/operate/enterpriseProject/statistic", paramMap);
         Integer projectStatisticMapCode = MapUtils.getInteger(projectStatisticMap, "code", 300);
-        if (200 != projectStatisticMapCode) return R.ok(statisticMapData);
+        if (200 != projectStatisticMapCode) {
+            return R.ok(statisticMapData);
+        }
 
         Map projectStatisticMapData = MapUtils.getMap(projectStatisticMap, "data", null);
 

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

 import { Message } from "element-ui";
 import { parseTime } from './ruoyi';
+import { router } from "@/router";
 
 /**
  * 表格时间格式化
@@ -924,5 +925,10 @@ export const detailSideBar = new Map([
   ["cooperationList", "cooperationRecord"],
   // 内部合作 准入情况
   ["approveInfo", "accessCondition"],
-])
+]);
+
+
+export const tableContainerFixed = (scrollBarContainer = "",) => {
+
+}
 

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/detailsOfCooperation.vue

@@ -56,7 +56,7 @@
           v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
           <!-- 项目列表 -->
           <template slot="projectName" slot-scope="{data,row}">
-            <div v-if="row.projectName" class="no-line-feed">{{row.projectName}}</div>
+            <div v-if="row.projectName" class="no-line-feed" v-html="row.projectName"></div>
             <span v-else>-</span>
           </template>
           <template slot="projectLeader" slot-scope="{data,row}">

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue

@@ -25,7 +25,7 @@
               <el-button type="primary" @click="editProjectDetail">编辑信息</el-button>
             </div>
             <div class="save-project-detail-container" v-if="currentList === 'consultingAgency' && isModify" :key="'save-project'">
-              <el-button type="primary" @click="editProjectDetail">保存</el-button>
+              <el-button type="primary" @click="saveProjectDetail">保存</el-button>
               <el-button @click="cancelSave">取消</el-button>
             </div>
           </transition>
@@ -92,19 +92,19 @@ export default {
   methods: {
     async init() {
       try {
-        const advisoryBodyCid = this.$route.params?.advisoryBodyCid;
+        const advisoryBodyCid = this.$route.query?.advisoryBodyCid;
         const projectKey = this.$route.query?.projectKey;
-        if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID");
+        // if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID");
         if (!projectKey) return this.$message.error("缺少项目主键");
         const detail = await getgetConsultingOrgProjectDetailApi({
           advisoryBodyCid,
           projectKey
         });
         if (detail.code == 200 && detail.data) {
-          this.projectDetailInfo = { ...this.pprojectDetailInfo, ...detail.data };
+          this.projectDetailInfo = { ...this.projectDetailInfo, ...detail.data };
         }
       } catch (error) {
-
+        console.log(error);
       }
     },
     editProjectDetail() {

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -337,8 +337,8 @@ export default {
     },
     // 查看项目详情
     viewProjectDetail(row) {
-      if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
-      this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail/${row.advisoryBody?.advisoryBodyCid}?projectKey=${row.projectKey}`);
+      // if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
+      this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail?advisoryBodyCid=${row.advisoryBody?.advisoryBodyCid ? row.advisoryBody?.advisoryBodyCid : ""}&projectKey=${row.projectKey}`);
     },
     // 跳转到企业详情
     viewEnterprise(row) {