From 6b6acb4f91f7dcd3ba03652e7546ff06b0b58a28 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 23 四月 2024 02:42:47 +0800
Subject: [PATCH] 功能调整

---
 data-server/src/main/resources/mapper/DataReportingMapper.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index 65a8d00..b4173fb 100644
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ b/data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -78,7 +78,8 @@
         date_format(create_time, '%Y-%m-%d')    create_time,
         create_user
         from data_reporting
-        group by name2,product, date_format(create_time, '%Y-%m-%d')
+        where create_time &gt;= #{startTime} and create_time &lt;= #{endTime}
+        group by department,product, date_format(create_time, '%Y-%m')
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
@@ -162,4 +163,16 @@
         left join user u1 on dr.create_user = u1.id
         where dr.create_time like concat('%', #{time}, '%')
     </select>
+
+    <select id="selectDataReportingForProduct" resultType="java.lang.String">
+        select distinct product from data_reporting
+        where create_time like concat('%', #{time}, '%')
+    </select>
+
+    <select id="getUserNameById" resultType="java.lang.String">
+        select account from user where id = #{id}
+    </select>
+    <select id="getUserDepartmentById" resultType="java.lang.String">
+        select department from user where id = #{id}
+    </select>
 </mapper>

--
Gitblit v1.9.3