From db1c3c5b3670639fd1dfc5de0fe75ce6f02f732e Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 31 五月 2023 14:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml | 140 ++++++++++++++++++++++------------------------
1 files changed, 68 insertions(+), 72 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 c11871c..1c52c2b 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
@@ -57,6 +57,7 @@
<result property="customCodeSerialClass" column="CUSTOMCODESERIALCLASS" 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"/>
@@ -70,71 +71,71 @@
</resultMap>
<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.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 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##"
from PL_CODE_BASICSEC
left join pl_code_basicsec btm_codebasicsec_1
on btm_codebasicsec_1.oid = PL_CODE_BASICSEC.parentclassifysecoid
@@ -166,7 +167,7 @@
</select>
- <insert id="insertBatch" keyProperty="oid" useGeneratedKeys="true">
+ <!-- <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,
@@ -194,12 +195,7 @@
#{entity.referattributename}, #{entity.referattributeid}, #{entity.referbtmname}, #{entity.referbtmid}
from dual
</foreach>
- </insert>
-
- <select id="countByCondition" resultType="java.lang.Long">
-
-
- </select>
+ </insert>-->
<select id="getOidByCodeclassifysecOid" resultType="java.lang.String">
SELECT OID
--
Gitblit v1.9.3