From ac8e8998235f247365280d1a1632115c43b10037 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 17 十一月 2023 02:24:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml |  253 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 170 insertions(+), 83 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
index e2e832a..9ab3d4d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
@@ -3,94 +3,181 @@
 <mapper namespace="com.vci.ubcs.code.mapper.CodeBasicSecMapper">
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="CodeRuleResultMap" type="com.vci.ubcs.code.entity.CodeRule">
-
-
+    <resultMap type="com.vci.ubcs.code.entity.CodeBasicSec" id="CodeBasicsecMap">
+        <result property="oid" column="OID"/>
+        <result property="revisionOid" column="REVISIONOID" jdbcType="VARCHAR"/>
+        <result property="nameOid" column="NAMEOID" jdbcType="VARCHAR"/>
+        <result property="btmname" column="BTMNAME" jdbcType="VARCHAR"/>
+        <result property="lastR" column="LASTR" jdbcType="VARCHAR"/>
+        <result property="firstR" column="FIRSTR" jdbcType="VARCHAR"/>
+        <result property="lastV" column="LASTV" jdbcType="VARCHAR"/>
+        <result property="firstV" column="FIRSTV" jdbcType="VARCHAR"/>
+        <result property="creator" column="CREATOR" jdbcType="VARCHAR"/>
+        <result property="createTime" column="CREATETIME" jdbcType="VARCHAR"/>
+        <result property="lastModifier" column="LASTMODIFIER" jdbcType="VARCHAR"/>
+        <result property="lastModifyTime" column="LASTMODIFYTIME" jdbcType="VARCHAR"/>
+        <result property="revisionRule" column="REVISIONRULE" jdbcType="VARCHAR"/>
+        <result property="versionRule" column="VERSIONRULE" jdbcType="VARCHAR"/>
+        <result property="revisionSeq" column="REVISIONSEQ" jdbcType="INTEGER"/>
+        <result property="revisionValue" column="REVISIONVALUE" jdbcType="VARCHAR"/>
+        <result property="versionSeq" column="VERSIONSEQ" jdbcType="INTEGER"/>
+        <result property="versionValue" column="VERSIONVALUE" jdbcType="VARCHAR"/>
+        <result property="lctid" column="LCTID" jdbcType="VARCHAR"/>
+        <result property="lcStatus" column="LCSTATUS" jdbcType="VARCHAR"/>
+        <result property="ts" column="TS" jdbcType="VARCHAR"/>
+        <result property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="name" column="NAME" jdbcType="VARCHAR"/>
+        <result property="description" column="DESCRIPTION" jdbcType="VARCHAR"/>
+        <result property="owner" column="OWNER" jdbcType="VARCHAR"/>
+        <result property="copyFromVersion" column="COPYFROMVERSION" jdbcType="VARCHAR"/>
+        <result property="secType" column="SECTYPE" jdbcType="VARCHAR"/>
+        <result property="pkCodeRule" column="PKCODERULE" jdbcType="VARCHAR"/>
+        <result property="orderNum" column="ORDERNUM" jdbcType="INTEGER"/>
+        <result property="getValueClass" column="GETVALUECLASS" jdbcType="VARCHAR"/>
+        <result property="codeDateFormatStr" column="CODEDATEFORMATSTR" jdbcType="VARCHAR"/>
+        <result property="codeSecLengthType" column="CODESECLENGTHTYPE" jdbcType="VARCHAR"/>
+        <result property="codeSecLength" column="CODESECLENGTH" jdbcType="VARCHAR"/>
+        <result property="codeLevelType" column="CODELEVELTYPE" jdbcType="VARCHAR"/>
+        <result property="codeLevelValue" column="CODELEVELVALUE" jdbcType="INTEGER"/>
+        <result property="valueCutLength" column="VALUECUTLENGTH" jdbcType="INTEGER"/>
+        <result property="valueCutType" column="VALUECUTTYPE" jdbcType="VARCHAR"/>
+        <result property="codeGetValueType" column="CODEGETVALUETYPE" jdbcType="VARCHAR"/>
+        <result property="referCodeClassifyOid" column="REFERCODECLASSIFYOID" jdbcType="VARCHAR"/>
+        <result property="referConfig" column="REFERCONFIG" jdbcType="VARCHAR"/>
+        <result property="referValueInfo" column="REFERVALUEINFO" jdbcType="VARCHAR"/>
+        <result property="filterSql" column="FILTERSQL" jdbcType="VARCHAR"/>
+        <result property="serialStart" column="SERIALSTART" jdbcType="VARCHAR"/>
+        <result property="serialStep" column="SERIALSTEP" jdbcType="INTEGER"/>
+        <result property="codeFillType" column="CODEFILLTYPE" jdbcType="VARCHAR"/>
+        <result property="codeFillTypeText" column="CODEFILLTYPETEXT" jdbcType="VARCHAR"/>
+        <result property="codeFillSeparator" column="CODEFILLSEPARATOR" jdbcType="VARCHAR"/>
+        <result property="codeFillLength" column="CODEFILLLENGTH" jdbcType="VARCHAR"/>
+        <result property="codeFillLimit" column="CODEFILLLIMIT" jdbcType="INTEGER"/>
+        <result property="codeFillFlag" column="CODEFILLFLAG" jdbcType="VARCHAR"/>
+        <result property="customCodeSerialClass" column="CUSTOMCODESERIALCLASS" jdbcType="VARCHAR"/>
+        <result property="customCodeSerialClassText" column="CUSTOMCODESERIALCLASSTEXT" jdbcType="VARCHAR"/>
+        <result property="customCodeSerialType" column="CUSTOMCODESERIALTYPE" jdbcType="VARCHAR"/>
+        <result property="matchClassifyValueFlag" column="MATCHCLASSIFYVALUEFLAG" jdbcType="VARCHAR"/>
+        <result property="parentClassifySecOid" column="PARENTCLASSIFYSECOID" jdbcType="VARCHAR"/>
+        <result property="parentClassifySecText" column="b__name" jdbcType="VARCHAR"/>
+        <result property="nullableFlag" column="NULLABLEFLAG" jdbcType="VARCHAR"/>
+        <result property="componentCodeFlag" column="COMPONENTCODEFLAG" jdbcType="VARCHAR"/>
+        <result property="serialDependFlag" column="SERIALDEPENDFLAG" jdbcType="VARCHAR"/>
+        <result property="displayFlag" column="DISPLAYFLAG" jdbcType="VARCHAR"/>
+        <result property="serialDependOrder" column="SERIALDEPENDORDER" jdbcType="INTEGER"/>
+        <result property="referAttributeName" column="REFERATTRIBUTENAME" jdbcType="VARCHAR"/>
+        <result property="referAttributeId" column="REFERATTRIBUTEID" jdbcType="VARCHAR"/>
+        <result property="referBtmName" column="REFERBTMNAME" jdbcType="VARCHAR"/>
+        <result property="referBtmId" column="REFERBTMID" jdbcType="VARCHAR"/>
+        <result property="referCodeClassifyOidName" column="c__name" jdbcType="VARCHAR"/>
+        <result property="prefixCode" column="PREFIXCODE" jdbcType="VARCHAR"/>
+        <result property="suffixCode" column="SUFFIXCODE" jdbcType="VARCHAR"/>
     </resultMap>
 
-    <select id="selectCodeBasicSecPage" resultMap="CodeRuleResultMap">
-
-        select PL_CODE_BASICSEC.oid,
-               PL_CODE_BASICSEC.revisionoid,
-               PL_CODE_BASICSEC.nameoid,
-               PL_CODE_BASICSEC.btmname,
-               PL_CODE_BASICSEC.lastr,
-               PL_CODE_BASICSEC.firstr,
-               PL_CODE_BASICSEC.lastv,
-               PL_CODE_BASICSEC.firstv,
-               PL_CODE_BASICSEC.creator,
-               PL_CODE_BASICSEC.createtime,
-               PL_CODE_BASICSEC.lastmodifier,
-               PL_CODE_BASICSEC.lastmodifytime,
-               PL_CODE_BASICSEC.revisionrule,
-               PL_CODE_BASICSEC.versionrule,
-               PL_CODE_BASICSEC.revisionseq,
-               PL_CODE_BASICSEC.revisionvalue,
-               PL_CODE_BASICSEC.versionseq,
-               PL_CODE_BASICSEC.versionvalue,
-               PL_CODE_BASICSEC.lctid,
-               PL_CODE_BASICSEC.lcstatus,
-               PL_CODE_BASICSEC.ts,
-               PL_CODE_BASICSEC.id,
-               PL_CODE_BASICSEC.name,
-               PL_CODE_BASICSEC.description,
-               PL_CODE_BASICSEC.owner,
-               PL_CODE_BASICSEC.copyfromversion,
-               PL_CODE_BASICSEC.codefillseparator,
-               PL_CODE_BASICSEC.codeseclength,
-               PL_CODE_BASICSEC.valuecuttype,
-               PL_CODE_BASICSEC.codefilltype,
-               PL_CODE_BASICSEC.refervalueinfo,
-               PL_CODE_BASICSEC.referattributeid,
-               PL_CODE_BASICSEC.getvalueclass,
-               PL_CODE_BASICSEC.displayflag,
-               PL_CODE_BASICSEC.parentclassifysecoid,
-               PL_CODE_BASICSEC.serialstep,
-               PL_CODE_BASICSEC.serialdependflag,
-               PL_CODE_BASICSEC.filtersql,
-               PL_CODE_BASICSEC.codedateformatstr,
-               PL_CODE_BASICSEC.refercodeclassifyoid,
-               PL_CODE_BASICSEC.codeleveltype,
-               PL_CODE_BASICSEC.codeseclengthtype,
-               PL_CODE_BASICSEC.referattributename,
-               PL_CODE_BASICSEC.referbtmname,
-               PL_CODE_BASICSEC.codefillflag,
-               PL_CODE_BASICSEC.valuecutlength,
-               PL_CODE_BASICSEC.codegetvaluetype,
-               PL_CODE_BASICSEC.referbtmid,
-               PL_CODE_BASICSEC.codefilltypetext,
-               PL_CODE_BASICSEC.codelevelvalue,
-               PL_CODE_BASICSEC.codefilllength,
-               PL_CODE_BASICSEC.customcodeserialclass,
-               PL_CODE_BASICSEC.matchclassifyvalueflag,
-               PL_CODE_BASICSEC.sectype,
-               PL_CODE_BASICSEC.pkcoderule,
-               PL_CODE_BASICSEC.ordernum,
-               PL_CODE_BASICSEC.referconfig,
-               PL_CODE_BASICSEC.serialstart,
-               PL_CODE_BASICSEC.componentcodeflag,
-               PL_CODE_BASICSEC.serialdependorder,
-               PL_CODE_BASICSEC.nullableflag,
-               PL_CODE_BASICSEC.codefilllimit,
-               btm_codebasicsec_1.name       as b__name,
-               platformbtm_codeclassify.name as c__name,
-               COUNT(*) OVER () "##VCI_COUNT_VCI##"
+    <select id="selectCodeBasicSecPage" resultMap="CodeBasicsecMap">
+        SELECT PL_CODE_BASICSEC.oid,
+            PL_CODE_BASICSEC.revisionoid,
+            PL_CODE_BASICSEC.nameoid,
+            PL_CODE_BASICSEC.btmname,
+            PL_CODE_BASICSEC.lastr,
+            PL_CODE_BASICSEC.firstr,
+            PL_CODE_BASICSEC.lastv,
+            PL_CODE_BASICSEC.firstv,
+            PL_CODE_BASICSEC.creator,
+            PL_CODE_BASICSEC.createtime,
+            PL_CODE_BASICSEC.lastmodifier,
+            PL_CODE_BASICSEC.lastmodifytime,
+            PL_CODE_BASICSEC.revisionrule,
+            PL_CODE_BASICSEC.versionrule,
+            PL_CODE_BASICSEC.revisionseq,
+            PL_CODE_BASICSEC.revisionvalue,
+            PL_CODE_BASICSEC.versionseq,
+            PL_CODE_BASICSEC.versionvalue,
+            PL_CODE_BASICSEC.lctid,
+            PL_CODE_BASICSEC.lcstatus,
+            PL_CODE_BASICSEC.ts,
+            PL_CODE_BASICSEC.id,
+            PL_CODE_BASICSEC.name,
+            PL_CODE_BASICSEC.description,
+            PL_CODE_BASICSEC.owner,
+            PL_CODE_BASICSEC.copyfromversion,
+            PL_CODE_BASICSEC.codefillseparator,
+            PL_CODE_BASICSEC.codeseclength,
+            PL_CODE_BASICSEC.valuecuttype,
+            PL_CODE_BASICSEC.codefilltype,
+            PL_CODE_BASICSEC.refervalueinfo,
+            PL_CODE_BASICSEC.referattributeid,
+            PL_CODE_BASICSEC.getvalueclass,
+            PL_CODE_BASICSEC.displayflag,
+            PL_CODE_BASICSEC.parentclassifysecoid,
+            PL_CODE_BASICSEC.serialstep,
+            PL_CODE_BASICSEC.serialdependflag,
+            PL_CODE_BASICSEC.filtersql,
+            PL_CODE_BASICSEC.codedateformatstr,
+            PL_CODE_BASICSEC.refercodeclassifyoid,
+            PL_CODE_BASICSEC.codeleveltype,
+            PL_CODE_BASICSEC.codeseclengthtype,
+            PL_CODE_BASICSEC.referattributename,
+            PL_CODE_BASICSEC.referbtmname,
+            PL_CODE_BASICSEC.codefillflag,
+            PL_CODE_BASICSEC.valuecutlength,
+            PL_CODE_BASICSEC.codegetvaluetype,
+            PL_CODE_BASICSEC.referbtmid,
+            PL_CODE_BASICSEC.codefilltypetext,
+            PL_CODE_BASICSEC.codelevelvalue,
+            PL_CODE_BASICSEC.codefilllength,
+            PL_CODE_BASICSEC.customcodeserialclass,
+            PL_CODE_BASICSEC.customCodeSerialClassText,
+            PL_CODE_BASICSEC.matchclassifyvalueflag,
+            PL_CODE_BASICSEC.sectype,
+            PL_CODE_BASICSEC.pkcoderule,
+            PL_CODE_BASICSEC.ordernum,
+            PL_CODE_BASICSEC.referconfig,
+            PL_CODE_BASICSEC.serialstart,
+            PL_CODE_BASICSEC.componentcodeflag,
+            PL_CODE_BASICSEC.serialdependorder,
+            PL_CODE_BASICSEC.nullableflag,
+            PL_CODE_BASICSEC.codefilllimit,
+            PL_CODE_BASICSEC.prefixcode,
+            PL_CODE_BASICSEC.suffixcode,
+            btm_codebasicsec_1.name as b__name,
+            platformbtm_codeclassify.name as c__name,
+            COUNT(*) OVER () "##VCI_COUNT_VCI##"
         from PL_CODE_BASICSEC
-                 left join PL_CODE_BASICSEC btm_codebasicsec_1
-                           on btm_codebasicsec_1.oid = PL_CODE_BASICSEC.parentclassifysecoid
-                 left join PL_CODE_BASICSEC platformbtm_codeclassify
-                           on platformbtm_codeclassify.oid = PL_CODE_BASICSEC.refercodeclassifyoid
-        where
-          and PL_CODE_BASICSEC.pkcoderule = #{codeBasicSec.pkCodeRule}
-    </select>
-
-
-    <select id="countByCondition" resultType="java.lang.Long">
-
-
-
+            left join pl_code_basicsec btm_codebasicsec_1
+                on btm_codebasicsec_1.oid = PL_CODE_BASICSEC.parentclassifysecoid
+            left join pl_code_classify platformbtm_codeclassify
+                on platformbtm_codeclassify.oid = PL_CODE_BASICSEC.refercodeclassifyoid
+        <where>
+            <if test="codeBasicSec.oid != null and codeBasicSec.oid != ''">
+                and PL_CODE_BASICSEC.OID = #{codeBasicSec.oid}
+            </if>
+            <if test="codeBasicSec.ts != null and codeBasicSec.ts != ''">
+                and PL_CODE_BASICSEC.TS = #{codeBasicSec.ts}
+            </if>
+            <if test="codeBasicSec.id != null and codeBasicSec.id != ''">
+                and PL_CODE_BASICSEC.ID like CONCAT(CONCAT('%', #{codeBasicSec.id}), '%')
+            </if>
+            <if test="codeBasicSec.name != null and codeBasicSec.name != ''">
+                and PL_CODE_BASICSEC.NAME like CONCAT(CONCAT('%', #{codeBasicSec.name}), '%')
+            </if>
+            <if test="codeBasicSec.description != null and codeBasicSec.description != ''">
+                and PL_CODE_BASICSEC.DESCRIPTION like CONCAT(CONCAT('%', #{codeBasicSec.description}), '%')
+            </if>
+            <if test="codeBasicSec.secType != null and codeBasicSec.sectype != ''">
+                and PL_CODE_BASICSEC.SECTYPE = #{codeBasicSec.secType}
+            </if>
+            <if test="codeBasicSec.pkCodeRule != null and codeBasicSec.pkCodeRule != ''">
+                and PL_CODE_BASICSEC.PKCODERULE = #{codeBasicSec.pkCodeRule}
+            </if>
+        </where>
 
     </select>
 
+    <select id="getOidByCodeclassifysecOid" resultType="java.lang.String">
+        SELECT OID
+        FROM PL_CODE_BASICSEC START WITH OID = #{codeClassifySecOid}
+        CONNECT BY PRIOR PARENTCLASSIFYSECOID = OID
+    </select>
 
 </mapper>

--
Gitblit v1.9.3