Browse Source

Merge remote-tracking branch 'origin/master'

xda 2 years ago
parent
commit
f67c2037eb
1 changed files with 6 additions and 0 deletions
  1. 6 0
      src/main/resources/mapper/RepalBillMapper.xml

+ 6 - 0
src/main/resources/mapper/RepalBillMapper.xml

@@ -214,6 +214,7 @@
                     REPAL_GROUP_ID = #{groupId}
                   AND DELETED = 0
                   AND REPAL_BILL_STATUS = 2
+                  AND REPAL_BILL_TYPE = 1
                   <if test="!allFlag">
                       AND EXISTS ( SELECT 1 FROM REPAL_RESPONSIBLE_PERSON B WHERE B.REPAL_BILL_ID = A.ID AND B.USER_ID = #{userId})
                   </if>
@@ -223,6 +224,7 @@
             WHERE REPAL_GROUP_ID = #{groupId}
               AND DELETED = 0
               AND REPAL_BILL_STATUS = 2
+              AND REPAL_BILL_TYPE = 1
                 <if test="!allFlag">
                     AND EXISTS ( SELECT 1 FROM REPAL_RESPONSIBLE_PERSON B WHERE B.REPAL_BILL_ID = A.ID AND B.USER_ID = #{userId})
                 </if>
@@ -232,6 +234,7 @@
             WHERE REPAL_GROUP_ID = #{groupId}
               AND DELETED = 0
               AND REPAL_BILL_STATUS = 1
+              AND REPAL_BILL_TYPE = 1
               AND END_DATE <![CDATA[<=]]> #{startTime}
                 <if test="!allFlag">
                     AND EXISTS ( SELECT 1 FROM REPAL_RESPONSIBLE_PERSON B WHERE B.REPAL_BILL_ID = A.ID AND B.USER_ID = #{userId})
@@ -243,6 +246,7 @@
                 REPAL_GROUP_ID = #{groupId}
               AND DELETED = 0
               AND REPAL_BILL_STATUS = 1
+              AND REPAL_BILL_TYPE = 1
               AND END_DATE <![CDATA[<=]]> #{startTime}
                 <if test="!allFlag">
                     AND EXISTS ( SELECT 1 FROM REPAL_RESPONSIBLE_PERSON B WHERE B.REPAL_BILL_ID = A.ID AND B.USER_ID = #{userId})
@@ -253,6 +257,7 @@
               WHERE
                   REPAL_GROUP_ID = #{groupId}
                 AND DELETED = 0
+                AND REPAL_BILL_TYPE = 1
                 AND REPAL_BILL_STATUS in (1,2)
                 <if test="!allFlag">
                     AND EXISTS ( SELECT 1 FROM REPAL_RESPONSIBLE_PERSON B WHERE B.REPAL_BILL_ID = A.ID AND B.USER_ID = #{userId})
@@ -278,6 +283,7 @@
         A.REPAL_GROUP_ID = #{groupId}
         AND A.DELETED = 0
         AND C.DELETED = 0
+        AND A.REPAL_BILL_TYPE = 1
         AND ((A.REPAL_BILL_STATUS = 1
         AND A.END_DATE <![CDATA[<=]]> #{startTime}) or A.REPAL_BILL_STATUS = 2)
         <if test="!allFlag">