From 9cead0735df7fd763f536408f76dec4e5e5bb2c7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 12:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 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 876b2c9..fafbdbf 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
@@ -38,6 +38,7 @@
<result column="CODEKEYATTRREPEATOID" property="codeKeyAttrRepeatOid"/>
<result column="CODERESEMBLERULEOID" property="codeResembleRuleOid"/>
<result column="TENANT_ID" property="tenantId"/>
+ <result column="TOTAL" property="total"/>
</resultMap>
<sql id="tableName">
@@ -89,21 +90,22 @@
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
+ 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="oid != null and oid != ''">
- codeclassify0.parentcodeclassifyoid = '${oid}'
+ and codeclassify0.parentcodeclassifyoid = ${oid}
</if>
<if test="oid = null">
- codeclassify0.parentcodeclassifyoid is null
+ and codeclassify0.parentcodeclassifyoid is null
</if>
<if test="tenantId != null and tenantId != ''">
- codeclassify0.tenant_id = #{tenantId}
+ and codeclassify0.tenant_id = #{tenantId}
</if>
</where>
order by lastmodifytime asc
@@ -293,7 +295,28 @@
codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
- coderesembleruleoid.name as codeResembleRuleOidName
+ coderesembleruleoid.name as codeResembleRuleOidName,
+ (
+ SELECT
+ COUNT(*)
+ FROM
+ ${tableName}
+ WHERE
+ CODECLSFID IN (
+ SELECT
+ oid
+ FROM
+ PL_CODE_CLASSIFY
+ WHERE
+ lcstatus = 'Enabled'
+ START WITH
+ OID = codeclassify0.OID
+ CONNECT BY
+ PRIOR OID = parentCodeClassifyOid
+ )
+ AND lastr = '1'
+ AND lastv = '1'
+ ) AS total
from pl_code_classify codeclassify0
left join pl_code_rule coderuleoid
on codeclassify0.codeRuleOid = coderuleoid.oid
@@ -459,6 +482,50 @@
</if>
order by id asc
</select>
+ <!--鑾峰彇鎵�鏈変笅绾ц妭鐐�,涓嶈鍔ㄨ繖涓柟娉晄ql-->
+ <select id="selectAllClassifyByOid" 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 codeclassify0.oid=codeclassify0.PARENTCODECLASSIFYOID
+ </select>
+
+ <select id="selectStartWithCurrentOid" resultMap="plCodeClassifyResultMap">
+ select * from <include refid="tableName"/>
+ start with oid = #{oid}
+ connect by prior oid = parentcodeclassifyoid;
+ </select>
<select id="selectAllParenClassifytByOid" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
@@ -495,7 +562,7 @@
<if test="tenantId != null and tenantId != ''">
and codeclassify0.tenant_id = #{tenantId}
</if>
- connect by prior PARENTCODECLASSIFYOID = codeclassify0.oid
+ connect by prior codeclassify0.PARENTCODECLASSIFYOID = codeclassify0.oid
</select>
<select id="selectStartWithCurrentOid" resultMap="plCodeClassifyResultMap">
--
Gitblit v1.9.3