|
@@ -108,7 +108,7 @@
|
|
|
LEFT JOIN WF_COMMON_COST T2 ON T1.COMMON_COST_ID = T2.ID
|
|
|
LEFT JOIN PROJECT T3 ON T1.PROJECT_ID=T3.ID
|
|
|
<where>
|
|
|
- T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) AND T2.ISVALID = 1 and T1.ISVALID = 1
|
|
|
+ T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) and T2.ISVALID = 1
|
|
|
<if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
|
|
|
<bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
|
|
|
AND T2.ID IS NULL
|
|
@@ -358,7 +358,7 @@ select sum(num) from (
|
|
|
WF_COMMON_COST_DETAIL T1
|
|
|
LEFT JOIN WF_COMMON_COST T2 ON T1.COMMON_COST_ID = T2.ID
|
|
|
<where>
|
|
|
- T1.ISVALID = 1 and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) and I_WRITE_OFF=0 AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
|
|
|
+ (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) and I_WRITE_OFF=0 AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
|
|
|
<if test="params != null and params.userId != null and params.userId != ''">
|
|
|
AND USER_ID = #{params.userId}
|
|
|
</if>
|
|
@@ -458,7 +458,7 @@ select sum(num) from (
|
|
|
LEFT JOIN WF_COMMON_COST T2 ON T1.COMMON_COST_ID = T2.ID
|
|
|
LEFT JOIN project T3 ON T2.PROJECT_ID=T3.ID
|
|
|
<where>
|
|
|
- T1.ISVALID = 1 and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
|
|
|
+ (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
|
|
|
<if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
|
|
|
<bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
|
|
|
AND T2.ID IS NULL
|