From 588279f43346ae91e313795596efff482cb73189 Mon Sep 17 00:00:00 2001
From: king <hfjinsong@163.com>
Date: Sat, 25 Apr 2026 14:57:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=20=E7=BC=96=E5=86=99,=20=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/report/xtsy/ZhxsqkPluginHZ.java   |  71 ++++++++
 .../mapper/NewGrBiSaAggMonthCountMapper.java  |  10 ++
 .../INewGrBiSaAggMonthCountService.java       |   2 +
 .../NewGrBiSaAggMonthCountServiceImpl.java    |   7 +
 .../NewGrBiSaAggMonthCountMapper.xml          | 158 ++++++++++++++++++
 5 files changed, 248 insertions(+)
 create mode 100644 lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginHZ.java

diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginHZ.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginHZ.java
new file mode 100644
index 0000000..7433b7e
--- /dev/null
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginHZ.java
@@ -0,0 +1,71 @@
+
+package com.lideeyunji.core.framework.enhance.example.report.xtsy;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
+import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAroundAdvicePlugin;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
+import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount;
+import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService;
+import com.lideeyunji.core.framework.service.INewGrBiSaAggYearCountService;
+import com.lideeyunji.tool.framework.yunji.model.ResultDataModel;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static com.lideeyunji.core.framework.enhance.example.report.xtsy.ZhxsqkPlugin.setMonthOrderBy;
+
+/**
+ * 报表-综合销售表_剂型-插件
+ */
+@Slf4j
+@Component("zhxsqkPluginHZ")
+public class ZhxsqkPluginHZ implements ReportAroundAdvicePlugin {
+
+
+    @Resource
+    INewGrBiSaAggMonthCountService newGrBiSaAggMonthCountService;
+
+    @Override
+    public ResultDataModel executeAround(EnhanceReportContext enhanceContext) {
+        log.info("进入=======>zhxsqkPluginJx=======>execute");
+        LocalDateTime now = LocalDateTime.now();
+        String currentYear = Integer.toString(now.getYear());
+        int currentMonth = now.getMonthValue();
+        List<Integer> monthList = IntStream.rangeClosed(1, currentMonth).boxed().collect(Collectors.toList());
+        Map<String, Object> params = enhanceContext.getParam().getParams();
+        List<Map<String, Object>> records = newGrBiSaAggMonthCountService.selectNewGrBiSaAggGroupHZList(params);
+        for(Map<String, Object> record : records){
+            if(!record.containsKey("zone_name") || StrUtil.isEmpty(record.get("zone_name").toString())){
+                record.put("zone_name","-");
+            }
+            if(!record.containsKey("position") || StrUtil.isEmpty(record.get("position").toString())){
+                record.put("position","-");
+            }
+            if(!record.containsKey("saler_name") || StrUtil.isEmpty(record.get("saler_name").toString())){
+                record.put("saler_name","-");
+            }
+            if(!record.containsKey("year_sa_money") || StrUtil.isEmpty(record.get("year_sa_money").toString())){
+                record.put("year_sa_money","-");
+            }
+            for (Integer month : monthList){
+                if(!record.containsKey("month_sa_money_" + month) || StrUtil.isEmpty(record.get("month_sa_money_" + month).toString())){
+                    record.put("month_sa_money_" + month,"-");
+                }
+            }
+        }
+        return ResultDataModel.fomatList(records);
+    }
+}
diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMonthCountMapper.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMonthCountMapper.java
index 9324bee..5a49e7c 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMonthCountMapper.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/NewGrBiSaAggMonthCountMapper.java
@@ -80,6 +80,16 @@ public interface NewGrBiSaAggMonthCountMapper extends BaseMapper<NewGrBiSaAggMon
     @DS(value = "#dataSourceType")
     public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggGroupMonthList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam") SaAggParam saAggParam, @Param("params") Map<String, Object> params, @Param("groupFieldList")List<String> groupFieldList);
 
+    /**
+     * 批量查询综合销售情况明细列表 -汇总
+     *
+     * @param saAggParam 综合销售情况明细参数
+     * @return 综合销售情况明细集合
+     */
+    @DataPermission(enable = false)
+    @DS(value = "#dataSourceType")
+    public List<Map<String, Object>> selectNewGrBiSaAggGroupHZList(@Param("dataSourceType") String dataSourceType, @Param("saAggParam") SaAggParam saAggParam, @Param("params") Map<String, Object> params);
+
     /**
      * 批量查询综合销售情况明细列表 -月度
      *
diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggMonthCountService.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggMonthCountService.java
index dd88039..e10fa5c 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggMonthCountService.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/INewGrBiSaAggMonthCountService.java
@@ -68,6 +68,8 @@ public interface INewGrBiSaAggMonthCountService
 
     public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggGroupMonthList(Map<String, Object> params, List<String> groupFieldList);
 
+    public List<Map<String, Object>> selectNewGrBiSaAggGroupHZList(Map<String, Object> params);
+
     public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggGroupNoMonthNoYearList(Map<String, Object> params, List<String> groupFieldList);
 
 }
diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggMonthCountServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggMonthCountServiceImpl.java
index c74e2e2..e62e9c3 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggMonthCountServiceImpl.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/NewGrBiSaAggMonthCountServiceImpl.java
@@ -104,6 +104,13 @@ public class NewGrBiSaAggMonthCountServiceImpl extends ServiceImpl<NewGrBiSaAggM
         SaAggParam saAggParam = NewGrBiSaAggServiceImpl.createParam(params);
         return this.baseMapper.selectNewGrBiSaAggGroupMonthList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam,params, groupFieldList);
     }
+
+    @Override
+    public List<Map<String, Object>> selectNewGrBiSaAggGroupHZList(Map<String, Object> params){
+        SaAggParam saAggParam = NewGrBiSaAggServiceImpl.createParam(params);
+        return this.baseMapper.selectNewGrBiSaAggGroupHZList(lideeYunJiBaseConstant.DS_ERP_BI_DATA, saAggParam,params);
+    }
+
     @Override
     public List<NewGrBiSaAggMonthCount> selectNewGrBiSaAggGroupNoMonthNoYearList(Map<String, Object> params, List<String> groupFieldList){
         SaAggParam saAggParam = NewGrBiSaAggServiceImpl.createParam(params);
diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
index 5c56f04..60b4c0c 100644
--- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
+++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
@@ -1159,4 +1159,162 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
+    <select id="selectNewGrBiSaAggGroupHZList" resultType="java.util.Map">
+    SELECT
+        '自营品种' as bk,
+        IF(GROUPING (saler_name, zone_name) = 2, CONCAT(zone_name, "总计"), IFNULL(zone_name, '省区合计')) AS zone_name,
+        c.position,
+        saler_name,
+--   GROUPING (saler_name, zone_name, c.position),
+        ROUND(SUM(IF(use_month = '1', this_month_sa_money, null)), 2) AS month_sa_money_1,
+        ROUND(SUM(IF(`use_month` = '2', this_month_sa_money, null)), 2) AS month_sa_money_2,
+        ROUND(SUM(IF(`use_month` = '3', this_month_sa_money, null)), 2) AS month_sa_money_3,
+        ROUND(SUM(IF(`use_month` = '4', this_month_sa_money, null)), 2) AS month_sa_money_4,
+        ROUND(SUM(IF(`use_month` = '5', this_month_sa_money, null)), 2) AS month_sa_money_5,
+        ROUND(SUM(IF(`use_month` = '6', this_month_sa_money, null)), 2) AS month_sa_money_6,
+        ROUND(SUM(IF(`use_month` = '7', this_month_sa_money, null)), 2) AS month_sa_money_7,
+        ROUND(SUM(IF(`use_month` = '8', this_month_sa_money, null)), 2) AS month_sa_money_8,
+        ROUND(SUM(IF(`use_month` = '9', this_month_sa_money, null)), 2) AS month_sa_money_9,
+        ROUND(SUM(IF(`use_month` = '10', this_month_sa_money, null)), 2) AS month_sa_money_10,
+        ROUND(SUM(IF(`use_month` = '11', this_month_sa_money, null)), 2) AS month_sa_money_11,
+        ROUND(SUM(IF(`use_month` = '12', this_month_sa_money, null)), 2) AS month_sa_money_12,
+        ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
+    FROM
+        new_gr_bi_sa_agg_month_count a
+            LEFT JOIN gr_contacts c ON a.saler_name = c.`name`
+            AND a.zone_name = c.zone
+    WHERE
+        use_year = YEAR(CURDATE())
+      AND sale_type_name = '自营品种'
+    GROUP BY
+        zone_name,
+        saler_name,
+        c.position WITH ROLLUP
+
+    HAVING  GROUPING (saler_name, zone_name, c.position) != 1
+    UNION ALL
+
+    SELECT
+        '代理品种' as bk,
+        a.*
+    FROM
+        (
+            SELECT
+                IF(
+                        GROUPING (p.proxy_name, saler_name) = 0,
+                        IFNULL(p.proxy_name, '其他'),
+                        IF(GROUPING (p.proxy_name, saler_name) = 3, IFNULL(p.proxy_name, '代理品种合计'), p.proxy_name)
+                ) proxy_name,
+                '',
+                ROUND(SUM(IF(use_month = MONTH(CURDATE()), this_month_sa_qty, null)), 2) AS this_month_sa_qty,
+                ROUND(SUM(IF(use_month = '1', this_month_sa_money, null)), 2) AS month_sa_money_1,
+                ROUND(SUM(IF(`use_month` = '2', this_month_sa_money, null)), 2) AS month_sa_money_2,
+                ROUND(SUM(IF(`use_month` = '3', this_month_sa_money, null)), 2) AS month_sa_money_3,
+                ROUND(SUM(IF(`use_month` = '4', this_month_sa_money, null)), 2) AS month_sa_money_4,
+                ROUND(SUM(IF(`use_month` = '5', this_month_sa_money, null)), 2) AS month_sa_money_5,
+                ROUND(SUM(IF(`use_month` = '6', this_month_sa_money, null)), 2) AS month_sa_money_6,
+                ROUND(SUM(IF(`use_month` = '7', this_month_sa_money, null)), 2) AS month_sa_money_7,
+                ROUND(SUM(IF(`use_month` = '8', this_month_sa_money, null)), 2) AS month_sa_money_8,
+                ROUND(SUM(IF(`use_month` = '9', this_month_sa_money, null)), 2) AS month_sa_money_9,
+                ROUND(SUM(IF(`use_month` = '10', this_month_sa_money, null)), 2) AS month_sa_money_10,
+                ROUND(SUM(IF(`use_month` = '11', this_month_sa_money, null)), 2) AS month_sa_money_11,
+                ROUND(SUM(IF(`use_month` = '12', this_month_sa_money, null)), 2) AS month_sa_money_12,
+                ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
+            FROM
+                new_gr_bi_sa_agg a
+                    LEFT JOIN gr_googs_proxy p ON a.goods_id = p.goods_id
+            WHERE
+                use_year = YEAR(CURDATE())
+              AND sale_type_name = '代理品种'
+            GROUP BY
+                p.proxy_name,
+                saler_name WITH ROLLUP
+            HAVING  GROUPING (saler_name, p.proxy_name) != 2
+            ORDER BY
+                GROUPING (saler_name, p.proxy_name),
+                p.proxy_name DESC
+        ) a
+
+    UNION ALL
+
+    SELECT
+        '业务拓展' as bk,
+        IF(GROUPING (sale_type_name) = 1, IFNULL(sale_type_name, '业务拓展合计'),sale_type_name) sale_type_name,
+        '' ,
+        '',
+        ROUND(SUM(IF(use_month = '1', this_month_sa_money, null)), 2) AS month_sa_money_1,
+        ROUND(SUM(IF(`use_month` = '2', this_month_sa_money, null)), 2) AS month_sa_money_2,
+        ROUND(SUM(IF(`use_month` = '3', this_month_sa_money, null)), 2) AS month_sa_money_3,
+        ROUND(SUM(IF(`use_month` = '4', this_month_sa_money, null)), 2) AS month_sa_money_4,
+        ROUND(SUM(IF(`use_month` = '5', this_month_sa_money, null)), 2) AS month_sa_money_5,
+        ROUND(SUM(IF(`use_month` = '6', this_month_sa_money, null)), 2) AS month_sa_money_6,
+        ROUND(SUM(IF(`use_month` = '7', this_month_sa_money, null)), 2) AS month_sa_money_7,
+        ROUND(SUM(IF(`use_month` = '8', this_month_sa_money, null)), 2) AS month_sa_money_8,
+        ROUND(SUM(IF(`use_month` = '9', this_month_sa_money, null)), 2) AS month_sa_money_9,
+        ROUND(SUM(IF(`use_month` = '10', this_month_sa_money, null)), 2) AS month_sa_money_10,
+        ROUND(SUM(IF(`use_month` = '11', this_month_sa_money, null)), 2) AS month_sa_money_11,
+        ROUND(SUM(IF(`use_month` = '12', this_month_sa_money, null)), 2) AS month_sa_money_12,
+        ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
+    FROM
+        new_gr_bi_sa_agg_month_count a
+    WHERE
+        use_year = YEAR(CURDATE())
+      AND sale_type_name in ( '公司出口','委托加工','外贸品种')
+    GROUP BY
+        sale_type_name  WITH ROLLUP
+
+    UNION ALL
+
+    SELECT
+        '其他收入' as bk,
+        '其他收入',
+        '' ,
+        '' ,
+        ROUND(SUM(IF(use_month = '1', this_month_sa_money, null)), 2) AS month_sa_money_1,
+        ROUND(SUM(IF(`use_month` = '2', this_month_sa_money, null)), 2) AS month_sa_money_2,
+        ROUND(SUM(IF(`use_month` = '3', this_month_sa_money, null)), 2) AS month_sa_money_3,
+        ROUND(SUM(IF(`use_month` = '4', this_month_sa_money, null)), 2) AS month_sa_money_4,
+        ROUND(SUM(IF(`use_month` = '5', this_month_sa_money, null)), 2) AS month_sa_money_5,
+        ROUND(SUM(IF(`use_month` = '6', this_month_sa_money, null)), 2) AS month_sa_money_6,
+        ROUND(SUM(IF(`use_month` = '7', this_month_sa_money, null)), 2) AS month_sa_money_7,
+        ROUND(SUM(IF(`use_month` = '8', this_month_sa_money, null)), 2) AS month_sa_money_8,
+        ROUND(SUM(IF(`use_month` = '9', this_month_sa_money, null)), 2) AS month_sa_money_9,
+        ROUND(SUM(IF(`use_month` = '10', this_month_sa_money, null)), 2) AS month_sa_money_10,
+        ROUND(SUM(IF(`use_month` = '11', this_month_sa_money, null)), 2) AS month_sa_money_11,
+        ROUND(SUM(IF(`use_month` = '12', this_month_sa_money, null)), 2) AS month_sa_money_12,
+        ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
+    FROM
+        new_gr_bi_sa_agg_month_count a
+    WHERE
+        use_year = YEAR(CURDATE())
+      AND sale_type_name = '其他收入'
+--     group by sale_type_name
+
+    UNION ALL
+
+    SELECT
+        '总计',
+        '总计',
+        '' ,
+        '',
+        ROUND(SUM(IF(use_month = '1', this_month_sa_money, null)), 2) AS month_sa_money_1,
+        ROUND(SUM(IF(`use_month` = '2', this_month_sa_money, null)), 2) AS month_sa_money_2,
+        ROUND(SUM(IF(`use_month` = '3', this_month_sa_money, null)), 2) AS month_sa_money_3,
+        ROUND(SUM(IF(`use_month` = '4', this_month_sa_money, null)), 2) AS month_sa_money_4,
+        ROUND(SUM(IF(`use_month` = '5', this_month_sa_money, null)), 2) AS month_sa_money_5,
+        ROUND(SUM(IF(`use_month` = '6', this_month_sa_money, null)), 2) AS month_sa_money_6,
+        ROUND(SUM(IF(`use_month` = '7', this_month_sa_money, null)), 2) AS month_sa_money_7,
+        ROUND(SUM(IF(`use_month` = '8', this_month_sa_money, null)), 2) AS month_sa_money_8,
+        ROUND(SUM(IF(`use_month` = '9', this_month_sa_money, null)), 2) AS month_sa_money_9,
+        ROUND(SUM(IF(`use_month` = '10', this_month_sa_money, null)), 2) AS month_sa_money_10,
+        ROUND(SUM(IF(`use_month` = '11', this_month_sa_money, null)), 2) AS month_sa_money_11,
+        ROUND(SUM(IF(`use_month` = '12', this_month_sa_money, null)), 2) AS month_sa_money_12,
+        ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
+    FROM
+        new_gr_bi_sa_agg_month_count a
+    WHERE
+        use_year = YEAR(CURDATE()) and sale_type_name in ( '代理品种','其他收入','自营品种','公司出口','委托加工','外贸品种')
+
+    </select>
 </mapper>
\ No newline at end of file

From 55e47f0165aa454050c2d4f8475ebaa8a6f7f2bc Mon Sep 17 00:00:00 2001
From: king <hfjinsong@163.com>
Date: Sat, 25 Apr 2026 14:58:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enhance/example/report/xtsy/ZhxsqkPluginHZ.java   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginHZ.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginHZ.java
index 7433b7e..0ab0a06 100644
--- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginHZ.java
+++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/ZhxsqkPluginHZ.java
@@ -1,21 +1,12 @@
 
 package com.lideeyunji.core.framework.enhance.example.report.xtsy;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.model.EnhanceReportContext;
 import com.lideeyunji.core.framework.config.aspect.enhancereport.plugin.ReportAroundAdvicePlugin;
-import com.lideeyunji.core.framework.entity.NewGrBiSaAggMonthCount;
-import com.lideeyunji.core.framework.entity.NewGrBiSaAggYearCount;
 import com.lideeyunji.core.framework.service.INewGrBiSaAggMonthCountService;
-import com.lideeyunji.core.framework.service.INewGrBiSaAggYearCountService;
 import com.lideeyunji.tool.framework.yunji.model.ResultDataModel;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -25,8 +16,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static com.lideeyunji.core.framework.enhance.example.report.xtsy.ZhxsqkPlugin.setMonthOrderBy;
-
 /**
  * 报表-综合销售表_剂型-插件
  */