From 36ccc814cb2499757a0cfd5525d5e8d0c2309b64 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十一月 2024 16:02:42 +0800
Subject: [PATCH] 企业微信的消息提醒的信息改成单号样品名+检验下单的模版保存,如果存在同名的情况,将原有的情况覆盖掉,并添加提示框+首页展示添加样品名称
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index 532522c..b37e74b 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -28,6 +28,7 @@
from (
select aowh.id,
inspection_item,
+ num,
inspection_item_subclass,
overtime_order_no,
overtime_work_time,
@@ -74,15 +75,10 @@
from(
select user.name,
date_time as month,
- order_no,
- sample,
- man_hour_group,
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
- -- 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}, '%')
<if test="ids !=null and ids != ''">
and `check` in
@@ -90,12 +86,7 @@
#{val}
</foreach>
</if>
- group by user.name,date_time,order_no,
- sample,
- man_hour_group
- order by user.name,date_time,order_no,
- sample,
- man_hour_group
+ order by user.name,date_time
)A
group by A.name,
A.month
--
Gitblit v1.9.3