From c428cfbdb79fdbb6b61ff10db62426d567e664a8 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 17 七月 2024 16:37:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index aca6fec..de3994d 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -35,7 +35,7 @@
output_work_time,
date_time,
week,
- week_day,
+ SUBSTRING(week_day, 2) AS week_day,
name
FROM auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
@@ -70,7 +70,7 @@
from(
select user.name,
date_time as month,
- sum(output_work_time) as manHours
+ FORMAT(SUM(output_work_time), 2) 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
--
Gitblit v1.9.3