From e395049f60b14ffbc89c98ad3d6f322d6878e6a7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 01 十一月 2023 19:31:20 +0800
Subject: [PATCH] bug列表156（主数据数据更改时，数据版本规则未按照规则升版）bug修改，157（数据更改，第二次对数据进行更改时，报错的bug，业务逻辑存在问题）
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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 eadd7d1..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=";">
@@ -63,4 +73,22 @@
END;
</update >
+ <select id="getNextRevision" resultType="map" >
+ select max(revisionSeq) + 1 revisionSeq,
+ max(RevisionValue) + 1 revisionVal,
+ max(VersionSeq) + 1 VersionSeq,
+ max(VersionValue) + 1 VersionVal
+ from ${tableName}
+ 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