Merge remote-tracking branch 'origin/master'

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

@@ -29,7 +29,7 @@
             LEFT JOIN PROJECT T3 ON T2.PROJECT_ID=T3.ID
             LEFT JOIN project T4 ON T1.PROJECT_ID=T4.ID
         <where>
-            T1.COST_TYPE LIKE '14%' and T2.FLOW_STATUS=90
+            T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89)
             <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
                 <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
                 AND T2.COLLECTION_COMPANY like #{collectionCompany}
@@ -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
+            T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89)
             <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
                 <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
                 AND 1!=1
@@ -188,7 +188,7 @@
         LEFT JOIN project T3 ON T2.PROJECT_ID=T3.ID
         LEFT JOIN project T4 ON T1.PROJECT_ID=T4.ID
         <where>
-            T1.COST_TYPE LIKE '14%' and T2.FLOW_STATUS=90
+            T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89)
             <if test="projectIds != null and projectIds.size > 0">
                 AND (T2.PROJECT_ID IN
                 <foreach collection="projectIds" index="index" item="item" open="(" separator="," close=")">
@@ -274,7 +274,7 @@
         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.COST_TYPE LIKE '14%' and T2.FLOW_STATUS=90
+            T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89)
             <if test="projectIds != null and projectIds.size > 0">
                 AND (T1.PROJECT_ID IN
                 <foreach collection="projectIds" index="index" item="item" open="(" separator="," close=")">
@@ -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 and I_WRITE_OFF=0 AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
+            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%'
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND USER_ID = #{params.userId}
             </if>
@@ -380,7 +380,7 @@ select sum(num) from (
         LEFT JOIN WF_USE_MONEY T2 ON T1.USE_MONEY_ID = T2.ID
         LEFT JOIN project T3 ON T2.PROJECT_ID=T3.ID
         <where>
-            T1.ISVALID = 1 and T2.FLOW_STATUS=90 AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
+            T1.ISVALID = 1 and (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.COLLECTION_COMPANY like #{collectionCompany}
@@ -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 AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
+            T1.ISVALID = 1 and (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 1!=1
@@ -562,7 +562,7 @@ select sum(num) from (
         WF_USE_MONEY T1
         LEFT JOIN WF_USE_MONEY_DETAIL T2 ON T2.USE_MONEY_ID = T1.ID
         <where>
-            T1.ISVALID = 1 and T1.FLOW_STATUS=90 AND T2.ISVALID = 1
+            T1.ISVALID = 1 and (T1.FLOW_STATUS=90 or T1.FLOW_STATUS=89) AND T2.ISVALID = 1
             and (t1.PROJECT_ID=#{project} or t2.PROJECT_ID=#{project})
         </where>
     </select>
@@ -575,7 +575,7 @@ select sum(num) from (
         WF_USE_MONEY_DETAIL T1
         LEFT JOIN WF_USE_MONEY T2 ON T1.USE_MONEY_ID = T2.ID
         <where>
-            T1.ISVALID = 1 and T2.FLOW_STATUS=90 AND T2.ISVALID = 1
+            T1.ISVALID = 1 and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) AND T2.ISVALID = 1
             and (t1.PROJECT_ID=#{project} or t2.PROJECT_ID=#{project})
         </where>
     </select>
@@ -588,7 +588,7 @@ select sum(num) from (
         LEFT JOIN project T3 ON T2.PROJECT_ID=T3.ID
         LEFT JOIN project T4 ON T1.PROJECT_ID=T4.ID
         <where>
-            T1.ISVALID = 1 and T2.FLOW_STATUS=90 AND T2.ISVALID = 1
+            T1.ISVALID = 1 and (T2.FLOW_STATUS=90 or T2.FLOW_STATUS=89) AND T2.ISVALID = 1
             and EXTRACT(YEAR FROM T2.FLOW_FINISHTIME) = EXTRACT(YEAR FROM SYSDATE)
             <if test=" deptId != null and deptId.size > 0">
                 AND (T3.ZRBM_ID in