zhangyuewww 2 éve
szülő
commit
aa14975555

+ 4 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -119,8 +119,10 @@
         case when a.type ='干粮' then  q.dry_grain_price else q.tidal_grain_price end as tidalGrainPrice,
         case when a.type ='干粮' then  q.dry_grain_price else q.tidal_grain_price end as tidalGrainPrice,
         a.solid_grain_price as solidGrainPrice,
         a.solid_grain_price as solidGrainPrice,
         a.amount_ing_payable as amountIngPayable,
         a.amount_ing_payable as amountIngPayable,
-        a.amount_ed_payable as amountEdPayable,
-        a.amount_not_payable as amountNotPayable,
+--         a.amount_ed_payable as amountEdPayable,
+--         a.amount_not_payable as amountNotPayable,
+        case when a.status ='全部付款' then  a.amount_ing_payable else a.amount_ed_payable end as amountEdPayable,
+        case when a.status ='全部付款' then  0 else a.amount_not_payable end as amountNotPayable,
         a.remarks,
         a.remarks,
         a.calculation_collectable as calculationCollectable,
         a.calculation_collectable as calculationCollectable,
         a.actual_collectionment as actualCollectionment,
         a.actual_collectionment as actualCollectionment,