From 052b2ca7c925b8e1ff26a7f568196da538e1f4e8 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 24 Feb 2025 09:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=97=A5=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BA=8B=E4=B8=9A=E9=83=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportcenter/biz/dailyreport/DailyReportMapper.java   | 1 +
 .../reportcenter/biz/dailyreport/DailyReportMapper.xml    | 8 ++++++++
 .../reportcenter/biz/dailyreport/DailyReportService.java  | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java
index dfcedeb91c..5a12848c45 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java
@@ -56,6 +56,7 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
     List<DailyReportVo> selectReport2New(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
     List<BrandVo> list2(String date);
+    List<BrandVo> list2New(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
     List<BrandVo> list3(@Param("date") String date, @Param("busOrgSid") String busOrgSid);
     List<BrandVo> list3New(@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("busOrgSid") String busOrgSid);
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index a250aaf351..e8d1d4abaa 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -707,6 +707,14 @@
         order by dr.busOrgSid desc
     </select>
 
+    <select id="list2New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
+        select dr.busOrgSid linkSid, dr.busOrgName name, '1' as colspan
+        from daily_report dr
+        where createTime between #{startDate} and #{endDate}
+        group by dr.busOrgSid
+        order by dr.busOrgSid desc
+    </select>
+
     <select id="list3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
         select dr.useOrgSid linkSid, dr.useOrgName name, '1' as colspan
         from daily_report dr
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
index 0b1b477f72..f9a634be71 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
@@ -2313,11 +2313,11 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
         DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
         dailyReportAppVo.setTitle("集团（事业部）" + date + "日报");
-        List<BrandVo> rows1 = baseMapper.list2(date);
-        rows1.removeAll(Collections.singleton(null));
-        dailyReportAppVo.setRow1(rows1);
         String startDate = date + " 00:00:00";
         String endDate = date + " 23:59:59";
+        List<BrandVo> rows1 = baseMapper.list2New(startDate,endDate);
+        rows1.removeAll(Collections.singleton(null));
+        dailyReportAppVo.setRow1(rows1);
         List<DailyReportVo> dailyReportVoList = baseMapper.selectReport2New(startDate, endDate);
         List<String> row4 = dailyReportVoList.stream().map(v -> {
             String saleOfStockRatio = "";