admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_js_20260420

Browse Source
This commit is contained in:
king
2026-04-28 11:36:24 +08:00
parent cd8d2cb6bb b14b28fbee
commit fbb6b4f976
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
View File

@@ -1161,12 +1161,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectNewGrBiSaAggGroupHZList" resultType="java.util.Map"> <select id="selectNewGrBiSaAggGroupHZList" resultType="java.util.Map">
select t.* from (
SELECT SELECT
'自营品种' as bk, '自营品种' as bk,
IF(GROUPING (saler_name, zone_name) = 2, CONCAT(zone_name, "总计"), IFNULL(zone_name, '省区合计')) AS zone_name, IF(GROUPING (saler_name, zone_name) = 2, CONCAT(zone_name, "总计"), IFNULL(zone_name, '省区合计')) AS zone_name,
c.position, c.position,
saler_name, saler_name,
-- GROUPING (saler_name, zone_name, c.position), -- GROUPING (saler_name, zone_name, c.position),
ROUND(SUM(IF(`use_month` = '1', this_month_sa_money, null)) / 10000, 2) AS month_sa_money_1, ROUND(SUM(IF(`use_month` = '1', this_month_sa_money, null)) / 10000, 2) AS month_sa_money_1,
ROUND(SUM(IF(`use_month` = '2', this_month_sa_money, null)) / 10000, 2) AS month_sa_money_2, ROUND(SUM(IF(`use_month` = '2', this_month_sa_money, null)) / 10000, 2) AS month_sa_money_2,
ROUND(SUM(IF(`use_month` = '3', this_month_sa_money, null)) / 10000, 2) AS month_sa_money_3, ROUND(SUM(IF(`use_month` = '3', this_month_sa_money, null)) / 10000, 2) AS month_sa_money_3,
@@ -1192,7 +1193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
saler_name, saler_name,
c.position WITH ROLLUP c.position WITH ROLLUP
HAVING GROUPING (saler_name, zone_name, c.position) != 1 HAVING GROUPING (saler_name, zone_name, c.position) != 1 ORDER BY a.zone_name DESC, zone_name ASC, c.position IS NULL , c.position DESC
) t
UNION ALL UNION ALL
SELECT SELECT