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 | 37 +++++++------------------------------
1 files changed, 7 insertions(+), 30 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 1c52c2b..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
@@ -55,6 +55,8 @@
<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"/>
@@ -68,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">
@@ -123,6 +127,7 @@
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,
@@ -133,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##"
@@ -166,36 +173,6 @@
</where>
</select>
-
- <!-- <insert id="insertBatch" keyProperty="oid" useGeneratedKeys="true">
- insert into PL_CODE_BASICSEC(REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME,
- LASTMODIFIER, LASTMODIFYTIME, REVISIONRULE, VERSIONRULE, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE,
- LCTID, LCSTATUS, TS, ID, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, SECTYPE, PKCODERULE, ORDERNUM,
- GETVALUECLASS, CODEDATEFORMATSTR, CODESECLENGTHTYPE, CODESECLENGTH, CODELEVELTYPE, CODELEVELVALUE,
- VALUECUTLENGTH, VALUECUTTYPE, CODEGETVALUETYPE, REFERCODECLASSIFYOID, REFERCONFIG, REFERVALUEINFO, FILTERSQL,
- SERIALSTART, SERIALSTEP, CODEFILLTYPE, CODEFILLTYPETEXT, CODEFILLSEPARATOR, CODEFILLLENGTH, CODEFILLLIMIT,
- CODEFILLFLAG, CUSTOMCODESERIALCLASS, MATCHCLASSIFYVALUEFLAG, PARENTCLASSIFYSECOID, NULLABLEFLAG,
- COMPONENTCODEFLAG, SERIALDEPENDFLAG, DISPLAYFLAG, SERIALDEPENDORDER, REFERATTRIBUTENAME, REFERATTRIBUTEID,
- REFERBTMNAME, REFERBTMID)
- <foreach collection="entities" item="entity" separator="union all" index="index">
- select #{entity.revisionoid}, #{entity.nameoid}, #{entity.btmname}, #{entity.lastr}, #{entity.firstr},
- #{entity.lastv}, #{entity.firstv}, #{entity.creator}, #{entity.createtime}, #{entity.lastmodifier},
- #{entity.lastmodifytime}, #{entity.revisionrule}, #{entity.versionrule}, #{entity.revisionseq},
- #{entity.revisionvalue}, #{entity.versionseq}, #{entity.versionvalue}, #{entity.lctid}, #{entity.lcstatus},
- #{entity.ts}, #{entity.id}, #{entity.name}, #{entity.description}, #{entity.owner},
- #{entity.copyfromversion}, #{entity.sectype}, #{entity.pkcoderule}, #{entity.ordernum},
- #{entity.getvalueclass}, #{entity.codedateformatstr}, #{entity.codeseclengthtype}, #{entity.codeseclength},
- #{entity.codeleveltype}, #{entity.codelevelvalue}, #{entity.valuecutlength}, #{entity.valuecuttype},
- #{entity.codegetvaluetype}, #{entity.refercodeclassifyoid}, #{entity.referconfig}, #{entity.refervalueinfo},
- #{entity.filtersql}, #{entity.serialstart}, #{entity.serialstep}, #{entity.codefilltype},
- #{entity.codefilltypetext}, #{entity.codefillseparator}, #{entity.codefilllength}, #{entity.codefilllimit},
- #{entity.codefillflag}, #{entity.customcodeserialclass}, #{entity.matchclassifyvalueflag},
- #{entity.parentclassifysecoid}, #{entity.nullableflag}, #{entity.componentcodeflag},
- #{entity.serialdependflag}, #{entity.displayflag}, #{entity.serialdependorder},
- #{entity.referattributename}, #{entity.referattributeid}, #{entity.referbtmname}, #{entity.referbtmid}
- from dual
- </foreach>
- </insert>-->
<select id="getOidByCodeclassifysecOid" resultType="java.lang.String">
SELECT OID
--
Gitblit v1.9.3