回款列表

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

@@ -3,12 +3,15 @@
 <mapper namespace="com.zjugis.business.mapper.ContractReturnMoneyMapper">
 
     <select id="selectByContractId" resultType="com.zjugis.business.bean.response.ContractReturnMoneyResponse">
-        SELECT t.*,t1.INVOICE_NO,t1.INVOICE_AMOUNT,t1.INVOICE_CONTENT,t1.INVOICE_DATE,t1.INVOICE_TYPE
-        FROM CONTRACT_RETURN_MONEY t
-        LEFT JOIN CONTRACT_INVOICE t1
-        on t1.ID = t.CONTRACT_INVOICE_ID
+        SELECT t.ID,t2.NAME AS CONTRACT_MILESTONE_NAME,t.FLOW_STATUS,t.INVOICE_NO,t.INVOICE_AMOUNT,t.INVOICE_CONTENT,t.INVOICE_DATE,t.INVOICE_TYPE,t1.returnAmount,t1.returnDate
+        FROM CONTRACT_INVOICE t
+        LEFT JOIN
+        (SELECT CONTRACT_INVOICE_ID,sum(RETURN_AMOUNT) as returnAmount,max(RETURN_DATE) as returnDate
+            FROM CONTRACT_RETURN_MONEY
+            WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID ) t1 on t.ID = t1.CONTRACT_INVOICE_ID
+        LEFT JOIN CONTRACT_MILESTONE t2 on t2.ID = t.CONTRACT_MILESTONE_ID
         WHERE t.CONTRACT_ID = #{contractId} AND t.ISVALID = 1
-        ORDER BY t.SORTNUM ASC
+        ORDER BY t.INVOICE_DATE,t1.returnDate ASC
     </select>
 
     <delete id="deleteByInvoiceId">