From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:36:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index b824b24..ce2d3ab 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -104,14 +104,14 @@
<if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
<if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
+ UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
+ UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
</if>
AND PROGRESS_ = 'RECORD'
AND RECORD_STATUS_ != 'DEL'
- ORDER BY COMPLETE_TIME_
+ ORDER BY UPDATE_TIME_
</where>
</select>
@@ -536,10 +536,10 @@
<if test="param.foodVariety != null and param.foodVariety != ''">AND FOOD_VARIETY_ = #{param.foodVariety}</if>
<if test="param.id != null and param.id != ''">AND NOTICE_ID_ = #{param.id}</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]> #{param.start}
+ UPDATE_TIME_ <![CDATA[ > ]]> #{param.start}
</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]> #{param.end}
+ UPDATE_TIME_ <![CDATA[ < ]]> #{param.end}
</if>
</select>
--
Gitblit v1.9.3