From e81d8f49392ccb01ffecae27a1877113e1451d91 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Tue, 13 Dec 2022 14:58:22 +0800
Subject: [PATCH] =?UTF-8?q?oracle=E3=80=81sqlserver=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/version/CompanyVersionMapper.xml   | 24 ++++++++++++++++++-
 .../service/VersionManageService.java         |  7 ++++++
 .../impl/VersionManageServiceImpl.java        |  5 ++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
index e4c5ee19..967c3914 100644
--- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
+++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
@@ -28,6 +28,15 @@
         from hrmsubcompany_version t where t.subcomid=#{subComId} order by t.version desc limit 1
     </select>
 
+    <select id="getMaxVersion" resultMap="BaseResultMap" parameterType="java.lang.String" databaseId="oracle">
+        select * from (select <include refid="baseColumns"/> from hrmsubcompany_version t where t.subcomid=#{subComId} order by t.version desc) where rownum=1
+    </select>
+    <select id="getMaxVersion" resultMap="BaseResultMap" parameterType="java.lang.String" databaseId="sqlserver">
+        select top  1
+        <include refid="baseColumns"/>
+        from hrmsubcompany_version t where t.subcomid=#{subComId} order by t.version desc
+    </select>
+
     <insert id="insertHrmSubComVersion">
         insert into hrmsubcompany_version
         (subcomid ,subcompanydesc ,subcompanycode ,subcompanyname ,supsubcomid ,
@@ -39,6 +48,12 @@
     <select  id="getMaxDeptVersion" resultType="com.engine.organization.entity.version.HrmDepartmentVersion">
         select * from hrmdepartment_version where departmentid=#{departmentid} order by version desc limit 1
     </select>
+    <select  id="getMaxDeptVersion" resultType="com.engine.organization.entity.version.HrmDepartmentVersion" databaseId="oracle">
+        select * from (select * from hrmdepartment_version where departmentid=#{departmentid} order by version desc) where rownum=1
+    </select>
+    <select  id="getMaxDeptVersion" resultType="com.engine.organization.entity.version.HrmDepartmentVersion" databaseId="sqlserver">
+        select top  1 * from hrmsubcompany_version where departmentid=#{departmentid} order by version desc
+    </select>
 
     <insert id="insertHrmDeptVersion">
         insert into hrmdepartment_version
@@ -49,7 +64,14 @@
     </insert>
     
     <select id="getMaxHrmVersion" resultType="com.engine.organization.entity.version.HrmResourceVersion">
-        select * from hrmresource_version where resourceid=#{resourceid} order by versiiom desc limit 1
+        select * from hrmresource_version where resourceid=#{resourceid} order by version desc limit 1
+    </select>
+    <select id="getMaxHrmVersion" resultType="com.engine.organization.entity.version.HrmResourceVersion" databaseId="oracle">
+        select * from (select * from hrmresource_version where resourceid=#{resourceid} order by version desc) where rownum=1
+    </select>
+    <select id="getMaxHrmVersion" resultType="com.engine.organization.entity.version.HrmResourceVersion" databaseId="sqlserver">
+        select top  1 * from hrmresource_version where resourceid=#{resourceid} order by version desc
+
     </select>
 
     <insert id="insertHrmResourceVersion">
diff --git a/src/com/engine/organization/service/VersionManageService.java b/src/com/engine/organization/service/VersionManageService.java
index f3cb162a..da2e7e8f 100644
--- a/src/com/engine/organization/service/VersionManageService.java
+++ b/src/com/engine/organization/service/VersionManageService.java
@@ -19,4 +19,11 @@ public interface VersionManageService {
      * @param params
      */
     void save(ModuleTypeEnum moduleTypeEnum, Map<String, Object> params, User user);
+
+    /**
+     * 版本记录查询
+     * @param moduleTypeEnum
+     * @param params
+     */
+    Map<String, Object> getVersion(ModuleTypeEnum moduleTypeEnum,Map<String, Object> params);
 }
diff --git a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
index 393f16c9..c87d1ac5 100644
--- a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
+++ b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
@@ -63,6 +63,11 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
 
     }
 
+    @Override
+    public Map<String, Object> getVersion(ModuleTypeEnum moduleTypeEnum, Map<String, Object> params) {
+        return null;
+    }
+
     /**
      * 分部保存至map表
      */