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

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientProjectPageBody.java

@@ -57,5 +57,10 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
      */
     private Double amountEnd;
 
+    /*
+     * 排序字段：1金额倒序，2金额正序，3时间倒序，4时间正序，5次数倒序，6次数正序
+     */
+    private Integer sort = 3;
+
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierProjectPageBody.java

@@ -57,4 +57,10 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
      * 金额止
      */
     private Double amountEnd;
+
+    /*
+     * 排序字段：1金额倒序，2金额正序，3时间倒序，4时间正序，5次数倒序，6次数正序
+     */
+    private Integer sort = 3;
+
 }

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

@@ -391,14 +391,14 @@
 
     <select id="selectAmountAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
         select
-            bi.amount_source,count(bi.id) businessCount,sum(bi.investment_amount) totalAmount
+            bi.amount_source,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
         <include refid="businessSearchSql"/>
         group by bi.amount_source
     </select>
 
     <select id="selectTypeAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
         select
-        bi.project_type,count(bi.id) businessCount,sum(bi.investment_amount) totalAmount
+            bi.project_type,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
         <include refid="businessSearchSql"/>
         group by bi.project_type
     </select>

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

@@ -112,7 +112,7 @@
     <select id="selectCooperationTop" resultType="com.dsk.system.domain.customer.vo.CustomerAnalyzeVo">
         select
             ct.customer_id, ct.company_name, ct.company_id, ct.uip_id, count(bi.id) businessCount,
-            sum(bi.investment_amount) totalAmount
+            ROUND(sum(bi.investment_amount), 4) totalAmount
         from customer ct
         join customer_user ctu on ct.customer_id = ctu.customer_id
         left join business_info bi on (bi.customer_id = ct.customer_id and bi.status = 2)