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-admin/src/main/resources/application.yml

@@ -148,6 +148,7 @@ security:
     - /monitor/push/insert/**
 
 
+
 # 多租户配置
 tenant:
   # 是否开启
@@ -209,6 +210,7 @@ tenant:
     - labor_leader_customer_risk
     - f_supplier_limited_relieve
     - d_customer_class
+    - d_contract
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

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

@@ -42,7 +42,7 @@ public class AdvisoryBodyManageController extends BaseController {
      */
     @GetMapping("/getProjectList")
     public TableDataInfo<ProjectSearchVo> getProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
-        //return projectService.queryProjectList(projectSearchBo, pageQuery);
+//        return projectService.queryProjectList(projectSearchBo, pageQuery);
         return contractService.queryProjectList(projectSearchBo, pageQuery);
     }
 

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

@@ -59,7 +59,7 @@ public class CustomerInfoController extends BaseController {
      * 内部合作-咨询机构合作记录
      */
     @GetMapping("/advisoryList")
-    public TableDataInfo<AdvisoryBodyVo> advisoryList(@Validated AdvisoryBodyBo bo, PageQuery query) {
+    public TableDataInfo<AdvisoryBodyVo> advisoryList(@RequestBody AdvisoryBodyBo bo, PageQuery query) {
         return iCustomerInfoService.queryAdvisoryList(bo, query);
     }
 
@@ -67,7 +67,7 @@ public class CustomerInfoController extends BaseController {
      * 内部合作-咨询机构合作记录导出
      */
     @GetMapping("/advisoryExport")
-    public void advisoryExport(@Validated AdvisoryBodyBo bo, PageQuery query, HttpServletResponse response) {
+    public void advisoryExport(@RequestBody AdvisoryBodyBo bo, PageQuery query, HttpServletResponse response) {
         List<AdvisoryBodyVo> listVo = iCustomerInfoService.queryAdvisoryList(bo, query).getRows();
         ExcelUtil.exportExcel(listVo, "咨询机构合作记录", AdvisoryBodyVo.class, response);
     }

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

@@ -28,40 +28,82 @@ public class AdvisoryBodyVo {
     @ExcelProperty(value = "项目名称", index = 0)
     private String projectName;
 
+
+    /**
+     * 业主单位
+     */
+    @ExcelProperty(value = "发包人名称", index = 1)
+    private String ownerName;
+
+    /**
+     * 项目经理及联系方式
+     */
+    @ExcelProperty(value = "项目经理及联系方式", index = 2)
+    private String projectManagerAndPhone;
+    /**
+     * 商务经理及联系方式
+     */
+    @ExcelProperty(value = "商务经理及联系方式", index = 3)
+    private String businessManagerAndPhone;
+
+    /**
+     * 招标代理机构名称
+     */
+    @ExcelProperty(value = "招标代理机构名称", index = 4)
+    private String bidAgencyUnit;
+
+
+    /**
+     * 一审单位
+     */
+    @ExcelProperty(value = "一审单位", index = 5)
+    private String firstAuditUnit;
+
+
+    /**
+     * 二审单位
+     */
+    @ExcelProperty(value = "二审单位", index = 6)
+    private String secondAuditUnit;
+
+
+    /**
+     * 三审单位
+     */
+    @ExcelProperty(value = "三审单位", index = 7)
+    private String thirdAuditUnit;
+
+
+
+
     /**
      * 项目编码
      */
-    @ExcelProperty(value = "项目编码", index = 1)
     private String projectCode;
 
     /**
      * 省
      */
-    @ExcelProperty(value = "省", index = 2)
     private String provinceName;
 
     /**
      * 市
      */
-    @ExcelProperty(value = "市", index = 3)
     private String cityName;
 
     /**
      * 项目承接类型
      */
-    @ExcelProperty(value = "项目承接类型", index = 4)
     private String isinvestproject;
 
     /**
      * 工程基础大类
      */
-    @ExcelProperty(value = "工程基础大类", index = 5)
     private String projectType1;
 
     /**
      * 工程类别明细
      */
-    @ExcelProperty(value = "工程类别明细", index = 6)
     private String projectType2;
 
     /**
@@ -81,32 +123,24 @@ public class AdvisoryBodyVo {
     /**
      * 项目负责人
      */
-    @ExcelProperty(value = "项目负责人姓名", index = 7)
     private String projectLeader;
     /**
      * 项目负责人专业
      */
-    @ExcelProperty(value = "项目负责人专业", index = 8)
     private String projectLeaderMajor;
     /**
      * 项目负责人联系电话
      */
-    @ExcelProperty(value = "项目负责人联系电话", index = 9)
     private String projectLeaderPhone;
     /**
      * 合同金额
      */
-    @ExcelProperty(value = "合同金额", index = 10)
     private BigDecimal contractValue;
     /**
      * 业主单位cid
      */
     private Integer ownerCid;
-    /**
-     * 业主单位
-     */
-    @ExcelProperty(value = "业主单位", index = 11)
-    private String ownerName;
+
     /**
      * 项目承接单位cid
      */
@@ -114,12 +148,10 @@ public class AdvisoryBodyVo {
     /**
      * 项目承接单位
      */
-    @ExcelProperty(value = "项目承接单位", index = 12)
     private String contractOrgName;
 
     /**
      * 创建时间/合同生效(盖章)日期
      */
-    @ExcelProperty(value = "创建时间", index = 13)
     private Date contractSignDate;
 }

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

@@ -103,4 +103,9 @@ public class ProjectSearchVo {
      * 三审单位
      */
     private String thirdAuditUnit;
+
+    /**
+     * 业主单位企业id
+     */
+    private Integer ownerUnitCid;
 }

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

@@ -34,6 +34,7 @@ import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,12 +59,16 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
 
     @Override
     public TableDataInfo<CustomerInfoVo> queryPageList(CustomerInfoBo bo, PageQuery query) {
+        List<String> customerStateList = Arrays.asList("合格");
         if ("劳务分包".equals(bo.getCustomerClass())) {
+            bo.setCustomerClass("劳务分包");
             bo.setServiceTeamLogo("N");
+            bo.setCustomerState(customerStateList);
         }
         if ("劳务分包队伍".equals(bo.getCustomerClass())) {
             bo.setCustomerClass("劳务分包");
             bo.setServiceTeamLogo("Y");
+            bo.setCustomerState(customerStateList);
         }
         Page<CustomerInfoVo> page = baseMapper.queryListByType(query.build(), bo);
         AtomicInteger sortNum = new AtomicInteger(1);
@@ -194,6 +199,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
         return vo;
     }
 
+    //可能要切表  使用合作项目查询的接口下载excel那里也是
     @Override
     public TableDataInfo<AdvisoryBodyVo> queryAdvisoryList(AdvisoryBodyBo bo, PageQuery query) {
         bo.setContractOrgId(AdvisoryBodyManageQueryConstants.LEVEL1_COMPANY_ID);

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

 package com.dsk.cscec.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.PageQuery;
@@ -10,9 +13,11 @@ import com.dsk.cscec.domain.vo.ProjectSearchVo;
 import com.dsk.cscec.mapper.AdvisoryBodyCustomFormDataMapper;
 import com.dsk.cscec.mapper.DContractMapper;
 import com.dsk.cscec.service.DContractService;
+import com.dsk.search.service.BusinessOpportunityRadarService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * 合同维表(DContract)表服务实现类
@@ -26,6 +31,8 @@ public class DContractServiceImpl extends ServiceImpl<DContractMapper, DContract
     private DContractMapper baseMapper;
     @Resource
     private AdvisoryBodyCustomFormDataMapper formDataMapper;
+    @Resource
+    private BusinessOpportunityRadarService opportunityRadarService;
 
     /**
      * 获取所有项目列表数据
@@ -37,6 +44,16 @@ public class DContractServiceImpl extends ServiceImpl<DContractMapper, DContract
     @Override
     public TableDataInfo<ProjectSearchVo> queryProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
         Page<ProjectSearchVo> page = baseMapper.selectPageProjectList(pageQuery.build(), projectSearchBo);
+        page.getRecords().stream().forEach(dto ->{
+            Map<String, Object> map = opportunityRadarService.enterpriseByName(dto.getOwnerName());
+            if (!ObjectUtils.isEmpty(map.get("data"))) {
+                Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+                Integer companyId = MapUtil.getInt(data, "jskEid");
+                dto.setOwnerUnitCid(companyId);
+            }
+        });
+
+
         return TableDataInfo.build(page);
     }
 }

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

@@ -77,7 +77,7 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
         //List<Long> projectKeys = null;
         //if (StringUtils.isNotBlank(advisoryBodyName)) {
         //    //根据咨询机构名称查询咨询机构Cids
-        //    List<Long> advisoryBodyCids = advisoryBodyMapper.selectAdvisoryBodyCidsByName(advisoryBodyName);
+//            List<Long> advisoryBodyCids = advisoryBodyMapper.selectAdvisoryBodyCidsByName(advisoryBodyName);
         //    if (advisoryBodyCids.isEmpty()) {
         //        return TableDataInfo.build();
         //    }
@@ -245,7 +245,7 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
     @Override
     public ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo) {
         Long advisoryBodyCid = projectDetailBo.getAdvisoryBodyCid();
-        //查询项目明细
+        //查询项目明细  这里要从d_project表切换到
         DProject dProject = baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
                 .eq(DProject::getProjectKey, projectDetailBo.getProjectKey()));
         ProjectDetailVo projectDetailVo = BeanUtil.toBean(dProject, ProjectDetailVo.class);

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyMapper.xml

@@ -10,11 +10,31 @@
     </select>
 
     <select id="queryListByBo" resultType="com.dsk.cscec.domain.vo.AdvisoryBodyVo">
-        select abp.advisory_body_id,abp.advisory_body_cid,abp.project_key,abp.project_leader,abp.project_leader_major,
+        select
+        dp.project_name,
+        dp.owner_name,
+        abp.project_manager_and_phone,
+        abp.business_manager_and_phone,
+        abp.bid_agency_unit,
+        abp.first_audit_unit,
+        abp.second_audit_unit,
+        abp.third_audit_unit,
+        abp.advisory_body_id,
+        abp.advisory_body_cid,
+        abp.project_key,
+        abp.project_leader,
+        abp.project_leader_major,
         abp.project_leader_phone,
         ab.advisory_body_name,
-        dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1,
-        dp.project_type2,dp.contract_value,dp.owner_name,dp.contract_org_name,dp.contract_sign_date
+        dp.project_code,
+        dp.province_name,
+        dp.city_name,
+        dp.isinvestproject,
+        dp.project_type1,
+        dp.project_type2,
+        dp.contract_value,
+        dp.contract_org_name,
+        dp.contract_sign_date
         from advisory_body_project abp
         left join advisory_body ab on ab.advisory_body_cid = abp.advisory_body_cid
         left join d_project dp on dp.project_key = abp.project_key