From b623db3030713d83dac4d90c4f71f4312bd7f9ce Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 29 一月 2024 14:07:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
index f8bfd29..1d91ae5 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
@@ -45,6 +45,7 @@
<if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if>
<if test="equipmentNo != null and equipmentNo != ''"> and equipment_no = #{equipmentNo}</if>
<if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
+ <if test="dateConditions != null and dateConditions != ''"> and collection_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
</select>
--
Gitblit v1.9.3