From ce5dce2d7f6eefbbe863d99e8adfa5d4ed5e229a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 05 九月 2023 13:10:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 203 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 180 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index a022dc6..7786a94 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -37,8 +37,12 @@
<result column="CODERULEOID" property="codeRuleOid"/>
<result column="CODEKEYATTRREPEATOID" property="codeKeyAttrRepeatOid"/>
<result column="CODERESEMBLERULEOID" property="codeResembleRuleOid"/>
+ <result column="TENANT_ID" property="tenantId"/>
</resultMap>
+ <sql id="tableName">
+ pl_code_classify
+ </sql>
<select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
select * from PL_CODE_CLASSIFY where is_deleted = 0
@@ -77,6 +81,7 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -94,8 +99,11 @@
<if test="oid = null">
codeclassify0.parentcodeclassifyoid is null
</if>
+ <if test="tenantId != null and tenantId != ''">
+ codeclassify0.tenant_id = #{tenantId}
+ </if>
</where>
- order by id asc
+ order by lastmodifytime asc
</select>
<select id="selectAllLevelChildHasPath" resultMap="plCodeClassifyResultMap">
@@ -170,7 +178,6 @@
level from pl_code_classify start with oid= #{oid} connect by prior PARENTCODECLASSIFYOID = oid
</select>
-
<select id="getIdPathToNamePathByParentId" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
@@ -200,7 +207,6 @@
START WITH oid = #{parentId}
CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
</select>
-
<select id="selectByFieldNamePath" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
@@ -276,6 +282,7 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -294,10 +301,28 @@
and codeclassify0.parentcodeclassifyoid is null
and codeclassify0.id = #{id}
</if>
- order by id asc
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
+ </if>
+ order by lastmodifytime desc
</select>
- <select id="selectCodeClassifyDOByTree" resultMap="plCodeClassifyResultMap">
+ <select id="selectClassifyByKeyAndReseRel" resultMap="plCodeClassifyResultMap">
+ SELECT PCC.*,
+ PCK.NAME AS CODEKEYATTRREPEATOIDNAME,
+ PCR.NAME AS CODERESEMBLERULEOIDNAME,
+ PCE.NAME CODERULEOIDNAME
+ FROM PL_CODE_CLASSIFY PCC
+ LEFT JOIN PL_CODE_KEYATTRREPEAT PCK
+ ON PCC.CODEKEYATTRREPEATOID = PCK.OID
+ LEFT JOIN PL_CODE_RESEMBLERULE PCR
+ ON PCC.CODERESEMBLERULEOID = PCR.OID
+ LEFT JOIN PL_CODE_RULE PCE
+ ON PCC.CODERULEOID = PCE.OID
+ WHERE PCC.OID IN (${oids})
+ </select>
+
+ <select id="selectCodeClassifyDOByParentId" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
codeclassify0.CREATOR as creator,
@@ -317,6 +342,52 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
+ coderuleoid.name as codeRuleOidName,
+ codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
+ coderesembleruleoid.name as codeResembleRuleOidName
+ from pl_code_classify codeclassify0
+ left join pl_code_rule coderuleoid
+ on codeclassify0.codeRuleOid = coderuleoid.oid
+ left join pl_code_keyattrrepeat codekeyattrrepeatoid
+ on codeclassify0.codeKeyAttrRepeatOid = codekeyattrrepeatoid.oid
+ left join pl_code_resemblerule coderesembleruleoid
+ on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
+ where 1=1
+ <if test="parentOid != null and parentOid != ''">
+ and codeclassify0.parentcodeclassifyoid = #{parentOid}
+ </if>
+ <if test="parentOid == null or parentOid == ''">
+ and codeclassify0.parentcodeclassifyoid is null
+ </if>
+
+ <if test="tenantId != null and tenantId != ''">
+ codeclassify0.tenant_id = #{tenantId}
+ </if>
+ order by id asc
+ </select>
+
+ <select id="getRMLibByName" resultMap="plCodeClassifyResultMap">
+ select codeclassify0.OWNER as owner,
+ codeclassify0.BTMTYPEID as btmtypeid,
+ codeclassify0.CREATOR as creator,
+ codeclassify0.CREATETIME as createtime,
+ codeclassify0.LASTMODIFIER as lastmodifier,
+ codeclassify0.DESCRIPTION as description,
+ codeclassify0.ORDERNUM as ordernum,
+ codeclassify0.CODERULEOID as coderuleoid,
+ codeclassify0.OID as oid,
+ codeclassify0.BTMNAME as btmname,
+ codeclassify0.BTMTYPENAME as btmtypename,
+ codeclassify0.CODEKEYATTRREPEATOID as codekeyattrrepeatoid,
+ codeclassify0.PARENTCODECLASSIFYOID as parentcodeclassifyoid,
+ codeclassify0.NAME as name,
+ codeclassify0.LASTMODIFYTIME as lastmodifytime,
+ codeclassify0.ID as id,
+ codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
+ codeclassify0.LCSTATUS as lcstatus,
+ codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -328,29 +399,115 @@
left join pl_code_resemblerule coderesembleruleoid
on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
where codeclassify0.lcstatus = #{lcstatus}
- <if test="parentcodeclassifyoid != null and parentcodeclassifyoid != ''">
- and codeclassify0.parentcodeclassifyoid = #{parentcodeclassifyoid}
+ and codeclassify0.parentcodeclassifyoid is null
+ <if test="libNames != null and ! libNames.isEmpty() and libNames.size() > 0">
+ and codeclassify0.name in
+ <foreach item="item" index="index" collection="libNames" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
- <if test="parentcodeclassifyoid == null or parentcodeclassifyoid == ''">
- and codeclassify0.parentcodeclassifyoid is null
- and codeclassify0.id = #{id}
+ <if test="tenantId != null and tenantId != ''">
+ codeclassify0.tenant_id = #{tenantId}
</if>
order by id asc
</select>
- <select id="selectClassifyByKeyAndReseRel" resultMap="plCodeClassifyResultMap">
- SELECT PCC.*,
- PCK.NAME AS CODEKEYATTRREPEATOIDNAME,
- PCR.NAME AS CODERESEMBLERULEOIDNAME,
- PCE.NAME CODERULEOIDNAME
- FROM PL_CODE_CLASSIFY PCC
- LEFT JOIN PL_CODE_KEYATTRREPEAT PCK
- ON PCC.CODEKEYATTRREPEATOID = PCK.OID
- LEFT JOIN PL_CODE_RESEMBLERULE PCR
- ON PCC.CODERESEMBLERULEOID = PCR.OID
- LEFT JOIN PL_CODE_RULE PCE
- ON PCC.CODERULEOID = PCE.OID
- WHERE PCC.OID IN (${oids})
+ <select id="getRMTypeByDesc" resultMap="plCodeClassifyResultMap">
+ select codeclassify0.OWNER as owner,
+ codeclassify0.BTMTYPEID as btmtypeid,
+ codeclassify0.CREATOR as creator,
+ codeclassify0.CREATETIME as createtime,
+ codeclassify0.LASTMODIFIER as lastmodifier,
+ codeclassify0.DESCRIPTION as description,
+ codeclassify0.ORDERNUM as ordernum,
+ codeclassify0.CODERULEOID as coderuleoid,
+ codeclassify0.OID as oid,
+ codeclassify0.BTMNAME as btmname,
+ codeclassify0.BTMTYPENAME as btmtypename,
+ codeclassify0.CODEKEYATTRREPEATOID as codekeyattrrepeatoid,
+ codeclassify0.PARENTCODECLASSIFYOID as parentcodeclassifyoid,
+ codeclassify0.NAME as name,
+ codeclassify0.LASTMODIFYTIME as lastmodifytime,
+ codeclassify0.ID as id,
+ codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
+ codeclassify0.LCSTATUS as lcstatus,
+ codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
+ coderuleoid.name as codeRuleOidName,
+ codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
+ coderesembleruleoid.name as codeResembleRuleOidName
+ from pl_code_classify codeclassify0
+ left join pl_code_rule coderuleoid
+ on codeclassify0.codeRuleOid = coderuleoid.oid
+ left join pl_code_keyattrrepeat codekeyattrrepeatoid
+ on codeclassify0.codeKeyAttrRepeatOid = codekeyattrrepeatoid.oid
+ left join pl_code_resemblerule coderesembleruleoid
+ on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
+ where 1=1 and codeclassify0.lcstatus = #{lcstatus}
+ <if test="desc != null">
+ and codeclassify0.DESCRIPTION = #{desc}
+ </if>
+
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
+ </if>
+ order by id asc
</select>
+ <select id="selectAllParenClassifytByOid" resultMap="plCodeClassifyResultMap">
+ select codeclassify0.OWNER as owner,
+ codeclassify0.BTMTYPEID as btmtypeid,
+ codeclassify0.CREATOR as creator,
+ codeclassify0.CREATETIME as createtime,
+ codeclassify0.LASTMODIFIER as lastmodifier,
+ codeclassify0.DESCRIPTION as description,
+ codeclassify0.ORDERNUM as ordernum,
+ codeclassify0.CODERULEOID as coderuleoid,
+ codeclassify0.OID as oid,
+ codeclassify0.BTMNAME as btmname,
+ codeclassify0.BTMTYPENAME as btmtypename,
+ codeclassify0.CODEKEYATTRREPEATOID as codekeyattrrepeatoid,
+ codeclassify0.PARENTCODECLASSIFYOID as parentcodeclassifyoid,
+ codeclassify0.NAME as name,
+ codeclassify0.LASTMODIFYTIME as lastmodifytime,
+ codeclassify0.ID as id,
+ codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
+ codeclassify0.LCSTATUS as lcstatus,
+ codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
+ coderuleoid.name as codeRuleOidName,
+ codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
+ coderesembleruleoid.name as codeResembleRuleOidName
+ from pl_code_classify codeclassify0
+ left join pl_code_rule coderuleoid
+ on codeclassify0.codeRuleOid = coderuleoid.oid
+ left join pl_code_keyattrrepeat codekeyattrrepeatoid
+ on codeclassify0.codeKeyAttrRepeatOid = codekeyattrrepeatoid.oid
+ left join pl_code_resemblerule coderesembleruleoid
+ on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
+ start with codeclassify0.oid=#{oid}
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
+ </if>
+ connect by prior PARENTCODECLASSIFYOID = codeclassify0.oid
+ </select>
+
+ <select id="selectStartWithCurrentOid" resultMap="plCodeClassifyResultMap">
+ select * from <include refid="tableName"/>
+ start with oid = #{oid}
+ connect by prior oid = parentcodeclassifyoid;
+ </select>
+
+ <update id="batchUpdateLcStatus" parameterType="java.util.List">
+ BEGIN
+ <foreach collection="records" item="item" index="index" separator=";">
+ update <include refid="tableName"/> set
+ lcstatus = #{item.lcStatus},
+ ts = #{item.ts},
+ lastModifyTime = #{item.lastModifyTime},
+ lastModifier = #{item.lastModifier}
+ where oid = #{item.oid,jdbcType=VARCHAR}
+ </foreach>
+ ;END;
+ </update>
</mapper>
--
Gitblit v1.9.3