From fb5a9f2aa4dab720ff32ac229ac68f98de532a2a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 15 四月 2024 18:32:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml |   42 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 37 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 eb6db99..3c1db79 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
@@ -2,7 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vci.ubcs.code.mapper.CommonsMapper">
 
-
     <select id="selectByCount" resultType="java.util.Map">
         select COUNT(w.OID) count
         from ${tableName} w
@@ -15,6 +14,14 @@
 
     <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">
@@ -48,6 +55,22 @@
         </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>
@@ -74,10 +97,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