From 93c7226d536d312fc083a57619629192ba076413 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 01 十二月 2023 12:36:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 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 47f27e2..2f65641 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,9 +13,16 @@
and w.LASTV = '1'
</select>
-
<select id="selectById" resultType="java.lang.String">
${inSql}
+ </select>
+
+ <select id="selectList" resultType="java.lang.String">
+ ${inSql}
+ </select>
+
+ <select id="selectCountByTableName" resultType="java.lang.String">
+ select COUNT(*) FROM ${tableName}
</select>
<select id="selectBySql" resultType="java.util.Map">
@@ -23,6 +30,10 @@
</select>
<select id="queryCountBySql" resultType="java.lang.Integer">
+ ${inSql}
+ </select>
+
+ <select id="queryCountStringBySql" resultType="java.lang.String">
${inSql}
</select>
@@ -44,6 +55,22 @@
from dual
</foreach>
</insert>
+
+ <!--<insert id="insertByBaseModel" parameterType="java.util.Map">
+ <foreach collection="mapList" item="value" index="key" separator=",">
+ insert into ${tableName} (
+ <foreach collection="columnMap" item="value" index="key" separator=",">
+ ${key}
+ </foreach>
+ )
+ <foreach collection="mapList" item="columnMap" separator=" union all ">
+ select <foreach collection="columnMap" item="value" index="key" separator=",">
+ #{value}
+ </foreach>
+ from dual
+ </foreach>
+ </foreach>
+ </insert>-->
<insert id="deleteByTaleAndOid" >
delete from ${tableName} where oid in (${oids})
@@ -71,10 +98,19 @@
</update >
<select id="getNextRevision" resultType="map" >
- select max(revisionSeq) + 1 revisionSeq,
- max(RevisionValue) + 1 revisionVal,
- max(VersionSeq) + 1 VersionSeq,
- max(VersionValue) + 1 VersionVal
+ 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>
--
Gitblit v1.9.3