From b463880866cb946b824e989667ff3f0c0faf22f6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 14 七月 2025 17:09:33 +0800
Subject: [PATCH] art: 我的待办-查询问题修正
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java | 44 +++++++++++-----------
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml | 28 ++++++--------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 2 -
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowTaskDto.java | 6 +++
4 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
index e0dcd6d..f3cf21d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -446,8 +446,6 @@
}
orderDetailService.updateBatchById(collect);
values.put("NextAssignee", userApprovalList);
- entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
- values.put("NextAssignee", userApprovalList);
entity.setOtherCheckCompleted(CommonConstant.STATUS_1);
}
}
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 2eca38b..3449031 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
@@ -46,8 +46,8 @@
<select id="ListMyBusiness" resultType="org.jeecg.modules.flowable.domain.dto.FlowTaskDto">
SELECT
- fmb.task_id AS 'taskId',
- fmb.process_instance_id AS 'procInsId',
+ latest_task.ID_ AS 'taskId',
+ latest_task.PROC_DEF_ID_ AS 'procInsId',
ACT_RE_PROCDEF.CATEGORY_ AS 'category',
ACT_RE_PROCDEF.NAME_ AS 'procDefName',
fmb.title AS 'Description',
@@ -55,16 +55,14 @@
fmb.process_definition_key AS 'processDefinitionKey',
fmb.process_definition_id AS 'processDefinitionId',
fmb.proposer,
- fmb.todo_users,
- fmb.task_name,
+-- fmb.todo_users,
+-- fmb.task_name,
latest_task.NAME_ AS taskName,
- fmb.create_time AS createTime,
- latest_task.END_TIME_ AS finishTime
+-- fmb.create_time AS createTime,
+ latest_task.END_TIME_ AS finishTime,
+ latest_task.TASK_DEF_KEY_ AS taskDefKey
FROM
- flow_my_business fmb
- LEFT JOIN ACT_RE_PROCDEF ON fmb.process_definition_id = ACT_RE_PROCDEF.ID_
- LEFT JOIN ACT_HI_PROCINST ON fmb.process_instance_id = ACT_HI_PROCINST.ID_
- LEFT JOIN (
+ (
SELECT
*,
ROW_NUMBER() OVER (
@@ -80,13 +78,11 @@
AND END_TIME_ <= #{dto.endTime}
</if>
) latest_task
- ON fmb.process_instance_id = latest_task.PROC_INST_ID_
- AND latest_task.rn = 1
- WHERE
+ LEFT JOIN (select DISTINCT process_definition_key, process_definition_id, process_instance_id, title, data_id, proposer from flow_my_business) fmb ON fmb.process_instance_id = latest_task.PROC_INST_ID_
+ LEFT JOIN ACT_RE_PROCDEF ON fmb.process_definition_id = ACT_RE_PROCDEF.ID_
+ LEFT JOIN ACT_HI_PROCINST ON fmb.process_instance_id = ACT_HI_PROCINST.ID_
+ WHERE latest_task.rn = 1
<!-- 鍔ㄦ�佹潯浠剁粺涓�浣跨敤 dto -->
- <if test="dto.currentUser != null and dto.currentUser != ''">
- fmb.done_users like concat('%',#{dto.currentUser},'%')
- </if>
<if test="dto.category != null and dto.category != ''">
AND ACT_RE_PROCDEF.CATEGORY_ = #{dto.category}
</if>
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 6775bed..58c7692 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
@@ -45,9 +45,11 @@
private String assigneeName;
@ApiModelProperty("娴佺▼鍙戣捣浜篒d")
+ @Deprecated //涓嶉噰鐢ㄦ娴佺▼鍙戣捣浜�
private String startUserId;
@ApiModelProperty("娴佺▼鍙戣捣浜哄悕绉�")
+ @Deprecated //涓嶉噰鐢ㄦ娴佺▼鍙戣捣浜�
private String startUserName;
@ApiModelProperty("娴佺▼绫诲瀷")
@@ -118,4 +120,8 @@
@ApiModelProperty(value = "褰撳墠鐨勮妭鐐瑰彲浠ュ鐞嗙殑鐢ㄦ埛鍚�")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String todoUsers;
+
+ @ApiModelProperty("娴佺▼鍙戣捣浜哄悕绉�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String proposer;
}
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 fb5e489..f46e803 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
@@ -1150,28 +1150,28 @@
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("\"", ""));
- }
- }
- });
+// 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