From 780578502875aa0c339cb73f11b1e635df458c77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 28 二月 2024 14:55:05 +0800
Subject: [PATCH] 系统调整
---
data-server/src/main/resources/mapper/DataReportingMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index d7854d0..08cfa56 100644
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ b/data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -114,19 +114,22 @@
</select>
<select id="selectDataComparisonDtoPageList" resultType="com.yuanchu.mom.dto.DataComparisonDto">
- select a.account account,
+ select a.uName account,
a.name name,
a.account_consumption consumption,
- b.account comparisonAccount,
+ a.product,
+ COALESCE(b.uName, #{dataComparisonDto.comparisonName}) comparisonAccount,
b.name comparisonName,
- b.account_consumption comparisonConsumption
+ b.account_consumption comparisonConsumption,
+ b.uDepartment,
+ b.uCompany
from (select dr1.*, user.id uId, user.name uName, user.account
from data_reporting dr1
join user on dr1.create_user = user.id
where date_format(dr1.create_time, '%Y-%m-%d') =
date_format(#{dataComparisonDto.createTime}, '%Y-%m-%d')
and user.name = #{dataComparisonDto.name}) a
- left join (select dr2.*, user.id uId, user.name uName, user.account
+ left join (select dr2.*, user.id uId, user.name uName, user.account,user.department uDepartment,user.company uCompany
from data_reporting dr2
join user on dr2.create_user = user.id
where date_format(dr2.create_time, '%Y-%m-%d') =
@@ -137,4 +140,9 @@
where (a.account_consumption != b.account_consumption
or b.account_consumption is null)
</select>
+ <select id="selectDataReportingForCreateUserNames" resultType="java.lang.String">
+ select distinct u1.name from data_reporting dr
+ left join user u1 on dr.create_user = u1.id
+ where dr.create_time like concat('%', #{time}, '%')
+ </select>
</mapper>
--
Gitblit v1.9.3