From 7135c1017f16aa5ff5771c53ece1974b5fea01ac Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 22:21:44 +0800
Subject: [PATCH] sql字段
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 8 ++++----
flowable/src/main/java/com/ycl/service/impl/FlowDefinitionServiceImpl.java | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 4de8e29..021bfeb 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -55,7 +55,7 @@
<select id="getPage" resultMap="resultMap">
SELECT
- TPI.*,TPP.process_instance_id as processId,
+ TPI.*,TPP.process_ins_id as processId,
TPIF.total_investment as TPIF_totalInvestment,
TPIF.principal as TPIF_principal,TPIF.government_investment_total as TPIF_government_investment_total,TPIF.central_investment_total as TPIF_central_investment_total,
TPIF.central_budget_investment as TPIF_central_budget_investment,TPIF.central_fiscal_investment as TPIF_central_fiscal_investment,
@@ -144,10 +144,10 @@
and TPI.create_project_time between #{query.projectStartTime} and #{query.projectEndTime}
</if>
<if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'reserve'">
- and TPP.process_instance_id is null
+ and TPP.process_ins_id is null
</if>
<if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
- and TPP.process_instance_id is not null
+ and TPP.process_ins_id is not null
</if>
<if test="query.projectCategory == 3">
and (TPI.project_status = 'working' or TPI.project_status = 'stop')
@@ -157,7 +157,7 @@
</select>
<select id="homeCount" resultType="com.ycl.domain.vo.ProjectVO">
- SELECT TPI.*,TPIF.total_investment,TPP.process_instance_id as processId
+ SELECT TPI.*,TPIF.total_investment,TPP.process_ins_id as processId
FROM t_project_info TPI
LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
diff --git a/flowable/src/main/java/com/ycl/service/impl/FlowDefinitionServiceImpl.java b/flowable/src/main/java/com/ycl/service/impl/FlowDefinitionServiceImpl.java
index f615f80..9f7aca6 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowDefinitionServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowDefinitionServiceImpl.java
@@ -27,6 +27,7 @@
import org.flowable.image.impl.DefaultProcessDiagramGenerator;
import org.flowable.task.api.Task;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.IOException;
@@ -237,9 +238,11 @@
* @param deployId 娴佺▼閮ㄧ讲ID act_ge_bytearray 琛ㄤ腑 deployment_id鍊�
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void delete(String deployId) {
// true 鍏佽绾ц仈鍒犻櫎 ,涓嶈缃細瀵艰嚧鏁版嵁搴撳閿叧鑱斿紓甯�
repositoryService.deleteDeployment(deployId, true);
+ // TODO 鍒犻櫎椤圭洰缁戝畾鐨�
}
--
Gitblit v1.8.0