|
@@ -6,6 +6,7 @@
|
|
|
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) T3 ON T3.CONTRACT_INVOICE_ID=T.ID
|
|
@@ -41,6 +42,10 @@
|
|
|
<if test="params != null and params.payCompanyId != null and params.payCompanyId != ''">
|
|
|
AND T.PAY_COMPANY_ID = #{params.payCompanyId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test="params != null and params.payCompany != null and params.payCompany != ''">
|
|
|
+ <bind name="payCompany" value="'%'+params.payCompany+'%'"/>
|
|
|
+ AND T3.CUSTOMER_NAME like #{payCompany}
|
|
|
+ </if>
|
|
|
<if test="params != null and params.invoiceOn != null">
|
|
|
AND T.INVOICE_DATE >= #{params.invoiceOn,jdbcType=DATE}
|
|
|
</if>
|
|
@@ -54,7 +59,10 @@
|
|
|
AND T3.maxd <= #{params.returnOff,jdbcType=DATE}
|
|
|
</if>
|
|
|
<if test="params != null and params.isReturn == 1">
|
|
|
- AND T3.rc > 0
|
|
|
+ AND T3.rc > 0
|
|
|
+ </if>
|
|
|
+ <if test="params != null and params.isReturn == 0">
|
|
|
+ AND T3.rc = 0
|
|
|
</if>
|
|
|
</where>
|
|
|
ORDER BY
|
|
@@ -115,7 +123,10 @@
|
|
|
AND T3.maxd <= #{params.returnOff,jdbcType=DATE}
|
|
|
</if>
|
|
|
<if test="params != null and params.isReturn == 1">
|
|
|
- AND T3.rc > 0
|
|
|
+ AND T3.rc > 0
|
|
|
+ </if>
|
|
|
+ <if test="params != null and params.isReturn == 0">
|
|
|
+ AND T3.rc = 0
|
|
|
</if>
|
|
|
</where>
|
|
|
</select>
|
|
@@ -126,6 +137,7 @@
|
|
|
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 T3.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
|
|
@@ -162,6 +174,10 @@
|
|
|
<if test="params != null and params.payCompanyId != null and params.payCompanyId != ''">
|
|
|
AND T.PAY_COMPANY_ID = #{params.payCompanyId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test="params != null and params.payCompany != null and params.payCompany != ''">
|
|
|
+ <bind name="payCompany" value="'%'+params.payCompany+'%'"/>
|
|
|
+ AND T4.CUSTOMER_NAME like #{payCompany}
|
|
|
+ </if>
|
|
|
<if test="params != null and params.invoiceOn != null">
|
|
|
AND T.INVOICE_DATE >= #{params.invoiceOn,jdbcType=DATE}
|
|
|
</if>
|