From a5b1bad21ba279ade3954852a5e281e9086042f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 15:22:52 +0800
Subject: [PATCH] 前端联调修改2.0
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 109 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 44 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index 228be28..b37e74b 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -4,7 +4,9 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours">
<id column="id" property="id"/>
- <result column="inspect_project" property="inspectProject"/>
+ <result column="inspection_item" property="inspectionItem"/>
+ <result column="inspection_item_subclass" property="inspectionItemSubclass"/>
+ <result column="sample" property="sample"/>
<result column="overtime_order_no" property="overtimeOrderNo"/>
<result column="overtime_work_time" property="overtimeWorkTime"/>
<result column="overtime_amount" property="overtimeAmount"/>
@@ -25,7 +27,9 @@
select *
from (
select aowh.id,
- inspect_project,
+ inspection_item,
+ num,
+ inspection_item_subclass,
overtime_order_no,
overtime_work_time,
overtime_amount,
@@ -36,16 +40,17 @@
date_time,
week,
week_day,
- name
+ name,
+ sample
FROM auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
- WHERE `check` in(#{ids})
- <!--<if test="ids !=null and ids != ''">
- WHERE `check` in
+ WHERE 1=1
+ <if test="ids !=null and ids != ''">
+ and `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
- </if>-->
+ </if>
) A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
@@ -55,46 +60,62 @@
select aowh.*,name
FROM auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
- WHERE `check` in(#{ids})
- <!-- <if test="ids !=null and ids != ''">
- WHERE `check` in
- <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
- #{val}
- </foreach>
- </if>-->
- </select>
- <select id="totalHours" resultType="java.util.Map">
- select A.name,
- A.month,
- A.manHours
- from(
- select user.name,
- date_time as month,
- sum(output_work_time) 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)
- <foreach collection="ids" open="(" separator="," close=")" item="val">
- #{val}
- </foreach>
- </if>-->
- group by user.name,date_time
- order by user.name,date_time
- )A
- </select>
- <select id="selectListByIds" resultType="com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours">
- select * from auxiliary_output_working_hours
- where 1=1
- and `check` in(#{ids})
- <!--<if test="ids !=null and ids != ''">
+ WHERE 1=1
+ <if test="ids !=null and ids != ''">
and `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
- </if>-->
+ </if>
+ </select>
+ <select id="totalHours" resultType="java.util.Map">
+ select A.name,
+ A.month,
+ FORMAT(SUM(A.manHours), 4) manHours
+ from(
+ select user.name,
+ date_time as month,
+ case when #{type}='鍔犵彮宸ユ椂' then case when overtime_work_time is null then 0 else overtime_work_time end
+ else case when work_time is null then 0 else work_time end end as manHours
+ from auxiliary_output_working_hours aowh
+ left join user on user.id=aowh.`check`
+ where date_time LIKE CONCAT('%', #{month}, '%')
+ <if test="ids !=null and ids != ''">
+ and `check` in
+ <foreach collection="ids" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>
+ order by user.name,date_time
+ )A
+ group by A.name,
+ A.month
+ order by A.name,
+ A.month
+ </select>
+ <select id="selectListByIds" resultType="com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours">
+ select * from auxiliary_output_working_hours
+ where 1=1
+ <if test="ids !=null and ids != ''">
+ and `check` in
+ <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>
+ </select>
+
+ <select id="selectLists" resultMap="BaseResultMap">
+ select * from(select * from auxiliary_output_working_hours
+ WHERE 1=1
+ <if test="ids !=null and ids != ''">
+ and `check` in
+ <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>
+ ) A
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3