From c8355d4a1f27716edc510d936b6a7982b0ab99b3 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 三月 2025 13:37:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
index 110813c..9aee9af 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
@@ -2,11 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.AuxiliaryOriginalHoursMapper">
<select id="totalHours" resultType="java.util.Map">
- select E.name, E.month, E.total
+ select E.name, E.month, E.total manHours
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
@@ -35,7 +35,7 @@
from (
select user.name,
date_time as month,
- sum(output_work_time) as manHours
+ 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
--
Gitblit v1.9.3