From 95786582ad848ba99ebcc716c6ecf24e90f8c3d5 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 19 五月 2025 10:29:08 +0800
Subject: [PATCH] 工时添加判断是否有检验值,没有检验值默认填充工时
---
cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml b/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml
index 3a5cfa6..fb79da3 100644
--- a/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml
@@ -3,11 +3,34 @@
<mapper namespace="com.ruoyi.require.mapper.FeTempHumRecordMapper">
<select id="getFeTempHumRecordPage" resultType="com.ruoyi.require.dto.FeTempHumRecordDto">
- select c.*, u1.name afternoon_recorder_user, u2.name morning_recorder_user
+ select c.*,
+ u1.name afternoon_recorder_user,
+ u2.name morning_recorder_user,
+ u1.signature_url afternoon_recorder_url,
+ u2.signature_url morning_recorder_url,
+ cl.temperature_lowest,
+ cl.temperature_highest,
+ cl.humidity_lowest,
+ cl.humidity_highest,
+ cd.test_area_name
from cnas_fe_temp_hum_record c
left join user u1 on u1.id = c.afternoon_recorder_id
left join user u2 on u2.id = c.morning_recorder_id
+ left join cnas_fe_temp_hum_date cd on cd.date_id = c.date_id
+ left join collect_laboratory cl on cl.laboratory = cd.test_area_name
where c.date_id = #{dateId}
- ORDER BY c.temp_hum_id desc
+ ORDER BY c.record_date desc
+ </select>
+
+ <!-- 鏌ヨ鏈夋棩鏈熶絾鏄湭濉啓鍚嶅瓧鐨� -->
+ <select id="selectNoaffirm" resultType="com.ruoyi.require.dto.FeTempHumRecordDto">
+ select cr.*,
+ cd.registrar_user_id,
+ cd.test_area_name
+ from cnas_fe_temp_hum_record cr
+ left join cnas_fe_temp_hum_date cd on cd.date_id = cr.date_id
+ where cr.record_date = #{date}
+ and (morning_test_time is not null and morning_recorder_id is null)
+ and cd.registrar_user_id is not null
</select>
</mapper>
--
Gitblit v1.9.3