咨询机构管理:项目列表数据新增业主单位Cid、项目详情新增项目名称

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);
     }