回款消息

zjugis-business/src/main/resources/mapper/oracle/ContractMessageMapper.xml

@@ -4,12 +4,11 @@
 
     <select id="page" resultType="com.zjugis.business.bean.response.ContractMessageResponse">
         SELECT cm.*,T2.ID as contractInvoiceId,T2.INSTANCE_ID as invoiceInstanceId,T3.PROJECT_ID as projectId FROM CONTRACT_MESSAGE cm
-        LEFT JOIN CONTRACT_RETURN_MONEY T1 on T1.ID = cm.BUSINESS_ID and cm.MESSAGE_TYPE = 2
-        LEFT JOIN CONTRACT_INVOICE T2 on T2.ID = T1.CONTRACT_INVOICE_ID
-        LEFT JOIN CONTRACT T3 on T3.ID = cm.CONTRACT_ID and cm.MESSAGE_TYPE = 1
+        LEFT JOIN CONTRACT_RETURN_MONEY T1 on T1.ID = cm.BUSINESS_ID and cm.MESSAGE_TYPE = 2 and T1.isvalid = 1
+        LEFT JOIN CONTRACT_INVOICE T2 on T2.ID = T1.CONTRACT_INVOICE_ID and T2.isvalid = 1 and T2.FLOW_STATUS >=90
+        LEFT JOIN CONTRACT T3 on T3.ID = t2.CONTRACT_ID and T3.FLOW_STATUS = 90 and T3.ISVALID = 1
         <if test="(params != null and params.deptId != null and params.deptId != '') or (params != null  and params.deptIds != null  and params.deptIds.size > 0)">
-            RIGHT JOIN CONTRACT c ON c.ID = cm.CONTRACT_ID
-            RIGHT JOIN PROJECT p ON p.ID = c.PROJECT_ID
+            RIGHT JOIN PROJECT p ON p.ID = T3.PROJECT_ID
         </if>
         <where>
             cm.ISVALID = 1