From 60ff3a872db92a35685d95191f83a7e4bbe50df5 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 28 Oct 2025 14:24:30 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=90=8E=E5=8F=B0=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=9A=E5=91=98=E6=95=B0=E6=8D=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/system/board/BoardMapper.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml index 1d739b2b..ebd31fea 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml @@ -49,7 +49,7 @@ bg.grade_value, nvl(a.member_total, 0) member_total, 0 sort - from (select cm.PK_REGISTER_GRADE, count(1) member_total + from (select cm.PK_SETTLE_GRADE, count(1) member_total from cu_member cm where cm.del_flag = 0 and cm.pay_status = 1 @@ -57,17 +57,17 @@ and to_char(cm.pay_time, 'yyyy-mm-dd') = to_char(sysdate, 'yyyy-mm-dd') and cm.customer_type != 1 - group by cm.PK_REGISTER_GRADE - order by cm.PK_REGISTER_GRADE) a + group by cm.PK_SETTLE_GRADE + order by cm.PK_SETTLE_GRADE) a right join bd_grade bg - on bg.pk_id = a.PK_REGISTER_GRADE + on bg.pk_id = a.PK_SETTLE_GRADE where bg.del_flag = 0 union all select bg.grade_name, bg.grade_value, nvl(a.member_total, 0) member_total, 1 sort - from (select cm.PK_REGISTER_GRADE, count(1) member_total + from (select cm.PK_SETTLE_GRADE, count(1) member_total from cu_member cm where cm.del_flag = 0 and cm.pay_status = 1 @@ -75,27 +75,27 @@ and to_char(cm.pay_time, 'yyyy-mm-dd') = to_char(sysdate - 1, 'yyyy-mm-dd') and cm.customer_type != 1 - group by cm.PK_REGISTER_GRADE - order by cm.PK_REGISTER_GRADE) a + group by cm.PK_SETTLE_GRADE + order by cm.PK_SETTLE_GRADE) a right join bd_grade bg - on bg.pk_id = a.PK_REGISTER_GRADE + on bg.pk_id = a.PK_SETTLE_GRADE where bg.del_flag = 0 union all select bg.grade_name, bg.grade_value, nvl(a.member_total, 0) member_total, 2 sort - from (select cm.PK_REGISTER_GRADE, count(1) member_total + from (select cm.PK_SETTLE_GRADE, count(1) member_total from cu_member cm where cm.del_flag = 0 and cm.pay_status = 1 and cm.category = 0 and to_char(cm.pay_time, 'yyyy-mm') = to_char(sysdate, 'yyyy-mm') and cm.customer_type != 1 - group by cm.PK_REGISTER_GRADE - order by cm.PK_REGISTER_GRADE) a + group by cm.PK_SETTLE_GRADE + order by cm.PK_SETTLE_GRADE) a right join bd_grade bg - on bg.pk_id = a.PK_REGISTER_GRADE + on bg.pk_id = a.PK_SETTLE_GRADE where bg.del_flag = 0 order by sort, grade_value