From 32f4bb41c82ded759e7db18c9fa449b1442f15c8 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 21 六月 2023 16:39:12 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 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 88358b5..027e480 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
@@ -122,7 +122,14 @@
                codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
                coderesembleruleoid.name as codeResembleRuleOidName,
                level as datalevel,
-               SYS_CONNECT_BY_PATH(codeclassify0.id, '#') as path
+                <choose>
+                    <when test='fieldInPath=="name"'>
+                        SYS_CONNECT_BY_PATH(codeclassify0.name, '#')   as path
+                    </when>
+                    <otherwise>
+                        SYS_CONNECT_BY_PATH(codeclassify0.id, '#')   as path
+                    </otherwise>
+                </choose>
         from pl_code_classify codeclassify0
                  left join pl_code_rule coderuleoid
                            on codeclassify0.codeRuleOid = coderuleoid.oid
@@ -140,10 +147,58 @@
         CONNECT BY PRIOR codeclassify0.OID = codeclassify0.parentCodeClassifyOid
     </select>
 
+    <select id="selectByIdRel" resultMap="plCodeClassifyResultMap">
+        select pc.*,
+               pk.name codeKeyAttrRepeatOidName,
+               pr.name codeResembleRuleOidName,
+               pu.name coderuleoidName
+        from pl_code_classify pc
+                 left join pl_code_keyattrrepeat pk
+                           on pc.codekeyattrrepeatoid = pk.oid
+                 left join pl_code_resemblerule pr
+                           on pc.coderesembleruleoid = pr.oid
+                 left join pl_code_rule pu
+                           on pc.coderuleoid = pu.oid
+        where pc.oid = #{oid}
+    </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="getIdPathToNamePathByParentId"  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.namePath                 as namepath,
+        codeclassify0.idPath                 as idpath
+        from (select plcodeclassify.*,
+                SYS_CONNECT_BY_PATH(name, '#')   as namePath,
+                SYS_CONNECT_BY_PATH(id, '#')   as idPath
+        from pl_code_classify  plcodeclassify
+        START WITH parentCodeClassifyOid is null
+        CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
+        where codeclassify0.paths =#{fieldPath}
+    </select>
+
 
     <select id="selectByFieldNamePath"  resultMap="plCodeClassifyResultMap">
         select codeclassify0.OWNER                 as owner,
@@ -169,10 +224,10 @@
         from (select plcodeclassify.*,
                 <choose>
                      <when test='fieldName=="name"'>
-                         SUBSTR(SYS_CONNECT_BY_PATH(name, '##'),3)   as paths
+                         SYS_CONNECT_BY_PATH(name, '#')   as paths
                      </when>
                     <otherwise>
-                        SUBSTR(SYS_CONNECT_BY_PATH(id, '##'),3)   as paths
+                        SYS_CONNECT_BY_PATH(id, '#')   as paths
                     </otherwise>
                 </choose>
 
@@ -184,7 +239,7 @@
 
     <select id="selectByFieldPath" resultType="java.util.HashMap">
         select *
-        from (select oid, SYS_CONNECT_BY_PATH(id, '/') as paths
+        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

--
Gitblit v1.9.3