1.【平台结算情况】退保单条修改成结算状态后记录中未显示金额，导致记录中进账金额与对接人已收金额不一致

2.【平台明细】组合查询报错，弹两次程序异常

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -314,7 +314,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="settlementDate !=null  and  settlementDate  !=''">
@@ -639,7 +639,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="settlementDate !=null  and  settlementDate  !=''">
@@ -836,7 +836,7 @@
                     a.create_time =#{createTime}
                 </if>
                 <if test="settlementTime !=null  and  settlementTime  !=''">
-                    a.settlement_time =#{settlementTime}
+                    and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
                 </if>
 
                 <if test="userId !=null  and  userId  !=''">
@@ -971,7 +971,7 @@
                    AND a.create_time =#{createTime}
                 </if>
                 <if test="settlementTime !=null  and  settlementTime  !=''">
-                   AND a.settlement_time =#{settlementTime}
+                    and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
                 </if>
 
                 <if test="partnerCompaniesName !=null  and  partnerCompaniesName  !=''">
@@ -1116,7 +1116,7 @@
                    AND a.create_time =#{createTime}
                 </if>
                 <if test="settlementTime !=null  and  settlementTime  !=''">
-                   AND a.settlement_time =#{settlementTime}
+                    and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
                 </if>
 
                 <if test="partnerCompaniesName !=null  and  partnerCompaniesName  !=''">
@@ -1266,7 +1266,7 @@
             </if>
 
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                and  a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="createTimeStart  !=null  and  createTimeStart  != ''  and  createTimeEnd   != null  and  createTimeEnd   !=''">
@@ -1437,7 +1437,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="userId !=null  and  userId  !=''">
@@ -1631,7 +1631,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
             <if test="createTimeQuery != null and createTimeQuery != ''">
                 and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
@@ -1900,7 +1900,7 @@
                        AND  a.create_time =#{createTime}
                    </if>
                    <if test="settlementTime !=null  and  settlementTime  !=''">
-                       AND a.settlement_time =#{settlementTime}
+                       and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
                    </if>
 
                    <if test="userId !=null  and  userId  !=''">
@@ -1974,7 +1974,7 @@
         SELECT
             DATE_FORMAT(a.settlement_time, '%Y-%m-%d %H:%i:%s') as "settlementTime",
             MAX(upf.url) as "imageUrl",
-            sum(a.commission_feevalue + a.other_feevalue) AS "settlementAmount"
+            sum(IFNULL(a.commission_feevalue,0) + IFNULL(a.other_feevalue,0)) AS "settlementAmount"
         FROM
             ins_ply_income a
             LEFT  JOIN  ptl_agreement  pa  on  a.agreement_id  = pa.id
@@ -2151,7 +2151,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="settlementDate !=null  and  settlementDate  !=''">
@@ -2353,7 +2353,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="settlementDate !=null  and  settlementDate  !=''">
@@ -3379,7 +3379,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="userId !=null  and  userId  !=''">