From 37e3cc168466bbda24c8cd54d5f5b4defde98752 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 10:14:12 +0800
Subject: [PATCH] 工作流已办更改
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java | 26 ++------------------------
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml | 3 ++-
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowTaskDto.java | 2 +-
3 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
index 3449031..24e3fe8 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
@@ -47,7 +47,8 @@
<select id="ListMyBusiness" resultType="org.jeecg.modules.flowable.domain.dto.FlowTaskDto">
SELECT
latest_task.ID_ AS 'taskId',
- latest_task.PROC_DEF_ID_ AS 'procInsId',
+ latest_task.PROC_DEF_ID_ AS 'procInstId',
+ latest_task.PROC_DEF_ID_ AS 'processInstanceId',
ACT_RE_PROCDEF.CATEGORY_ AS 'category',
ACT_RE_PROCDEF.NAME_ AS 'procDefName',
fmb.title AS 'Description',
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowTaskDto.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowTaskDto.java
index 58c7692..1ca3cb8 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowTaskDto.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowTaskDto.java
@@ -78,7 +78,7 @@
private int procDefVersion;
@ApiModelProperty("娴佺▼瀹炰緥ID")
- private String procInsId;
+ private String procInstId;
@ApiModelProperty("鍘嗗彶娴佺▼瀹炰緥ID")
private String hisProcInsId;
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
index 83e2c91..e2d1b79 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
@@ -901,7 +901,7 @@
FlowTaskDto flowTask = new FlowTaskDto();
flowTask.setCreateTime(hisIns.getStartTime());
flowTask.setFinishTime(hisIns.getEndTime());
- flowTask.setProcInsId(hisIns.getId());
+ flowTask.setProcInstId(hisIns.getId());
// 璁＄畻鑰楁椂
if (Objects.nonNull(hisIns.getEndTime())) {
@@ -1122,7 +1122,7 @@
flowTask.setDeployId(pd.getDeploymentId());
flowTask.setProcDefName(pd.getName());
flowTask.setProcDefVersion(pd.getVersion());
- flowTask.setProcInsId(task.getProcessInstanceId());
+ flowTask.setProcInstId(task.getProcessInstanceId());
// 娴佺▼鍙戣捣浜轰俊鎭�
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
@@ -1155,28 +1155,6 @@
String username = iFlowThirdService.getLoginUser().getUsername();
flowMyBusinessDto.setCurrentUser(username);
List<FlowTaskDto> list = flowMyBusinessService.ListMyBusiness(flowMyBusinessDto);
-// list.forEach(flowTaskDto -> {
-// // 娴佺▼鍙戣捣浜轰俊鎭�
-// HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
-// .processInstanceId(flowTaskDto.getProcInsId())
-// .singleResult();
-// if (historicProcessInstance != null) {
-// SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
-// if (startUser != null) {
-// flowTaskDto.setStartUserId(startUser.getUsername());
-// flowTaskDto.setStartUserName(startUser.getRealname());
-// }
-// List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId());
-// flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername, "锛�"));
-// if (flowTaskDto.getTodoUsers() == null) {
-// flowTaskDto.setTodoUsers("");
-// } else {
-// //鍘婚櫎[]
-// flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
-// flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", ""));
-// }
-// }
-// });
IPage<FlowTaskDto> flowTaskDtoIPage = new Page<>();
flowTaskDtoIPage.setRecords(list);
flowTaskDtoIPage.setTotal(page.getTotal());
--
Gitblit v1.9.3