From 4208d7f9407ab7c9d6b756f5f8a7616b7686fc74 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 12:40:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 57 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 76cb9cc..6d2babb 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,12 +13,27 @@
           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">
+        ${inSql}
+    </select>
+
+    <select id="queryCountBySql" resultType="java.lang.Integer">
+        ${inSql}
+    </select>
+
+    <select id="queryCountStringBySql" resultType="java.lang.String">
         ${inSql}
     </select>
 
@@ -41,9 +56,32 @@
         </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})
     </insert>
+
+<!--    <update id="updateByTaleAndOid">-->
+<!--        update ${tableName}-->
+<!--            set lcStatus = #{lcStatus}-->
+<!--        where oid = (${oids})-->
+<!--    </update>-->
+
 
     <update  id="updateBatchByBaseModel"  parameterType="java.util.List" >
         BEGIN
@@ -59,4 +97,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