From 182b0785c628e6b1134d51985a692d0df7a8fb85 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 16 七月 2024 21:17:22 +0800
Subject: [PATCH] 区间改为&
---
performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
index 04cdf11..11e513f 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
@@ -31,8 +31,9 @@
select awhd.*,name
FROM auxiliary_working_hours_day awhd
left join user on name_user=user.id
+ WHERE 1=1
<if test="ids !=null and ids != ''">
- WHERE name_user in
+ and name_user in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
@@ -46,8 +47,9 @@
select awhd.*,name
FROM auxiliary_working_hours_day awhd
left join user on name_user=user.id
+ WHERE 1=1
<if test="ids !=null and ids != ''">
- WHERE name_user in
+ and name_user in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
@@ -56,6 +58,7 @@
<select id="selectListByIds" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay">
select * from auxiliary_working_hours_day
where 1=1
+
<if test="ids !=null and ids != ''">
and name_user in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
@@ -66,7 +69,7 @@
<select id="totalHours" resultType="java.util.Map">
select A.name,
A.month,
- sum(A.manHour)as manHours
+ FORMAT(SUM(manHour), 2)as manHours
from(
select user.name,
case when reviewer_nonproductive_time is null then nonproductive_time
@@ -77,12 +80,12 @@
left join department_lims dl on depart_lims_id=dl.id
where date_time LIKE CONCAT('%', #{month}, '%')
and awhd.state='宸叉壒鍑�'
- <if test="ids !=null and ids != ''">
- and name_user in
- <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
- #{val}
- </foreach>
- </if>
+ <if test="ids !=null and ids != ''">
+ and name_user in
+ <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>
order by month,user.name
)A
group by A.name,A.month
--
Gitblit v1.9.3