From 16d63c3d68d131ad0cc4a8bd9f22a0c0515aa6bf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 18:23:57 +0800
Subject: [PATCH] 工时的各需求+检验任务修改
---
performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
index 4b1b9e4..0f7802d 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
@@ -6,24 +6,25 @@
from (select C.name, C.month, C.manHours + D.manHours as total
from (select A.name,
A.month,
- sum(A.manHour) as manHours
+ FORMAT(SUM(manHour), 4) as manHours
from (
select user.name,
case
when reviewer_nonproductive_time is null then nonproductive_time
else reviewer_nonproductive_time end as manHour,
- date_time as month
+ date_time as month
from auxiliary_working_hours_day awhd
left join user on user.id = awhd.name_user
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>
+ <!--and name_user in(#{ids})-->
+ <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
) A
group by A.name, A.month) C
@@ -33,12 +34,13 @@
B.manHours
from (
select user.name,
- date_time as month,
- sum(output_work_time) as manHours
+ date_time as month,
+ FORMAT(SUM(output_work_time), 4) as manHours
from auxiliary_output_working_hours aowh
left join user on user.id = aowh.`check`
left join department_lims dl on depart_lims_id = dl.id
where date_time LIKE CONCAT('%', #{month}, '%')
+ <!--and `check` in(#{ids})-->
<if test="ids !=null and ids != ''">
and `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
--
Gitblit v1.9.3