销售合同流水明细问题处理

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -159,36 +159,38 @@
                arw.create_time,
                ap.type,
                arw.currency,
-               arw.amount,
-               arw.remarks,
+               pad.money          amount,
+               pad.remark         remarks,
                am.`name`          accountManagementName,
                am.account_opening accountManagementOpening,
                arw.`name`
         FROM contract c
-                 JOIN bytesailing_purchase.purchase p ON p.data_resource_id = c.id
-                 JOIN bytesailing_purchase.pay_detail pad
-        ON pad.purchase_id = p.id
-            JOIN bytesailing_purchase.pay pa ON pad.pay_id = pa.id
-            JOIN bytesailing_account.account_payment ap ON ap.business_id = pa.id
-            JOIN bytesailing_account.account_running_water arw ON arw.business_id = ap.id
-            LEFT JOIN bytesailing_account.account_management am ON arw.account_management_id = am.id
-        WHERE
-            c.id = #{contractId}
+                 JOIN bytesailing_purchase.purchase p ON p.data_resource_id = c.id AND p.del_flag = 0
+                 JOIN bytesailing_purchase.pay_detail `pad` ON pad.purchase_id = p.id AND pad.del_flag = 0
+                 JOIN bytesailing_purchase.pay pa ON pad.pay_id = pa.id AND pa.del_flag = 0
+                 JOIN bytesailing_account.account_payment ap ON ap.business_id = pa.id AND ap.del_flag = 0
+                 JOIN bytesailing_account.account_running_water arw ON arw.business_id = ap.id AND arw.del_flag = 0
+                 LEFT JOIN bytesailing_account.account_management am
+                           ON arw.account_management_id = am.id AND am.del_flag = 0
+        WHERE c.id = #{contractId}
         UNION ALL
         SELECT arw.id,
                arw.create_time,
                ap.type,
                arw.currency,
-               arw.amount,
-               arw.remarks,
+               arfd.amount,
+               arfd.remarks,
                am.`name`          accountManagementName,
                am.account_opening accountManagementOpening,
                arw.`name`
         FROM contract c
-                 JOIN bytesailing_account.account_request_funds_detail arfd ON arfd.contract_id = c.id
-                 JOIN bytesailing_account.account_payment ap ON ap.business_id = arfd.account_request_funds_id
-                 JOIN bytesailing_account.account_running_water arw ON arw.business_id = ap.id
-                 LEFT JOIN bytesailing_account.account_management am ON arw.account_management_id = am.id
+                 JOIN bytesailing_account.account_request_funds_detail arfd
+                      ON arfd.contract_id = c.id AND arfd.del_flag = 0
+                 JOIN bytesailing_account.account_payment ap
+                      ON ap.business_id = arfd.account_request_funds_id AND ap.del_flag = 0
+                 JOIN bytesailing_account.account_running_water arw ON arw.business_id = ap.id AND arw.del_flag = 0
+                 LEFT JOIN bytesailing_account.account_management am
+                           ON arw.account_management_id = am.id AND am.del_flag = 0
         WHERE c.id = #{contractId}
         UNION ALL
         SELECT arw.id,
@@ -204,8 +206,10 @@
                  JOIN claim cl ON cl.business_id = arw.id
                  JOIN claim_contract clc ON clc.claim_id = cl.id
                  JOIN contract c ON clc.contract_id = c.id
-                 LEFT JOIN bytesailing_account.account_management am ON arw.account_management_id = am.id
-        WHERE c.id = #{contractId}
+                 LEFT JOIN bytesailing_account.account_management am
+                           ON arw.account_management_id = am.id AND am.del_flag = 0
+        WHERE arw.del_flag = 0
+          AND c.id = #{contractId}
     </select>
 
 </mapper>