Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -93,8 +93,11 @@ public class EnterpriseBussinessService {
                     dataMap.put("sourceList", enterpriseBussinessVoList);
                     if (ObjectUtil.isNotEmpty(body.getSources())) {
                         for (EnterpriseBussinessVo bussinessVo : enterpriseBussinessVoList) {
+                            String source_id = bussinessVo.getSource_id();
                             String source_type = bussinessVo.getSource_type();
                             if (body.getSources().contains(source_type)) {
+                                dataMap.put("sourceId", source_id);
+                                dataMap.put("sourceType", source_type);
                                 enterpriseSource.add(bussinessVo);
                             }
                         }
@@ -194,6 +197,8 @@ public class EnterpriseBussinessService {
                         for (EnterpriseBussinessVo bussinessVo : enterpriseBussinessVoList) {
                             String source_type = bussinessVo.getSource_type();
                             if (body.getSources().contains(source_type)) {
+                                dataMap.put("sourceId", bussinessVo.getSource_id());
+                                dataMap.put("sourceType", bussinessVo.getSource_type());
                                 enterpriseSource.add(bussinessVo);
                             }
                         }

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -391,14 +391,17 @@
     <select id="selectAmountAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
         select
             bi.amount_source,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
-        <include refid="businessSearchSql"/>
+            <include refid="businessSearchSql"/>
+        and bi.amount_source is not null
         group by bi.amount_source
+        having businessCount > 0
     </select>
 
     <select id="selectTypeAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
         select
             bi.project_type,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
         <include refid="businessSearchSql"/>
+        and bi.project_type is not null
         group by bi.project_type
         <if test="status != null and status == 0 "> order by businessCount desc </if>
         <if test="status != null and status == 2 "> order by totalAmount desc </if>
@@ -408,6 +411,7 @@
         select
             bi.project_category,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
         <include refid="businessSearchSql"/>
+        and bi.project_category is not null
         group by bi.project_category
         <if test="status != null and status == 0 "> order by businessCount desc </if>
         <if test="status != null and status == 2 "> order by totalAmount desc </if>

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -118,6 +118,7 @@
         left join business_info bi on (bi.customer_id = ct.customer_id and bi.status = 2)
         where ctu.status = 0 and ctu.user_id = #{userId}
         group by ct.customer_id
+        having businessCount > 0
         order by totalAmount desc
         limit 10
     </select>