From 51ec98113c6d49d0f7eec4e3c030e55e337e97db Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 五月 2025 15:47:16 +0800
Subject: [PATCH] 芯导软件（江苏）有限公司 delete
---
performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
index 1e9a012..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
@@ -18,13 +18,13 @@
left join department_lims dl on depart_lims_id = dl.id
where date_time LIKE CONCAT('%', #{month}, '%')
and awhd.state='宸叉壒鍑�'
- and name_user in(#{ids})
- <!-- <if test="ids !=null and ids != ''">
+ <!--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>-->
+ </if>
order by month
) A
group by A.name, A.month) C
@@ -35,18 +35,18 @@
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
where date_time LIKE CONCAT('%', #{month}, '%')
- and `check` in(#{ids})
- <!--<if test="ids !=null and ids != ''">
+ <!--and `check` in(#{ids})-->
+ <if test="ids !=null and ids != ''">
and `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
- </if>-->
+ </if>
group by user.name, month
order by user.name, month
) B
--
Gitblit v1.9.3