zhangyuewww 2 年之前
父節點
當前提交
4950af712d

+ 8 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -1225,6 +1225,7 @@
                          exi.contract_id = cmi.id
                        AND exi.expenses_type = '2'
                        AND exi.expenses_purpose = '1'
+                       AND exi.status = '已付款'
                        AND exi.delete_flag = '0'
                  )- (
                      SELECT
@@ -1235,6 +1236,7 @@
                          exi.contract_id = cmi.id
                        AND exi.expenses_type = '1'
                        AND exi.expenses_purpose = '1'
+                       AND exi.status_flag >= '5'
                        AND exi.delete_flag = '0'
                  )+ (
                      SELECT
@@ -1245,7 +1247,7 @@
                              AND war.comp_id = cmi1.comp_id
                              AND war.delete_flag = '0'
                              LEFT JOIN expense_allocation_info eai ON eai.order_id = war.id
-                             AND eai.delete_flag = '0'
+                             AND eai.delete_flag = '0' and eai.status = '已通过'
                      WHERE
                          cmi1.id = cmi.id
                  ))/ (
@@ -1282,6 +1284,7 @@
                      exi.contract_id = cmi.id
                    AND exi.expenses_type = '2'
                    AND exi.expenses_purpose = '1'
+                   AND exi.status = '已付款'
                    AND exi.delete_flag = '0'
              )- (
                  SELECT
@@ -1291,6 +1294,7 @@
                  WHERE
                      exi.contract_no = cmi.contract_no
                    AND exi.expense_name = '运费'
+                   AND exi.status = '已付款'
                    AND exi.delete_flag = '0'
              ))/(
                     (
@@ -1331,6 +1335,7 @@
                          exi.contract_id = cmi.id
                        AND exi.expenses_type = '2'
                        AND exi.expenses_purpose = '1'
+                       AND exi.status = '已付款'
                        AND exi.delete_flag = '0'
                  )- (
                      SELECT
@@ -1341,6 +1346,7 @@
                          exi.contract_id = cmi.id
                        AND exi.expenses_type = '1'
                        AND exi.expenses_purpose = '1'
+                       AND exi.status_flag >= '5'
                        AND exi.delete_flag = '0'
                  )- (
                      SELECT
@@ -1351,7 +1357,7 @@
                              AND war.comp_id = cmi1.comp_id
                              AND war.delete_flag = '0'
                              LEFT JOIN expense_allocation_info eai ON eai.order_id = war.id
-                             AND eai.delete_flag = '0'
+                             AND eai.delete_flag = '0' and eai.status = '已通过'
                      WHERE
                          cmi1.id = cmi.id
                  ))/ (