Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

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 or T2.FLOW_STATUS=89)
+            T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90)
             <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
                 <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
                 AND T2.COLLECTION_COMPANY like #{collectionCompany}
@@ -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 or T2.FLOW_STATUS=89)
+            T1.COST_TYPE LIKE '14%' and (T2.FLOW_STATUS=90 )
             <if test="projectIds != null and projectIds.size > 0">
                 AND (T2.PROJECT_ID IN
                 <foreach collection="projectIds" index="index" item="item" open="(" separator="," close=")">
@@ -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 or T2.FLOW_STATUS=89) AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
+            T1.ISVALID = 1 and (T2.FLOW_STATUS=90 ) 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}