From 8c85bd0ceef4b1c7ba6c6b5a109d15c74d9e0176 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 01 四月 2026 14:14:06 +0800
Subject: [PATCH] 兼容postgresql
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 849b20b..a7079b8 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -93,10 +93,10 @@
TPE.department,
TPE.parent_id,
TPE.year,
- (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.unit) AS unit_name,
- (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TPE.department) AS department_name
+ (SELECT SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = TPE.unit) AS unit_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = TPE.department) AS department_name
FROM t_project_engineering TPE
- INNER JOIN t_project_info TPI ON TPI.id = TPE.project_info_id AND TPI.deleted = 0
+ INNER JOIN t_project_info TPI ON CONCAT('', TPI.id) = CONCAT('', TPE.project_info_id) AND TPI.deleted = 0
WHERE
TPE.parent_id = #{id} and TPE.deleted = 0
ORDER BY
@@ -113,12 +113,12 @@
)
SELECT
TT.id, TT.project_info_id, TT.project_name, TT.project_type, TT.investment_amount, TT.status, TT.unit, TT.department, TT.parent_id, TT.year, TT.gmt_create,TT.build_content,
- (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.unit) AS project_owner_unit_name,
- (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = TT.department) AS competent_department_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = TT.unit) AS project_owner_unit_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = TT.department) AS competent_department_name,
TPP.process_ins_id, TPP.process_def_id
FROM
temp_table TT
- LEFT JOIN t_project_process TPP ON TPP.project_id = TT.id AND TPP.deleted = 0 AND TPP.project_type = 'ENGINEERING'
+ LEFT JOIN t_project_process TPP ON CONCAT('', TPP.project_id) = CONCAT('', TT.id) AND TPP.deleted = 0 AND TPP.project_type = 'ENGINEERING'
ORDER BY
TT.gmt_create DESC
</select>
@@ -142,14 +142,14 @@
TPP.process_def_id,
TPP.process_ins_id,
TPIF.total_investment as investmentAmount,
- (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = PI.project_owner_unit) AS project_owner_unit_name,
- (SELECT SD.dept_name FROM sys_dept SD WHERE SD.dept_id = PI.competent_department) AS competent_department_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = PI.project_owner_unit) AS project_owner_unit_name,
+ (SELECT SD.dept_name FROM sys_dept SD WHERE CONCAT('', SD.dept_id) = PI.competent_department) AS competent_department_name,
d.dept_name as project_owner_unit_name
FROM
t_project_info PI
- LEFT JOIN t_project_investment_funding TPIF ON TPIF.project_id = PI.id AND TPIF.deleted = 0
- LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0
- LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
+ LEFT JOIN t_project_investment_funding TPIF ON CONCAT('', TPIF.project_id) = CONCAT('', PI.id) AND TPIF.deleted = 0
+ LEFT JOIN t_project_process TPP ON CONCAT('', TPP.project_id) = CONCAT('', PI.id) AND TPP.deleted = 0
+ LEFT JOIN sys_dept d ON CONCAT('', d.dept_id) = PI.project_owner_unit
<where>
AND PI.used_status = 2 AND PI.deleted = 0
<if test="query.projectName != null and query.projectName != ''">
@@ -160,7 +160,7 @@
</if>
${query.params.dataScope}
</where>
-
+ ORDER BY PI.gmt_create ASC
</select>
@@ -169,21 +169,36 @@
PI.id, PI.project_name
FROM
t_project_process PP
- INNER JOIN t_project_info PI ON PP.project_id = PI.id AND PI.deleted = 0 AND PP.process_ins_id = #{processInsId}
+ INNER JOIN t_project_info PI ON CONCAT('', PP.project_id) = CONCAT('', PI.id) AND PI.deleted = 0 AND PP.process_ins_id = #{processInsId}
</select>
<select id="getNormalInsIds" resultType="string">
- SELECT TPP.process_ins_id FROM t_project_info TPI INNER JOIN t_project_process TPP ON TPI.id = TPP.project_id AND TPI.deleted = 0 AND TPP.project_type = 'PROJECT'
+ SELECT TPP.process_ins_id FROM t_project_info TPI INNER JOIN t_project_process TPP ON CONCAT('', TPI.id) = CONCAT('', TPP.project_id) AND TPI.deleted = 0 AND TPP.project_type = 'PROJECT'
UNION ALL
- SELECT TPP.process_ins_id FROM t_project_engineering TPE INNER JOIN t_project_process TPP ON TPE.id = TPP.project_id AND TPE.deleted = 0 AND TPP.project_type = 'ENGINEERING'
+ SELECT TPP.process_ins_id FROM t_project_engineering TPE INNER JOIN t_project_process TPP ON CONCAT('', TPE.id) = CONCAT('', TPP.project_id) AND TPE.deleted = 0 AND TPP.project_type = 'ENGINEERING'
</select>
- <select id="getHisByteId" resultType="com.ycl.domain.vo.FlowableVarVO">
+ <resultMap id="flowableVarVOResultMap" type="com.ycl.domain.vo.FlowableVarVO">
+ <id property="ID_" column="ID_"/>
+ <result property="PROC_INST_ID_" column="PROC_INST_ID_"/>
+ <result property="EXECUTION_ID_" column="EXECUTION_ID_"/>
+ <result property="NAME_" column="NAME_"/>
+ <result property="VAR_TYPE_" column="VAR_TYPE_"/>
+ <result property="BYTEARRAY_ID_" column="BYTEARRAY_ID_"/>
+ <result property="DOUBLE_" column="DOUBLE_"/>
+ <result property="LONG_" column="LONG_"/>
+ <result property="TEXT_" column="TEXT_"/>
+ <result property="TEXT2_" column="TEXT2_"/>
+ <result property="CREATE_TIME_" column="CREATE_TIME_"/>
+ <result property="LAST_UPDATED_TIME_" column="LAST_UPDATED_TIME_"/>
+ </resultMap>
+
+ <select id="getHisByteId" resultMap="flowableVarVOResultMap">
SELECT ID_, PROC_INST_ID_, EXECUTION_ID_, NAME_, VAR_TYPE_, BYTEARRAY_ID_ FROM act_hi_varinst WHERE PROC_INST_ID_ = #{processInsId} AND NAME_ = #{keyName}
</select>
- <select id="getRuByteId" resultType="com.ycl.domain.vo.FlowableVarVO">
+ <select id="getRuByteId" resultMap="flowableVarVOResultMap">
SELECT ID_, PROC_INST_ID_, EXECUTION_ID_, NAME_, TYPE_ as VAR_TYPE_, BYTEARRAY_ID_ FROM act_ru_variable WHERE PROC_INST_ID_ = #{processInsId} AND NAME_ = #{keyName}
</select>
@@ -202,4 +217,16 @@
insert into act_ge_bytearray(ID_, REV_, NAME_, BYTES_) values (#{id_}, #{rev_}, #{name_}, #{bytes_, jdbcType=BLOB})
</insert>
+ <delete id="deleteByteArray" parameterType="string">
+ DELETE FROM act_ge_bytearray WHERE ID_ = #{id}
+ </delete>
+
+ <delete id="deleteRunFlowableVar" parameterType="string">
+ DELETE FROM act_ru_variable WHERE ID_ = #{id}
+ </delete>
+
+ <delete id="deleteHisFlowableVar" parameterType="string">
+ DELETE FROM act_hi_varinst WHERE ID_ = #{id}
+ </delete>
+
</mapper>
--
Gitblit v1.8.0