发佣检核25-发佣检核根据保单号查询不显示手工数据

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -142,6 +142,7 @@
         <if test="item.payoutYearmonth != null">
             and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
         </if>
+     <if test="item.policyNo == null">
           UNION ALL
         SELECT '' orderId,t.id fortuneId,'' commissionPayoutYearmonth,'' insurerName,'' productName,
            '' policyNo,
@@ -151,7 +152,7 @@
             pra.name practitionerName,
             dept.name insurerBranchDeptName,
             sub.name subordinateSystemName,
-<!-- 	    t.practitioner_level practitionerLevel, -->
+    <!-- 	    t.practitioner_level practitionerLevel, -->
             op1.drop_option_name practitionerLevel,
             t.commission_amount commissionAmount,
             t.commission_type commissionType,
@@ -195,15 +196,16 @@
             <if test="item.commissionPayoutStatus != null">
                 and t.status = #{item.commissionPayoutStatus,jdbcType=BIGINT}
             </if>
-<!--         <if test="item.commissionPayoutYearmonth != null"> -->
-<!--             and c.check_yearmonth = #{item.commissionPayoutYearmonth,jdbcType=VARCHAR} -->
-<!--         </if> -->
+    <!--         <if test="item.commissionPayoutYearmonth != null"> -->
+    <!--             and c.check_yearmonth = #{item.commissionPayoutYearmonth,jdbcType=VARCHAR} -->
+    <!--         </if> -->
             <if test="item.predictMonthPeriod != null">
                 and DATE_FORMAT(t.predict_month_period, '%Y-%m') = #{item.predictMonthPeriod,jdbcType=VARCHAR}
             </if>
             <if test="item.payoutYearmonth != null">
                 and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
             </if>
+     </if>
     </select>
 
     <select id="fortunePayToOrder"  resultType="com.yd.dal.entity.agms.fortune.FortunePayToOrderInfo">
@@ -354,11 +356,11 @@
             i.name insurerName,
             p.name productName,
             pp.name planName,
-            o.effective_start_date effectiveStartDate,
+            if(o.effective_start_date is not null,left(o.effective_start_date,10),o.effective_start_date) effectiveStartDate,
             o.policy_no policyNo,
-            f.order_price orderPrice,
-            f.fyc_amount fycAmount,
-            f.grade_commission_rate gradeCommissionRate,
+            if(f.order_price is null,0,f.order_price) orderPrice,
+            if(f.fyc_amount is null,0,f.fyc_amount) fycAmount,
+            if(f.grade_commission_rate is null,0,f.grade_commission_rate) gradeCommissionRate,
             (select s.name from ag_acl_practitioner_subordinate_system s where s.id = pra.subordinate_system_id) subordinateSystemName,
             pra.name practitionerName,
             if(f.commission_rate is null,0,f.commission_rate) commissionRate,
@@ -367,7 +369,7 @@
             f.drop_option_code dropOptionCode,
             f.remark remark,
             f.commission_type commissionType,
-            f.referral_amount  referralAmount,
+            if(f.referral_amount is null,0,f.referral_amount)  referralAmount,
             f.calculation_formula calculationFormula,
             f.withdrawed_id   withdrawId
         from ag_acl_customer_fortune f