|
@@ -6,7 +6,6 @@
|
|
|
FROM CONTRACT_INVOICE T
|
|
|
LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
|
|
|
LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
|
|
|
- LEFT JOIN CUSTOMER T3 ON T3.ID = T.PAY_COMPANY_ID
|
|
|
LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = T2.ZRBM_ID
|
|
|
LEFT JOIN ZJUGIS_OA.SYSTEM_USERS U ON U.ID = T2.XSRY_ID
|
|
|
LEFT JOIN (SELECT count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID,COALESCE(SUM(COALESCE(RETURN_AMOUNT,0)),0) as returnAmount FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T4 ON T4.CONTRACT_INVOICE_ID=T.ID
|
|
@@ -57,7 +56,7 @@
|
|
|
</if>
|
|
|
<if test="params != null and params.payCompany != null and params.payCompany != ''">
|
|
|
<bind name="payCompany" value="'%'+params.payCompany+'%'"/>
|
|
|
- AND T3.CUSTOMER_NAME like #{payCompany}
|
|
|
+ AND T.PAY_COMPANY like #{payCompany}
|
|
|
</if>
|
|
|
<if test="params != null and params.invoiceOn != null">
|
|
|
AND T.INVOICE_DATE >= #{params.invoiceOn,jdbcType=DATE}
|
|
@@ -90,7 +89,6 @@
|
|
|
FROM CONTRACT_INVOICE T
|
|
|
LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
|
|
|
LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
|
|
|
- LEFT JOIN CUSTOMER T3 ON T3.ID = T.PAY_COMPANY_ID
|
|
|
LEFT JOIN
|
|
|
(SELECT sum(NVL(RETURN_AMOUNT,0)) as returnAmount,count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T4 ON T4.CONTRACT_INVOICE_ID=T.ID
|
|
|
LEFT JOIN
|
|
@@ -150,7 +148,7 @@
|
|
|
</if>
|
|
|
<if test="params != null and params.payCompany != null and params.payCompany != ''">
|
|
|
<bind name="payCompany" value="'%'+params.payCompany+'%'"/>
|
|
|
- AND T3.CUSTOMER_NAME like #{payCompany}
|
|
|
+ AND T.PAY_COMPANY like #{payCompany}
|
|
|
</if>
|
|
|
<if test="params != null and params.invoiceOn != null">
|
|
|
AND T.INVOICE_DATE >= #{params.invoiceOn,jdbcType=DATE}
|
|
@@ -179,7 +177,6 @@
|
|
|
LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
|
|
|
LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
|
|
|
LEFT JOIN PROJECT_TYPE T3 ON T3.ID = T2.PROJECT_TYPE_ID
|
|
|
- LEFT JOIN CUSTOMER T4 ON T4.ID = T.PAY_COMPANY_ID
|
|
|
LEFT JOIN ZJUGIS_OA.SYSTEM_COMPANY C ON C.ID = T.INVOICE_COMPANY_ID
|
|
|
LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = T2.ZRBM_ID
|
|
|
LEFT JOIN ZJUGIS_OA.SYSTEM_USERS U ON U.ID = T2.XSRY_ID
|
|
@@ -231,7 +228,7 @@
|
|
|
</if>
|
|
|
<if test="params != null and params.payCompany != null and params.payCompany != ''">
|
|
|
<bind name="payCompany" value="'%'+params.payCompany+'%'"/>
|
|
|
- AND T4.CUSTOMER_NAME like #{payCompany}
|
|
|
+ AND T.PAY_COMPANY like #{payCompany}
|
|
|
</if>
|
|
|
<if test="params != null and params.invoiceOn != null">
|
|
|
AND T.INVOICE_DATE >= #{params.invoiceOn,jdbcType=DATE}
|