From e72766e5c5cceae416c0fa17ef075a01cd3fd396 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 八月 2025 09:34:34 +0800
Subject: [PATCH] 检验任务筛选增加人员字段+检验和复核支持样品编号的修改
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index 97ff05d..9742929 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"/>
@@ -16,16 +18,19 @@
<result column="week" property="week"/>
<result column="week_day" property="weekDay"/>
<result column="check" property="check"/>
+ <result column="name" property="name"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="create_user" property="createUser"/>
<result column="update_user" property="updateUser"/>
</resultMap>
- <select id="selectAuxiliaryOutputWorkingHours" resultType="com.yuanchu.mom.dto.AuxiliaryOutputWorkingHoursDto">
+ <select id="selectAuxiliaryOutputWorkingHours" resultMap="BaseResultMap">
select *
from (
select aowh.id,
- inspect_project,
+ inspection_item,
+ num,
+ inspection_item_subclass,
overtime_order_no,
overtime_work_time,
overtime_amount,
@@ -36,26 +41,29 @@
date_time,
week,
week_day,
- name
+ name,
+ sample
FROM auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
+ WHERE 1=1
<if test="ids !=null and ids != ''">
- WHERE `check` in
+ and `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
</if>
- ) data
+ ) A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
- <select id="selectDataByUser" resultType="com.yuanchu.mom.dto.AuxiliaryOutputWorkingHoursDto">
+ <select id="selectDataByUser" resultMap="BaseResultMap">
select aowh.*,name
FROM auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
+ WHERE 1=1
<if test="ids !=null and ids != ''">
- WHERE `check` in
+ and `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
@@ -64,24 +72,27 @@
<select id="totalHours" resultType="java.util.Map">
select A.name,
A.month,
- A.manHours
+ FORMAT(SUM(A.manHours), 4) manHours
from(
select user.name,
date_time as month,
- sum(output_work_time) as manHours
+ 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`
- left join department_lims dl on depart_lims_id=dl.id
where date_time LIKE CONCAT('%', #{month}, '%')
<if test="ids !=null and ids != ''">
and `check` in
- <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ <foreach collection="ids" open="(" separator="," close=")" item="val">
#{val}
</foreach>
</if>
- group by user.name,month
- order by month,user.name
+ 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
@@ -93,4 +104,19 @@
</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