咨询机构管理优化

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java

@@ -7,19 +7,21 @@ import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo;
 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.*;
+import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
+import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
+import com.dsk.cscec.domain.vo.ProjectDetailVo;
+import com.dsk.cscec.domain.vo.ProjectSearchVo;
 import com.dsk.cscec.service.AdvisoryBodyProjectService;
 import com.dsk.cscec.service.AdvisoryBodyService;
 import com.dsk.cscec.service.IDProjectService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
 
 /**
  * 咨询机构管理控制层
@@ -65,17 +67,8 @@ public class AdvisoryBodyManageController extends BaseController {
     /**
      * 根据项目主键查询项目详情
      */
-    @GetMapping("/getProjectDetail/{projectKey}")
-    public R<ProjectDetailVo> getProjectDetail(@NotNull(message = "项目主键不能为空") @PathVariable Long projectKey) {
-        return R.ok(baseService.queryProjectDetail(projectKey));
-    }
-
-    /**
-     * 根据咨询机构ID查询咨询机构详情
-     */
-    @GetMapping("/getAdvisoryBodyDetail/{advisoryBodyId}")
-    public R<AdvisoryBodyDetailVo> getAdvisoryBodyDetail(@NotNull(message = "咨询机构ID不能为空") @PathVariable Long advisoryBodyId) {
-        return R.ok(advisoryBodyService.queryAdvisoryBodyDetail(advisoryBodyId));
+    @GetMapping("/getProjectDetail")
+    public R<ProjectDetailVo> getProjectDetail(ProjectDetailBo projectDetailBo) {
+        return R.ok(baseService.queryProjectDetail(projectDetailBo));
     }
 }
\ No newline at end of file
-

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/ProjectDetailBo.java

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author sxk
+ * @date 2023.12.18
+ * @time 17:43
+ */
+@Data
+public class ProjectDetailBo {
+    /**
+     * 项目主键
+     */
+    @NotNull(message = "项目主键不能为空")
+    private Long projectKey;
+    /**
+     * 咨询机构Cid
+     */
+    @NotNull(message = "咨询机构Cid不能为空")
+    private Long advisoryBodyCid;
+}

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

-package com.dsk.cscec.domain.vo;
-
-import com.dsk.cscec.domain.AdvisoryBody;
-import lombok.Data;
-
-/**
- * @author sxk
- * @date 2023.12.18
- * @time 14:30
- */
-@Data
-public class AdvisoryBodyDetailVo extends AdvisoryBody {
-    /**
-     * 经营状态
-     */
-    private String businessStatus;
-    /**
-     * 法定代表人
-     */
-    private String corporatePerson;
-    /**
-     * 法定代表人联系电话
-     */
-    private String corporatePersonPhone;
-    /**
-     * 注册地址
-     */
-    private String regAddress;
-}

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

@@ -21,4 +21,12 @@ public class ProjectDetailVo extends DProject {
      * 咨询机构
      */
     private AdvisoryBody advisoryBody;
+    /**
+     *  法定代表人
+     */
+    private String corporatePerson;
+    /**
+     * 注册地址
+     */
+    private String regAddress;
 }

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

@@ -5,7 +5,6 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.AdvisoryBody;
 import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo;
-import com.dsk.cscec.domain.vo.AdvisoryBodyDetailVo;
 import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
 
 /**
@@ -23,13 +22,5 @@ public interface AdvisoryBodyService extends IService<AdvisoryBody> {
      * @return 所有数据
      */
     TableDataInfo<AdvisoryBodySearchVo> queryAdvisoryBodyList(AdvisoryBodySearchBo advisoryBodySearchBo, PageQuery pageQuery);
-
-    /**
-     * 根据咨询机构ID查询咨询机构详情
-     *
-     * @param advisoryBodyId 咨询机构ID
-     * @return 咨询机构详情
-     */
-    AdvisoryBodyDetailVo queryAdvisoryBodyDetail(Long advisoryBodyId);
 }
 

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

@@ -5,6 +5,7 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 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.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectDetailVo;
@@ -38,9 +39,9 @@ public interface IDProjectService extends IService<DProject> {
     /**
      * 根据项目主键查询项目详情
      *
-     * @param projectKey 项目主键
+     * @param projectDetailBo 查询实体
      * @return 项目详情
      */
-    ProjectDetailVo queryProjectDetail(Long projectKey);
+    ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo);
 }
 

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

@@ -13,7 +13,6 @@ import com.dsk.common.utils.StringUtils;
 import com.dsk.cscec.domain.AdvisoryBody;
 import com.dsk.cscec.domain.AdvisoryBodyProject;
 import com.dsk.cscec.domain.bo.AdvisoryBodySearchBo;
-import com.dsk.cscec.domain.vo.AdvisoryBodyDetailVo;
 import com.dsk.cscec.domain.vo.AdvisoryBodySearchVo;
 import com.dsk.cscec.mapper.AdvisoryBodyMapper;
 import com.dsk.cscec.mapper.AdvisoryBodyProjectMapper;
@@ -101,27 +100,5 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
         }
         return TableDataInfo.build(page);
     }
-
-    /**
-     * 根据咨询机构ID查询咨询机构详情
-     *
-     * @param advisoryBodyId 咨询机构ID
-     * @return 咨询机构详情
-     */
-    @Override
-    public AdvisoryBodyDetailVo queryAdvisoryBodyDetail(Long advisoryBodyId) {
-        AdvisoryBodyDetailVo advisoryBodyDetailVo = BeanUtil.toBean(baseMapper.selectById(advisoryBodyId), AdvisoryBodyDetailVo.class);
-        EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
-        infoHeaderBody.setCompanyId(Math.toIntExact(advisoryBodyDetailVo.getAdvisoryBodyCid()));
-        Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
-        Map companyData = MapUtils.getMap(companyMap, "data", null);
-        //法人
-        advisoryBodyDetailVo.setCorporatePerson(MapUtils.getString(companyData, "corporatePerson", ""));
-        //TODO:法人电话
-        //advisoryBodyDetailVo.setCorporatePersonPhone(MapUtils.getString(companyData, "corporatePersonPhone", ""));
-        //注册地址
-        advisoryBodyDetailVo.setRegAddress(MapUtils.getString(companyData, "addressDetail", ""));
-        return advisoryBodyDetailVo;
-    }
 }
 

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

@@ -18,6 +18,7 @@ import com.dsk.cscec.domain.AdvisoryBody;
 import com.dsk.cscec.domain.AdvisoryBodyProject;
 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.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectDetailVo;
@@ -26,13 +27,16 @@ import com.dsk.cscec.mapper.AdvisoryBodyMapper;
 import com.dsk.cscec.mapper.AdvisoryBodyProjectMapper;
 import com.dsk.cscec.mapper.DProjectMapper;
 import com.dsk.cscec.service.IDProjectService;
+import com.dsk.jsk.domain.EnterpriseInfoHeaderBody;
 import com.dsk.system.utils.DskOpenApiUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 咨询机构管理
@@ -170,17 +174,26 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
     /**
      * 根据项目主键查询项目详情
      *
-     * @param projectKey 项目主键
+     * @param projectDetailBo 查询实体
      * @return 项目详情
      */
     @Override
-    public ProjectDetailVo queryProjectDetail(Long projectKey) {
+    public ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo) {
         //查询项目明细
         DProject dProject = baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
-                .eq(DProject::getProjectKey, projectKey));
+                .eq(DProject::getProjectKey, projectDetailBo.getProjectKey()));
         ProjectDetailVo projectDetailVo = BeanUtil.toBean(dProject, ProjectDetailVo.class);
         //查询咨询机构信息并填充
-        projectDetailVo.setAdvisoryBody(advisoryBodyMapper.queryAdvisoryBodyByProjectKey(projectKey));
+        projectDetailVo.setAdvisoryBody(advisoryBodyMapper.queryAdvisoryBodyByProjectKey(projectDetailBo.getProjectKey()));
+
+        EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
+        infoHeaderBody.setCompanyId(Math.toIntExact(projectDetailBo.getAdvisoryBodyCid()));
+        Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
+        Map companyData = MapUtils.getMap(companyMap, "data", null);
+        //法人
+        projectDetailVo.setCorporatePerson(MapUtils.getString(companyData, "corporatePerson", ""));
+        //注册地址
+        projectDetailVo.setRegAddress(MapUtils.getString(companyData, "addressDetail", ""));
         return projectDetailVo;
     }
 }