Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DSubcontractMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsk.cscec.domain.DSubcontract;
+import com.dsk.cscec.domain.vo.DCustomerListVo;
 import com.dsk.cscec.domain.bo.CustomerCooperationBo;
 import com.dsk.cscec.domain.vo.CustomerCooperationVo;
 import org.apache.ibatis.annotations.Param;
@@ -21,7 +22,9 @@ public interface DSubcontractMapper extends BaseMapper<DSubcontract> {
 
     Integer selectProjectCountByCustomerId(String customerId);
 
-    /**
+ 	DCustomerListVo selectStatisticByCustomerId(String customerId);
+
+/**
      * 供应商合作记录
      * @param build
      * @param bo

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

@@ -45,10 +45,11 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
         Page<DCustomerListVo> page = baseMapper.allSearchList(query.build(), bo);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             page.getRecords().parallelStream().forEach(item->{
+                DCustomerListVo vo = subcontractMapper.selectStatisticByCustomerId(item.getCustomerId());
                 //企业合作数量
-                item.setEnterpriseCooperationCount(subcontractMapper.selectEnterpriseCountByCustomerId(item.getCustomerId()));
+                item.setEnterpriseCooperationCount(vo.getEnterpriseCooperationCount());
                 //项目合作数量
-                item.setProjectCooperationCount(subcontractMapper.selectProjectCountByCustomerId(item.getCustomerId()));
+                item.setProjectCooperationCount(vo.getProjectCooperationCount());
                 try {
                     Map<String, Object> map = opportunityRadarService.enterpriseByName(item.getCustomerName());
                     if (!ObjectUtils.isEmpty(map.get("data"))) {
@@ -71,10 +72,11 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
         List<DCustomerListVo> records = baseMapper.allSearchList(query.build(), bo).getRecords();
         if(CollectionUtils.isNotEmpty(records)){
             records.parallelStream().forEach(item->{
+                DCustomerListVo vo = subcontractMapper.selectStatisticByCustomerId(item.getCustomerId());
                 //企业合作数量
-                item.setEnterpriseCooperationCount(subcontractMapper.selectEnterpriseCountByCustomerId(item.getCustomerId()));
+                item.setEnterpriseCooperationCount(vo.getEnterpriseCooperationCount());
                 //项目合作数量
-                item.setProjectCooperationCount(subcontractMapper.selectProjectCountByCustomerId(item.getCustomerId()));
+                item.setProjectCooperationCount(vo.getProjectCooperationCount());
             });
         }
         return records;

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

@@ -17,7 +17,17 @@
         ) a
     </select>
 
-    <select id="selectCooperationList" resultType="com.dsk.cscec.domain.vo.CustomerCooperationVo">
+	<select id="selectStatisticByCustomerId" resultType="com.dsk.cscec.domain.vo.DCustomerListVo">
+        select
+            count(DISTINCT org.customer_id) enterpriseCooperationCount,
+           	count(DISTINCT project.customer_id) projectCooperationCount
+        from d_customer dc
+        left join  d_subcontract org on org.customer_id = dc.customer_id
+        left join  d_subcontract project on project.customer_id = dc.customer_id
+        where dc.customer_id  = #{customerId}
+    </select>
+
+ <select id="selectCooperationList" resultType="com.dsk.cscec.domain.vo.CustomerCooperationVo">
         select ds.subcontract_key,ds.subcontract_id,ds.project_name,ds.sign_org_name,ds.sign_date,ds.subcontract_value,ds.settle_value,ds.job_scope,
             dp.area_name,dp.province_name,dp.city_name,dp.project_manager_name,dp.project_manager_phone,dp.project_type2
         from d_subcontract ds