1.资产提成计算-评估人员-新增预计提成金额查询（未归档项目），以及详情新增字段实收款认领时间

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -791,7 +791,11 @@
         SUM(IF(cd.defined_low_limit_amount < fc.claim_amount,
         fc.claim_amount * (cd.ratio / 100) * (bpd.performance_distribution / 100),
         cd.defined_low_limit_amount * (cd.ratio / 100) * (bpd.performance_distribution / 100)
-        )) AS commissionTotalAmount
+        )) AS allCommissionTotalAmount,
+        SUM(IF(ap.save_file_date IS NOT NULL, (IF(cd.defined_low_limit_amount < fc.claim_amount,
+        fc.claim_amount * (cd.ratio / 100) * (bpd.performance_distribution / 100),
+        cd.defined_low_limit_amount * (cd.ratio / 100) * (bpd.performance_distribution / 100)
+        )), 0)) AS commissionTotalAmount
         FROM
         (
         SELECT
@@ -824,7 +828,7 @@
         )
         INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM
         assets_production
-        WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
+        WHERE deleted = 0) ap ON ap.production_no = pf.production_no
         LEFT JOIN assets a ON a.id = ap.business_id
         INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id, ratio, defined_low_limit_amount FROM
         commission_declare WHERE
@@ -836,15 +840,11 @@
         LEFT JOIN ( SELECT business_id, report_no, member_id, performance_distribution FROM
         business_performance_distribution WHERE deleted = 0
         AND user_type = '评估人员'
-
         ) bpd ON ( bpd.business_id = a.id AND bpd.report_no = ap.production_no)
         LEFT JOIN user u ON u.id = bpd.member_id
 
         GROUP BY
         bpd.member_id
-#                  ,
-#         u.name,
-#         commissionTotalAmount
         having 1=1
         <if test="vo!=null and vo.userName!=null and vo.userName!=''">
             and u.name like concat ('%',#{vo.userName},'%')
@@ -875,7 +875,8 @@
                fc.claim_amount * (cd.ratio / 100),
                cd.defined_low_limit_amount * (cd.ratio / 100)
             ) AS totalAmount,
-            u.name as userName
+            u.name AS userName,
+            pf.modified AS realFundDateTime
         FROM
             (
                 SELECT
@@ -903,8 +904,8 @@
                   AND created  &gt;= #{vo.startDate}
                   AND created &lt;= #{vo.endDate}
             ) fc
-                INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
-                INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
+                INNER JOIN ( SELECT id, order_fund_id, business_id, production_no,modified FROM production_fund WHERE business_type = 'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
+                INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0) ap ON ap.production_no = pf.production_no
                 LEFT JOIN assets a ON a.id = ap.business_id
                 INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id, ratio,defined_low_limit_amount FROM commission_declare WHERE business_type = 'COMMISSION_DECLARE_ASSET_EVALUATE' AND deleted = 0 AND declare_result = '审核通过' ) cd ON (
                 cd.business_id = a.id

domain/src/main/java/com/dayou/vo/UserCommissionProdAssetsVO.java

@@ -1,13 +1,18 @@
 package com.dayou.vo;
 
 import com.dayou.annotation.Excel;
+import com.dayou.annotation.ExportCell;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 @Data
 public class UserCommissionProdAssetsVO extends UserCommissionProdVO{
 
     @Excel(name = "提成下限(元)")
     private BigDecimal lowLimitAmount;
+
+    @Excel(name = "实收款认领时间")
+    private LocalDate realFundDateTime;
 }

domain/src/main/java/com/dayou/vo/UserCommissionTotalAmountVO.java

@@ -24,6 +24,8 @@ public class UserCommissionTotalAmountVO {
 
     @Excel(name="人员")
     private String userName;
+    @Excel(name = "预计提成金额(元)")
+    private BigDecimal allCommissionTotalAmount;
     @Excel(name="提成金额(元)")
     private BigDecimal commissionTotalAmount;
     @Excel(name = "统计时段（开始）")