From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
index 48b7a4a..476beb0 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
@@ -57,8 +57,7 @@
</select>
<select id="selectListByIds" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay">
select * from auxiliary_working_hours_day
- where 1=1
-
+ where state='宸插鏍�'
<if test="ids !=null and ids != ''">
and name_user in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
@@ -69,7 +68,7 @@
<select id="totalHours" resultType="java.util.Map">
select A.name,
A.month,
- sum(A.manHour)as manHours
+ FORMAT(SUM(manHour), 4)as manHours
from(
select user.name,
case when reviewer_nonproductive_time is null then nonproductive_time
@@ -91,4 +90,19 @@
group by A.name,A.month
order by A.name,A.month
</select>
+
+ <select id="selectLists" resultMap="BaseResultMap">
+ select * from(select * from auxiliary_working_hours_day
+ WHERE 1=1
+ <if test="ids !=null and ids != ''">
+ and name_user 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