From b34284afa2ff476ca795578d102451868c92b20f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 9 Aug 2024 15:17:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-IT?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1-=E6=AD=A5=E9=AA=A4=E8=BD=AC=E4=BA=A4?= =?UTF-8?q?=E9=A1=BB=E5=8C=BA=E5=88=86=E8=87=AA=E5=B7=B1=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E8=BD=AC=E4=BA=A4=E4=B8=8E=E8=A2=AB=E4=BB=96=E4=BA=BA=E5=B9=B2?= =?UTF-8?q?=E9=A2=84=E8=BD=AC=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1219532453019648]后端-IT服务-步骤转交须区分自己主动转交与被他人干预转交 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1219532453019648 --- .../constvalue/ProcessTaskStepUserStatus.java | 4 +++- .../stephandler/core/ProcessStepHandlerBase.java | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepUserStatus.java b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepUserStatus.java index 80ea17d2..3d0c3fe2 100755 --- a/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepUserStatus.java +++ b/src/main/java/neatlogic/framework/process/constvalue/ProcessTaskStepUserStatus.java @@ -3,7 +3,9 @@ package neatlogic.framework.process.constvalue; public enum ProcessTaskStepUserStatus { DOING("doing", "处理中"), DONE("done", "处理完毕"), - TRANSFERRED("transferred", "已转交"); + TRANSFERRED("transferred", "已转交"), + SOMEONE_TRANSFERRED("someonetransferred", "被转交") + ; private String status; private String text; diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java index 01d2fe5f..fb60dfac 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -1772,7 +1772,11 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { for (ProcessTaskStepUserVo oldUser : oldUserList) { /* 更新处理人状态 **/ oldUser.setUserType(ProcessTaskStepUserType.HISTORY_MAJOR.getValue()); - oldUser.setStatus(ProcessTaskStepUserStatus.TRANSFERRED.getValue()); + if (Objects.equals(oldUser.getUserUuid(), UserContext.get().getUserUuid(true))) { + oldUser.setStatus(ProcessTaskStepUserStatus.TRANSFERRED.getValue()); + } else { + oldUser.setStatus(ProcessTaskStepUserStatus.SOMEONE_TRANSFERRED.getValue()); + } oldUser.setEndTime(new Date()); processTaskCrossoverMapper.insertIgnoreProcessTaskStepUser(oldUser); if (workerUserUuidList.contains(oldUser.getUserUuid())) { @@ -1828,6 +1832,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskStepVo.setStatus(ProcessTaskStepStatus.RUNNING.getValue()); } } + JSONArray oldWorkerList = new JSONArray(); + List processTaskStepWorkerList = processTaskCrossoverMapper.getProcessTaskStepWorkerByProcessTaskIdAndProcessTaskStepId(currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId()); + for (ProcessTaskStepWorkerVo workerVo : processTaskStepWorkerList) { + if (Objects.equals(workerVo.getUserType(), ProcessUserType.MAJOR.getValue())) { + oldWorkerList.add(workerVo.getType() + "#" + workerVo.getUuid()); + } + } + currentProcessTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.WORKERLIST.getOldDataParamName(), oldWorkerList); /* 清空work表，重新写入新数据 **/ processTaskCrossoverMapper.deleteProcessTaskStepWorker(processTaskStepWorkerVo); for (ProcessTaskStepWorkerVo workerVo : workerList) { -- Gitee