From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 165 insertions(+), 12 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 761683d..88358b5 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
@@ -47,14 +47,14 @@
<select id="selectAllLevelChildOid" resultType="java.util.HashMap">
select oid, level
from PL_CODE_CLASSIFY
- START WITH parentCodeClassifyOid = #{oid}CONNECT BY
+ START WITH parentCodeClassifyOid = #{oid} CONNECT BY
PRIOR OID = parentCodeClassifyOid
</select>
<select id="checkHasChild" resultType="java.lang.Boolean">
- select count(oid)
+ <![CDATA[select count(oid)
from PL_CODE_CLASSIFY
- where parentCodeClassifyOid = #{oid}
+ where parentCodeClassifyOid = #{oid}]]>
</select>
<select id="selectCodeClassifyVOByTree" resultMap="plCodeClassifyResultMap">
@@ -87,12 +87,11 @@
on codeclassify0.codeKeyAttrRepeatOid = codekeyattrrepeatoid.oid
left join pl_code_resemblerule coderesembleruleoid
on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
- where
<where>
<if test="oid != null and oid != ''">
- codeclassify0.parentcodeclassifyoid = #{oid}
+ codeclassify0.parentcodeclassifyoid = '${oid}'
</if>
- <if test="oid = null or oid = ''">
+ <if test="oid = null">
codeclassify0.parentcodeclassifyoid is null
</if>
</where>
@@ -132,15 +131,169 @@
left join pl_code_resemblerule coderesembleruleoid
on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
START WITH
- <where>
- <if test="oid != null and oid != ''">
- codeclassify0.parentCodeClassifyOid = #{oid}
+ <if test="oid != null ">
+ codeclassify0.parentCodeClassifyOid = '${oid}'
</if>
- <if test="oid = null or oid = ''">
- codeclassify0.parentCodeClassifyOid = is null
+ <if test="oid == null ">
+ codeclassify0.parentCodeClassifyOid is null
</if>
- </where>
CONNECT BY PRIOR codeclassify0.OID = codeclassify0.parentCodeClassifyOid
</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>
+
+ <select id="selectByFieldNamePath" 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.paths as paths
+ from (select plcodeclassify.*,
+ <choose>
+ <when test='fieldName=="name"'>
+ SUBSTR(SYS_CONNECT_BY_PATH(name, '##'),3) as paths
+ </when>
+ <otherwise>
+ SUBSTR(SYS_CONNECT_BY_PATH(id, '##'),3) as paths
+ </otherwise>
+ </choose>
+
+ from pl_code_classify plcodeclassify
+ START WITH parentCodeClassifyOid is null
+ CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
+ where codeclassify0.paths =#{fieldPath}
+ </select>
+
+ <select id="selectByFieldPath" resultType="java.util.HashMap">
+ select *
+ from (select oid, SYS_CONNECT_BY_PATH(id, '/') as paths
+ from pl_code_classify
+ START WITH parentCodeClassifyOid is null
+ CONNECT BY PRIOR OID = parentCodeClassifyOid) a
+ where a.paths = #{fieldPath}
+ </select>
+
+ <select id="selectAllLevelParents" resultType="java.util.HashMap">
+ select oid, id, name, btmtypeid, btmtypename
+ from PL_CODE_CLASSIFY
+ where btmtypeid is not null
+ start with oid = #{oid}
+ connect by prior PARENTCODECLASSIFYOID = oid
+ </select>
+
+ <select id="selectCodeClassifyDOByTree" 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,
+ 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 codeclassify0.lcstatus = #{lcstatus}
+ <if test="parentcodeclassifyoid != null and parentcodeclassifyoid != ''">
+ and codeclassify0.parentcodeclassifyoid = #{parentcodeclassifyoid}
+ </if>
+ <if test="parentcodeclassifyoid == null or parentcodeclassifyoid == ''">
+ and codeclassify0.parentcodeclassifyoid is null
+ and codeclassify0.id = #{id}
+ </if>
+ order by id asc
+ </select>
+
+ <select id="selectCodeClassifyDOByTree" 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,
+ 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 codeclassify0.lcstatus = #{lcstatus}
+ <if test="parentcodeclassifyoid != null and parentcodeclassifyoid != ''">
+ and codeclassify0.parentcodeclassifyoid = #{parentcodeclassifyoid}
+ </if>
+ <if test="parentcodeclassifyoid == null or parentcodeclassifyoid == ''">
+ and codeclassify0.parentcodeclassifyoid is null
+ and codeclassify0.id = #{id}
+ </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>
+
</mapper>
--
Gitblit v1.9.3