From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 73bd4ac..9e6172d 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>
@@ -197,7 +197,7 @@
</set>
<where>
- COMPANY_ID_ = #{param.companyId},
+ COMPANY_ID_ = #{param.companyId}
AND ID_ = #{param.id}
</where>
</update>
--
Gitblit v1.9.3