From 450db962c4bc94de0cb0aacf47ba12ec314961d3 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 08 十二月 2023 11:29:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
index b9945a7..09e3ded 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
@@ -31,7 +31,7 @@
<result column="OWNER" property="owner"/>
<result column="COPYFROMVERSION" property="copyFromVersion"/>
<result column="CODEPHASEOID" property="codePhaseOid"/>
- <result column="ATTRIBUTEGROUP" property="attributegroup"/>
+ <result column="ATTRIBUTEGROUP" property="attributeGroup"/>
</resultMap>
<select id="selectCodePhaseattrPage" resultMap="CodePhaseattrResultMap">
@@ -45,36 +45,32 @@
description,
oid,
versionseq,
- checkinby,
revisionrule,
lctid,
id,
owner,
- checkoutby,
creator,
createtime,
- isfirstv,
+ firstv,
attributegroup,
revisionoid,
btmname,
- checkouttime,
revisionvalue,
versionrule,
name,
- islastr,
+ lastr,
lastmodifytime,
copyfromversion,
nameoid,
lcstatus,
- islastv,
- checkintime,
+ lastv,
codephaseoid,
- isfirstr
+ firstr
from PL_CODE_PHASEATTR
where codephaseoid in
- (select oid
- from PL_CODE_TEMPPHASE
- where codeClassifyTemplateOid = #{oid})
+ (select oid
+ from PL_CODE_TEMPPHASE
+ where codeClassifyTemplateOid = #{oid})
</select>
<select id="selectByPhaseaIds" resultMap="CodePhaseattrResultMap">
@@ -84,31 +80,27 @@
description,
oid,
versionseq,
- checkinby,
revisionrule,
lctid,
id,
owner,
- checkoutby,
creator,
createtime,
- isfirstv,
+ firstv,
attributegroup,
revisionoid,
btmname,
- checkouttime,
revisionvalue,
versionrule,
name,
- islastr,
+ lastr,
lastmodifytime,
copyfromversion,
nameoid,
lcstatus,
- islastv,
- checkintime,
+ lastv,
codephaseoid,
- isfirstr
+ firstr
from PL_CODE_PHASEATTR
where codephaseoid in
(#{oids})
--
Gitblit v1.9.3