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/domain/vo/ProjectDetailVo.java

@@ -32,6 +32,10 @@ public class ProjectDetailVo {
      */
     private AdvisoryBodyProject advisoryBodyProject;
 
+    /**
+     * 项目名称
+     */
+    private String projectName;
     //工程基本信息-项目主体
     /**
      * 业主名称(业主单位)

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/ProjectSearchVo.java

@@ -67,7 +67,10 @@ public class ProjectSearchVo {
      * 合同金额
      */
     private BigDecimal contractOrigValue;
-
+    /**
+     * 业主单位Cid
+     */
+    private Long ownerUnitCid;
     /**
      * 业主单位
      */

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.cscec.constant.AdvisoryBodyManageQueryConstants;
 import com.dsk.cscec.domain.AdvisoryBody;
@@ -19,6 +20,7 @@ import com.dsk.cscec.domain.DProject;
 import com.dsk.cscec.domain.bo.CooperateProjectDetailSearchBo;
 import com.dsk.cscec.domain.bo.ProjectDetailBo;
 import com.dsk.cscec.domain.bo.ProjectSearchBo;
+import com.dsk.cscec.domain.vo.AdvisoryBodyExistVo;
 import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectDetailVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
@@ -33,10 +35,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 咨询机构管理
@@ -121,6 +120,23 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
             if (StringUtils.isNotBlank(projectSearchBo.getProjectName())) {
                 projectSearchVo.setProjectName(StringUtils.markInRed(projectSearchVo.getProjectName(), projectSearchBo.getProjectName()));
             }
+
+            //查询业主单位Cid
+            String ownerName = projectSearchVo.getOwnerName();
+            Map<String, Object> params = new HashMap<>();
+            params.put("keyword", ownerName);
+            Map jskData = MapUtils.getMap(dskOpenApiUtil.requestBody("/nationzj/enterprice/index", params), "data", null);
+            //防止没有数据而导致强转错误,所以先判断下total
+            if (MapUtils.getInteger(jskData, "total", 0) > 0) {
+                List<Map<String, Object>> data = (List<Map<String, Object>>) jskData.get("list");
+                for (Map<String, Object> companyData : data) {
+                    //企业名称完全匹配上,则直接返回给前端
+                    if (ownerName.equals(StringUtils.removeRed(MapUtils.getString(companyData, "name", "NotExist")))) {
+                        //jskEid就是cid
+                        projectSearchVo.setOwnerUnitCid(MapUtils.getLong(companyData, "jskEid"));
+                    }
+                }
+            }
         }
         return TableDataInfo.build(page);
     }

dsk-operate-ui/src/assets/json/certs.json

@@ -613,12 +613,6 @@
                                 "id": 431,
                                 "type": 6,
                                 "parentId": 303
-                            },
-                            {
-                                "name": "工程设计农林行业（林业工程）",
-                                "id": 433,
-                                "type": 6,
-                                "parentId": 303
                             }
                         ],
                         "parentId": 231

dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue

@@ -4,7 +4,7 @@
             <div class="content_item content_item_padding0">
                 <div class="label">企业名称</div>
                 <div class="content_right item_ckquery_list">
-                <el-input class="ename_input" clearable placeholder="多个企业用空格隔开" v-model="keyword" >
+                <el-input class="ename_input" clearable placeholder="输入企业名称，多个企业用空格隔开" v-model="keyword" >
                     <div slot="append" class="btn-search" @click="search(1)">搜索</div>
                 </el-input>
                 </div>
@@ -13,7 +13,7 @@
                 <div class="label label1" >资质条件</div>
                 <div class="content_right content_item_ckquery">
                 <div class="item_ckquery_list" v-for="(item,i) in aptitudeDtoList" :key="i" :class="i>0?'item_ckquery_distance':''">
-                    <el-cascader :options="optionss" separator='丨' clearable :ref="i" class="content_item_list" v-model="item.codeStr" @change='optionsbtn(i)'
+                    <el-cascader placeholder="输入关键字快速查找，如建筑业企业资质" :options="optionss" separator='丨' clearable :ref="i" class="content_item_list" v-model="item.codeStr" @change='optionsbtn(i)'
                     filterable :props="{
                                             checkStrictly:true,
                                             label:'name',