From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:22 +0800
Subject: [PATCH] bug列表：181（修复新增，修改，删除接口，新增时没设置默认值，导致在建分类时无法查询到，关键属性查重规则）183（历史数据导入模板下载，过滤掉模板中配置的默认属性）
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 106 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 85 insertions(+), 21 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 7786a94..a604bf7 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">
@@ -45,7 +46,10 @@
</sql>
<select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
- select * from PL_CODE_CLASSIFY where is_deleted = 0
+ select * from PL_CODE_CLASSIFY where
+ <if test="tenantId != null and tenantId != ''">
+ tenant_id = #{tenantId}
+ </if>
</select>
<select id="selectAllLevelChildOid" resultType="java.util.HashMap">
@@ -86,26 +90,28 @@
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
</select>
+ <!--codeclassify0.parentCodeClassifyOid = '${oid}'-->
<select id="selectAllLevelChildHasPath" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
@@ -150,10 +156,13 @@
on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
START WITH
<if test="oid != null ">
- codeclassify0.parentCodeClassifyOid = '${oid}'
+ codeclassify0.parentCodeClassifyOid = #{oid}
</if>
<if test="oid == null ">
codeclassify0.parentCodeClassifyOid is null
+ </if>
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
</if>
CONNECT BY PRIOR codeclassify0.OID = codeclassify0.parentCodeClassifyOid
</select>
@@ -174,8 +183,14 @@
</select>
<select id="selectAllLevelParentByOid" resultType="java.util.HashMap">
- select oid,
- level from pl_code_classify start with oid= #{oid} connect by prior PARENTCODECLASSIFYOID = oid
+ select b.oid as oid,level from
+ pl_code_classify b
+ join (select oid
+ from pl_code_classify
+ start with oid = #{oid}
+ connect by oid = prior PARENTCODECLASSIFYOID) a on b.oid = a.OID
+ start with b.PARENTCODECLASSIFYOID is null
+ connect by prior b.oid = b.PARENTCODECLASSIFYOID
</select>
<select id="getIdPathToNamePathByParentId" resultMap="plCodeClassifyResultMap">
@@ -238,7 +253,6 @@
SYS_CONNECT_BY_PATH(id, '#') as paths
</otherwise>
</choose>
-
from pl_code_classify plcodeclassify
START WITH parentCodeClassifyOid is null
CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
@@ -263,7 +277,7 @@
</select>
<select id="selectCodeClassifyDOByTree" resultMap="plCodeClassifyResultMap">
- select codeclassify0.OWNER as owner,
+ select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
codeclassify0.CREATOR as creator,
codeclassify0.CREATETIME as createtime,
@@ -304,7 +318,7 @@
<if test="tenantId != null and tenantId != ''">
and codeclassify0.tenant_id = #{tenantId}
</if>
- order by lastmodifytime desc
+ order by id asc
</select>
<select id="selectClassifyByKeyAndReseRel" resultMap="plCodeClassifyResultMap">
@@ -360,9 +374,8 @@
<if test="parentOid == null or parentOid == ''">
and codeclassify0.parentcodeclassifyoid is null
</if>
-
<if test="tenantId != null and tenantId != ''">
- codeclassify0.tenant_id = #{tenantId}
+ and codeclassify0.tenant_id = #{tenantId}
</if>
order by id asc
</select>
@@ -407,7 +420,7 @@
</foreach>
</if>
<if test="tenantId != null and tenantId != ''">
- codeclassify0.tenant_id = #{tenantId}
+ and codeclassify0.tenant_id = #{tenantId}
</if>
order by id asc
</select>
@@ -447,11 +460,55 @@
<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>
+
+ <!--鑾峰彇鎵�鏈変笅绾ц妭鐐�,涓嶈鍔ㄨ繖涓柟娉晄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">
@@ -489,7 +546,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">
@@ -510,4 +567,11 @@
</foreach>
;END;
</update>
+
+ <select id="selectAllParents" resultMap="plCodeClassifyResultMap">
+ select * from PL_CODE_CLASSIFY p
+ start with p.OID =#{oid}
+ connect by p.oid = prior p.PARENTCODECLASSIFYOID
+ </select>
+
</mapper>
--
Gitblit v1.9.3