feat: incloud status = 1

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysDeptSubMapper.xml

@@ -27,9 +27,9 @@
         sum(t.settle_amount) AS totalAmount
         FROM wm_score_package_settle_note t
         WHERE t.subject_location = #{query.location, jdbcType=VARCHAR}
-        AND (t.settle_note_status IN ('2', '9', '0')
-        OR (t.settle_note_status = '3' AND (t.sub_to_gig_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND
-        #{query.endTime,jdbcType=TIMESTAMP})))
+        AND  (t.settle_note_status IN ('2', '9', '0')
+        OR (t.settle_note_status = '3' AND (t.sub_to_gig_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND #{query.endTime,jdbcType=TIMESTAMP}))
+        OR (t.settle_note_status = '1' AND (t.create_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND #{query.endTime,jdbcType=TIMESTAMP}) ))
         AND t.id_card_number IN
         <foreach item="item" index="index" collection="query.idCards" open="(" separator="," close=")">
             #{item}
@@ -50,8 +50,8 @@
         FROM wm_score_package_settle_note t
         WHERE t.subject_location = #{query.location, jdbcType=VARCHAR}
         AND (t.settle_note_status IN ('2', '9', '0')
-        OR (t.settle_note_status = '3' AND (t.sub_to_gig_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND
-        #{query.endTime,jdbcType=TIMESTAMP})))
+        OR (t.settle_note_status = '3' AND (t.sub_to_gig_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND #{query.endTime,jdbcType=TIMESTAMP}))
+        OR (t.settle_note_status = '1' AND (t.create_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND #{query.endTime,jdbcType=TIMESTAMP} ))
         AND t.user_id IN
         <foreach item="item" index="index" collection="query.userIds" open="(" separator="," close=")">
             #{item}
@@ -79,8 +79,8 @@
         FROM wm_score_package_settle_note t
         WHERE
         (t.settle_note_status IN ('2', '9', '0')
-        OR (t.settle_note_status = '3' AND (t.sub_to_gig_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND
-        #{query.endTime,jdbcType=TIMESTAMP})))
+        OR (t.settle_note_status = '3' AND (t.sub_to_gig_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND #{query.endTime,jdbcType=TIMESTAMP}))
+        OR (t.settle_note_status = '1' AND (t.create_time BETWEEN #{query.startTime,jdbcType=TIMESTAMP} AND #{query.endTime,jdbcType=TIMESTAMP}) ))
         AND t.id_card_number IN
         <foreach item="item" index="index" collection="query.idCards" open="(" separator="," close=")">
             #{item}