From a3c746ca3e075c5922ed8b84d01c995628267cf6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 02 十一月 2023 11:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml
index 90ad857..f557aba 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml
@@ -13,7 +13,6 @@
and w.LASTV = '1'
</select>
-
<select id="selectById" resultType="java.lang.String">
${inSql}
</select>
@@ -23,6 +22,10 @@
</select>
<select id="queryCountBySql" resultType="java.lang.Integer">
+ ${inSql}
+ </select>
+
+ <select id="queryCountStringBySql" resultType="java.lang.String">
${inSql}
</select>
@@ -49,6 +52,13 @@
delete from ${tableName} where oid in (${oids})
</insert>
+<!-- <update id="updateByTaleAndOid">-->
+<!-- update ${tableName}-->
+<!-- set lcStatus = #{lcStatus}-->
+<!-- where oid = (${oids})-->
+<!-- </update>-->
+
+
<update id="updateBatchByBaseModel" parameterType="java.util.List" >
BEGIN
<foreach collection="mapList" item="columnMap" index="index" separator=";">
@@ -72,4 +82,13 @@
where nameoid = #{nameoid}
</select>
+ <select id="getCurrentRevision" resultType="map" >
+ select max(revisionSeq) revisionSeq,
+ max(RevisionValue) revisionVal,
+ max(VersionSeq) VersionSeq,
+ max(VersionValue) VersionVal
+ from ${tableName}
+ where nameoid = #{nameoid}
+ </select>
+
</mapper>
--
Gitblit v1.9.3