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/CodeReferConfigMapper.xml | 233 +++++++++++++++++++++++++---------------------------------
1 files changed, 101 insertions(+), 132 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
index f836418..3238bb9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
@@ -46,153 +46,122 @@
<result property="parentValue" column="PARENTVALUE" jdbcType="VARCHAR"/>
<result property="loadType" column="LOADTYPE" jdbcType="VARCHAR"/>
<result property="onlyLeaf" column="ONLYLEAF" jdbcType="VARCHAR"/>
+ <collection property="codeShowFieldConfigs" select="selectShowFieldByReferConfigOid" column="OID" javaType="java.util.ArrayList" ofType="com.vci.ubcs.code.entity.CodeShowFieldConfig">
+ <result property="field" column="FIELD"/>
+ <result property="title" column="TITLE"/>
+ <result property="fieldType" column="FIELDTYPE"/>
+ <result property="sort" column="SORT"/>
+ <result property="attrSortField" column="ATTRSORTFIELD"/>
+ <result property="width" column="WIDTH"/>
+ <result property="fixedPosition" column="FIXEDPOSITION"/>
+ <result property="templet" column="TEMPLET"/>
+ </collection>
+ <collection property="codeSrchCondConfigs" select="selectSrchCondByReferConfigOid" column="OID" javaType="java.util.ArrayList" ofType="com.vci.ubcs.code.entity.CodeSrchCondConfig">
+ <result property="filterField" column="FILTERFIELD"/>
+ <result property="filterType" column="FILTERTYPE"/>
+ <result property="filterValue" column="FILTERVALUE"/>
+ </collection>
</resultMap>
<!--鏌ヨ鍗曚釜-->
<select id="queryById" resultMap="CodeReferconfigMap">
- select
- OID, REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, REFERTYPE, TEXTFIELD, VALUEFIELD, TYPE, URL, BACKPATH, METHOD, HEIGHT, PARAMFORFORMKEY, ISMUTI, MAPFIELDS, REFERCONTENT, DISPLAYTABLE, LIMIT, SORTFIELD, SORTTYPE, PARENTFIELDNAME, PARENTUSEDFIELD, PARENTVALUE, LOADTYPE, ONLYLEAF
+ select OID,
+ REVISIONOID,
+ NAMEOID,
+ BTMNAME,
+ LASTR,
+ FIRSTR,
+ LASTV,
+ FIRSTV,
+ CREATOR,
+ CREATETIME,
+ REVISIONSEQ,
+ REVISIONVALUE,
+ VERSIONSEQ,
+ VERSIONVALUE,
+ LCTID,
+ LCSTATUS,
+ TS,
+ NAME,
+ DESCRIPTION,
+ OWNER,
+ COPYFROMVERSION,
+ ORDERNUM,
+ REFERTYPE,
+ TEXTFIELD,
+ VALUEFIELD,
+ TYPE,
+ URL,
+ BACKPATH,
+ METHOD,
+ HEIGHT,
+ PARAMFORFORMKEY,
+ ISMUTI,
+ MAPFIELDS,
+ REFERCONTENT,
+ DISPLAYTABLE,
+ LIMIT,
+ SORTFIELD,
+ SORTTYPE,
+ PARENTFIELDNAME,
+ PARENTUSEDFIELD,
+ PARENTVALUE,
+ LOADTYPE,
+ ONLYLEAF
from PL_CODE_REFERCONFIG
where OID = #{oid}
</select>
<!--鏌ヨ鎸囧畾琛屾暟鎹�-->
- <select id="queryAllByPage" resultMap="CodeReferconfigMap">
- select
- OID, REVISIONOID, NAMEOID, BTMNAME, LASTR, FIRSTR, LASTV, FIRSTV, CREATOR, CREATETIME, REVISIONSEQ, REVISIONVALUE, VERSIONSEQ, VERSIONVALUE, LCTID, LCSTATUS, TS, NAME, DESCRIPTION, OWNER, COPYFROMVERSION, ORDERNUM, REFERTYPE, TEXTFIELD, VALUEFIELD, TYPE, URL, BACKPATH, METHOD, HEIGHT, PARAMFORFORMKEY, ISMUTI, MAPFIELDS, REFERCONTENT, DISPLAYTABLE, LIMIT, SORTFIELD, SORTTYPE, PARENTFIELDNAME, PARENTUSEDFIELD, PARENTVALUE, LOADTYPE, ONLYLEAF
- from PL_CODE_REFERCONFIG
+ <select id="selectJoinPage" resultMap="CodeReferconfigMap">
+ SELECT
+ PCR.*
+ FROM PL_CODE_REFERCONFIG PCR
<where>
- <if test="oid != null and oid != ''">
- and OID = #{oid}
+ <if test="codeReferConfig.tenantId != null and codeReferConfig.tenantId != ''">
+ PCR.TENANTID = #{codeReferConfig.tenantId}
</if>
- <if test="revisionoid != null and revisionoid != ''">
- and REVISIONOID = #{revisionoid}
+ <if test="codeReferConfig.isOpenGlobal != null and codeReferConfig.isOpenGlobal != ''">
+ OR PCR.ISOPENGLOBAL = #{codeReferConfig.isOpenGlobal}
</if>
- <if test="nameoid != null and nameoid != ''">
- and NAMEOID = #{nameoid}
+ <if test="codeReferConfig.name != null and codeReferConfig.name != ''">
+ and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
</if>
- <if test="btmname != null and btmname != ''">
- and BTMNAME = #{btmname}
- </if>
- <if test="lastr != null and lastr != ''">
- and LASTR = #{lastr}
- </if>
- <if test="firstr != null and firstr != ''">
- and FIRSTR = #{firstr}
- </if>
- <if test="lastv != null and lastv != ''">
- and LASTV = #{lastv}
- </if>
- <if test="firstv != null and firstv != ''">
- and FIRSTV = #{firstv}
- </if>
- <if test="creator != null and creator != ''">
- and CREATOR = #{creator}
- </if>
- <if test="createtime != null and createtime != ''">
- and CREATETIME = #{createtime}
- </if>
- <if test="revisionseq != null">
- and REVISIONSEQ = #{revisionseq}
- </if>
- <if test="revisionvalue != null and revisionvalue != ''">
- and REVISIONVALUE = #{revisionvalue}
- </if>
- <if test="versionseq != null">
- and VERSIONSEQ = #{versionseq}
- </if>
- <if test="versionvalue != null and versionvalue != ''">
- and VERSIONVALUE = #{versionvalue}
- </if>
- <if test="lctid != null and lctid != ''">
- and LCTID = #{lctid}
- </if>
- <if test="lcstatus != null and lcstatus != ''">
- and LCSTATUS = #{lcstatus}
- </if>
- <if test="ts != null and ts != ''">
- and TS = #{ts}
- </if>
- <if test="name != null and name != ''">
- and NAME = #{name}
- </if>
- <if test="description != null and description != ''">
- and DESCRIPTION = #{description}
- </if>
- <if test="owner != null and owner != ''">
- and OWNER = #{owner}
- </if>
- <if test="copyfromversion != null and copyfromversion != ''">
- and COPYFROMVERSION = #{copyfromversion}
- </if>
- <if test="ordernum != null">
- and ORDERNUM = #{ordernum}
- </if>
- <if test="refertype != null and refertype != ''">
- and REFERTYPE = #{refertype}
- </if>
- <if test="textfield != null and textfield != ''">
- and TEXTFIELD = #{textfield}
- </if>
- <if test="valuefield != null and valuefield != ''">
- and VALUEFIELD = #{valuefield}
- </if>
- <if test="type != null and type != ''">
- and TYPE = #{type}
- </if>
- <if test="url != null and url != ''">
- and URL = #{url}
- </if>
- <if test="backpath != null and backpath != ''">
- and BACKPATH = #{backpath}
- </if>
- <if test="method != null and method != ''">
- and METHOD = #{method}
- </if>
- <if test="height != null">
- and HEIGHT = #{height}
- </if>
- <if test="paramforformkey != null and paramforformkey != ''">
- and PARAMFORFORMKEY = #{paramforformkey}
- </if>
- <if test="ismuti != null and ismuti != ''">
- and ISMUTI = #{ismuti}
- </if>
- <if test="mapfields != null and mapfields != ''">
- and MAPFIELDS = #{mapfields}
- </if>
- <if test="refercontent != null and refercontent != ''">
- and REFERCONTENT = #{refercontent}
- </if>
- <if test="displaytable != null and displaytable != ''">
- and DISPLAYTABLE = #{displaytable}
- </if>
- <if test="limit != null and limit != ''">
- and LIMIT = #{limit}
- </if>
- <if test="sortfield != null and sortfield != ''">
- and SORTFIELD = #{sortfield}
- </if>
- <if test="sorttype != null and sorttype != ''">
- and SORTTYPE = #{sorttype}
- </if>
- <if test="parentfieldname != null and parentfieldname != ''">
- and PARENTFIELDNAME = #{parentfieldname}
- </if>
- <if test="parentusedfield != null and parentusedfield != ''">
- and PARENTUSEDFIELD = #{parentusedfield}
- </if>
- <if test="parentvalue != null and parentvalue != ''">
- and PARENTVALUE = #{parentvalue}
- </if>
- <if test="loadtype != null and loadtype != ''">
- and LOADTYPE = #{loadtype}
- </if>
- <if test="onlyleaf != null and onlyleaf != ''">
- and ONLYLEAF = #{onlyleaf}
+ <if test="codeReferConfig.id != null and codeReferConfig.id != ''">
+ and ID like CONCAT(CONCAT('%', #{codeReferConfig.id}), '%')
</if>
</where>
- limit #{pageable.offset}, #{pageable.pageSize}
+ </select>
+
+ <select id="selectShowFieldByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeShowFieldConfig">
+ SELECT temp.* FROM (
+ SELECT
+ PCS.REFERCONFIGOID,
+ PCS.FIELD,
+ PCS.TITLE,
+ PCS.FIELDTYPE,
+ PCS.SORT,
+ PCS.ATTRSORTFIELD,
+ PCS.WIDTH,
+ PCS.FIXEDPOSITION,
+ PCS.TEMPLET,
+ PCS.ISQUERY
+ FROM PL_CODE_REFERCONFIG PCR
+ LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
+ temp WHERE temp.REFERCONFIGOID = #{oid}
+ </select>
+
+ <select id="selectSrchCondByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeSrchCondConfig">
+ SELECT temp.*
+ FROM
+ (SELECT
+ PCSR.FILTERFIELD,
+ PCSR.FILTERTYPE,
+ PCSR.FILTERVALUE,
+ PCSR.REFERCONFIGOID
+ FROM PL_CODE_REFERCONFIG PCR
+ LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
+ temp WHERE temp.REFERCONFIGOID = #{oid}
</select>
</mapper>
--
Gitblit v1.9.3