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 | 180 +++++++++++++++++++++++++----------------------------------
1 files changed, 76 insertions(+), 104 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 6fd8fa8..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
@@ -4,7 +4,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap type="com.vci.ubcs.code.entity.CodeBasicSec" id="CodeBasicsecMap">
- <result property="oid" column="OID" jdbcType="VARCHAR"/>
+ <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"/>
@@ -55,8 +55,11 @@
<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"/>
@@ -67,79 +70,84 @@
<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">
- 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.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
+ on btm_codebasicsec_1.oid = PL_CODE_BASICSEC.parentclassifysecoid
left join pl_code_classify platformbtm_codeclassify
- on platformbtm_codeclassify.oid = PL_CODE_BASICSEC.refercodeclassifyoid
+ on platformbtm_codeclassify.oid = PL_CODE_BASICSEC.refercodeclassifyoid
<where>
<if test="codeBasicSec.oid != null and codeBasicSec.oid != ''">
and PL_CODE_BASICSEC.OID = #{codeBasicSec.oid}
@@ -148,7 +156,6 @@
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 != ''">
@@ -164,41 +171,6 @@
and PL_CODE_BASICSEC.PKCODERULE = #{codeBasicSec.pkCodeRule}
</if>
</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="countByCondition" resultType="java.lang.Long">
-
</select>
--
Gitblit v1.9.3