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 |    5 +++++
 1 files changed, 5 insertions(+), 0 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 76c9657..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
@@ -56,6 +56,7 @@
         <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"/>
@@ -69,6 +70,8 @@
         <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="CodeBasicsecMap">
@@ -135,6 +138,8 @@
             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##"

--
Gitblit v1.9.3