From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml b/cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml
index 070c999..299d25d 100644
--- a/cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeTempHumDateMapper.xml
@@ -2,22 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.require.mapper.FeTempHumDateMapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeTempHumDate">
- <id column="date_id" property="dateId" />
- <result column="month_date" property="monthDate" />
- <result column="test_area_name" property="testAreaName" />
- <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="getFeTempHumDate" resultType="com.ruoyi.require.dto.FeTempHumDateDto">
select * from (
- select c.*, u.name create_name
+ select c.*,
+ u.name registrar_user_name,
+ concat('鈮�', cl.temperature_lowest, '&', '鈮�', cl.temperature_highest) temperature_section,
+ concat('鈮�', cl.humidity_lowest, '&', '鈮�', cl.humidity_highest) humidity_section
from cnas_fe_temp_hum_date c
- left join user u on c.create_user = u.id) a
+ left join user u on c.registrar_user_id = u.id
+ left join collect_laboratory cl on cl.laboratory = c.test_area_name) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3