From 241e579be0f2176f5ccb7b5d3b47651ffd285b7d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 14 四月 2025 13:16:10 +0800
Subject: [PATCH] 修改flow
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java | 3 +++
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/WorkTaskDataVo.java | 4 ++++
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java | 7 +++++++
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/mapper/xml/WorkTaskVoMapper.xml | 2 +-
5 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java
index 5c99fc1..2816188 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java
@@ -148,4 +148,7 @@
@ApiModelProperty(value = "澶勭悊鏃堕暱锛堝垎閽燂級")
private transient String duration;
+ @ApiModelProperty("浠诲姟鎻忚堪")
+ private String description;
+
}
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 790a193..2eca38b 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
@@ -4,7 +4,7 @@
<select id="PageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
SELECT
flow_my_business.id,
- flow_my_business.title,
+ flow_my_business.title as 'description',
flow_my_business.proposer,
flow_my_business.task_name,
flow_my_business.task_id,
@@ -55,6 +55,7 @@
fmb.process_definition_key AS 'processDefinitionKey',
fmb.process_definition_id AS 'processDefinitionId',
fmb.proposer,
+ fmb.todo_users,
fmb.task_name,
latest_task.NAME_ AS taskName,
fmb.create_time AS createTime,
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/WorkTaskDataVo.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/WorkTaskDataVo.java
index b8ed938..871bc21 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/WorkTaskDataVo.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/WorkTaskDataVo.java
@@ -90,4 +90,8 @@
@Excel(name = "娴佺▼涓氬姟瀹炰緥id 涓�涓祦绋嬩笟鍔″敮涓�锛屾湰琛ㄤ腑涔熷敮涓�", width = 15)
@ApiModelProperty(value = "娴佺▼涓氬姟瀹炰緥id 涓�涓祦绋嬩笟鍔″敮涓�锛屾湰琛ㄤ腑涔熷敮涓�")
private String processInstanceId;
+
+ @ApiModelProperty("浠诲姟鎻忚堪")
+ private String description;
+
}
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml
index 017f4b5..81e862f 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/mapper/xml/WorkTaskVoMapper.xml
@@ -15,7 +15,7 @@
atask.suspension_state_ AS suspensionState,
atask.ASSIGNEE_ as assignee,
fmb.act_status AS actStatus,
- fmb.title AS title,
+ fmb.title AS 'description',
fmb.data_id AS dataId,
fmb.process_definition_key AS processDefinitionKey,
fmb.process_definition_id AS processDefinitionId,
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 99738f1..83645f3 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
@@ -1050,6 +1050,13 @@
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);
--
Gitblit v1.9.3