From 893d4fad6e5612ea01c8dab60a89187136ebd23b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 30 一月 2026 15:31:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml | 4 ++--
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 8 ++++----
src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml | 2 +-
src/main/resources/mapper/safe/SafeTrainingMapper.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 7046102..2ed16a4 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -38,11 +38,11 @@
<if test="deviceMaintenanceDto.maintenanceActuallyName != null">
and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
</if>
- <if test="deviceMaintenanceDto.maintenancePlanTimeReq != null">
- and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTimeReq},'%')
+ <if test="deviceMaintenanceDto.maintenancePlanTime != null">
+ and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTime},'%')
</if>
- <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null">
- and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%')
+ <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
+ and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTime},'%')
</if>
<if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
and dm.maintenance_actually_time >= str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d')
diff --git a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
index 705d516..e4200af 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
@@ -15,7 +15,7 @@
next_date,
record_date,
CASE
- WHEN next_date >= DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
+ WHEN most_date >= DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
ELSE 2
END AS status,
create_user,
@@ -56,4 +56,4 @@
</where>
ORDER BY update_time DESC
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml b/src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml
index c96d711..7300cf0 100644
--- a/src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml
@@ -30,7 +30,7 @@
left join safe_training st on std.safe_training_id = st.id
where std.user_id = #{c.userId}
<if test="c.trainingDate != null">
- and st.training_date = #{c.trainingDate}
+ and st.training_date = date_format(#{c.trainingDate},'%Y%m%d')
</if>
</select>
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index 1ae5159..dac3417 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -41,8 +41,8 @@
<if test="c.placeTraining != null and c.placeTraining != ''">
and st.place_training like concat('%', #{c.placeTraining}, '%')
</if>
- <if test="c.trainingDate != null and c.trainingDate != ''">
- and st.training_date = #{c.trainingDate}
+ <if test="c.trainingDate != null ">
+ and st.training_date = date_format(#{c.trainingDate},'%Y%m%d')
</if>
</select>
<select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
--
Gitblit v1.9.3