续年佣金计算-来佣比对检核年月7

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -155,7 +155,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
         AgPoOrderCommission orderCommission = new AgPoOrderCommission();
         orderCommission.setCommissionCheckId(checkBatchId);
         orderCommission.setCommissionStatus(status);
-        orderCommission.setCommissionTime(CommonUtil.dateParseString(new Date(), "yyyy-MM-dd HH:mm:ss"));
+        orderCommission.setCommissionTime(checkBatch);
         orderCommission.setUpdatedBy(Long.valueOf(loginId));
         orderCommission.setUpdatedAt(new Date());
 

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -11,9 +11,9 @@
             IFNULL(a.name,p.name) planName,
             o.policy_no policyNo,
             o.order_price orderPrice,
-            o.commissionRate commissionRate,
-            o.commissionAmount commissionAmount,
-            o.commissionCheckStatus commissionCheckStatus,
+            o.commissionRate,
+            o.commissionAmount,
+            o.commissionCheckStatus,
             o.order_date orderDate,
             o.commission_no commissionNo,
             o.amount ,
@@ -29,10 +29,10 @@
             (case o.config_level when 2 then p2.cName2 else p3.cName3 END) planCategoryName
         from (SELECT o.*,
                     policyNo, commission_no, amount, commission_time, rate, commission_check_id,
-                    IFNULL(commission_year, o.order_date) commissionYear,
-                    IFNULL(commission_status, o.commission_check_status) commissionCheckStatus,
-                    IFNULL(amount, o.commission_amount) commissionAmount,
-                    IFNULL(rate, o.commission_rate) commissionRate,
+                    commission_year commissionYear,
+                    commission_status commissionCheckStatus,
+                    amount commissionAmount,
+                    rate commissionRate,
                     commission_period
                 from
                     (SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status,
@@ -99,7 +99,7 @@
             and f.practitioner_type_id = #{practitionerTypeId}
         </if>
         <if test="commissionCheckStatus != null">
-            and o.commission_check_status = #{commissionCheckStatus}
+            and o.commissionCheckStatus = #{commissionCheckStatus}
         </if>
         <choose>
             <when test="historyDate != null ">
@@ -155,10 +155,10 @@
             IFNULL(sum(o.commissionAmount),0) totalCommission
         from (SELECT o.*,
                     policyNo, commission_no, amount, commission_time, rate, commission_check_id,
-                    IFNULL(commission_year, o.order_date) commissionYear,
-                    IFNULL(commission_status, o.commission_check_status) commissionCheckStatus,
-                    IFNULL(amount, o.commission_amount) commissionAmount,
-                    IFNULL(rate, o.commission_rate) commissionRate,
+                    commission_year commissionYear,
+                    commission_status commissionCheckStatus,
+                    amount commissionAmount,
+                    rate commissionRate,
                     commission_period
                 from
                 (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id,
@@ -201,7 +201,7 @@
             and f.practitioner_type_id = #{practitionerTypeId}
         </if>
         <if test="commissionCheckStatus != null">
-            and o.commission_check_status = #{commissionCheckStatus}
+            and o.commissionCheckStatus = #{commissionCheckStatus}
         </if>
         <choose>
             <when test="historyDate != null ">