Przeglądaj źródła

feat: 企业限额和渠道限额适配平台限额逻辑

shc 1 rok temu
rodzic
commit
df4990b867

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

@@ -27,8 +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.create_time > #{query.startTime,jdbcType=TIMESTAMP}
-        AND t.create_time < #{query.endTime,jdbcType=TIMESTAMP}
+        AND t.settle_note_status IN ('2', '9')
+        OR (t.settle_note_status = '3' AND (t.sub_to_gig_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}
@@ -48,8 +49,9 @@
         sum(t.settle_amount) AS totalAmount
         FROM wm_score_package_settle_note t
         WHERE t.subject_location = #{query.location, jdbcType=VARCHAR}
-        AND t.create_time &gt; #{query.startTime,jdbcType=TIMESTAMP}
-        AND t.create_time &lt; #{query.endTime,jdbcType=TIMESTAMP}
+        AND t.settle_note_status IN ('2', '9')
+        OR (t.settle_note_status = '3' AND (t.sub_to_gig_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}