首页回款和新签约回款加上子合同

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

@@ -147,7 +147,7 @@
         FROM CONTRACT c
         RIGHT JOIN PROJECT pr ON pr.ID = c.PROJECT_ID
         <where>
-            c.ISVALID = 1 AND c.FLOW_STATUS = 90
+            c.ISVALID = 1 AND ( c.FLOW_STATUS = 90 OR c.FLOW_STATUS = 99 )
             <if test="params != null and params.year != null and params.year != ''">
                 AND TO_CHAR(c.CONTRACT_OFF,'YYYY') = #{params.year,jdbcType=VARCHAR}
             </if>
@@ -173,7 +173,7 @@
             FROM CONTRACT c
             RIGHT JOIN PROJECT pr ON pr.ID = c.PROJECT_ID
             <where>
-                c.ISVALID = 1 AND c.FLOW_STATUS = 90
+                c.ISVALID = 1 AND ( c.FLOW_STATUS = 90 OR c.FLOW_STATUS = 99 )
                 <if test="params != null and params.year != null and params.year != ''">
                     AND TO_CHAR(c.CONTRACT_ON,'YYYY') = #{params.year,jdbcType=VARCHAR}
                 </if>
@@ -315,7 +315,7 @@
     <select id="messageCountReturn" resultType="java.math.BigDecimal">
         select COALESCE(SUM(COALESCE(t2.RETURN_AMOUNT,0)),0) as returnAmount
         FROM CONTRACT_RETURN_MONEY t2
-        RIGHT JOIN CONTRACT t1 on t2.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and t1.FLOW_STATUS = 90
+        RIGHT JOIN CONTRACT t1 on t2.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and AND ( t1.FLOW_STATUS = 90 OR t1.FLOW_STATUS = 99 )
         LEFT JOIN PROJECT pr ON pr.ID = t1.PROJECT_ID
         <where>
             t2.ISVALID = 1 and NVL(t2.BZ,'-1') != '冲红'