From 5450c79246026066978b70be83f08dfcd863d405 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 09 四月 2025 10:12:49 +0800
Subject: [PATCH] 办理任务表单被禁用bug
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 459 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 383 insertions(+), 76 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 65cbd42..4ac381a 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -8,11 +8,13 @@
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.constant.ProcessConstants;
import com.ycl.common.constant.ProcessOverTimeConstants;
+import com.ycl.common.core.domain.AjaxResult;
import com.ycl.common.core.domain.entity.SysDept;
import com.ycl.common.core.domain.entity.SysDictData;
import com.ycl.common.core.domain.entity.SysRole;
import com.ycl.common.core.domain.entity.SysUser;
import com.ycl.common.enums.business.*;
+import com.ycl.common.utils.DateUtils;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.constant.TaskTypeConstant;
import com.ycl.domain.entity.*;
@@ -39,6 +41,7 @@
import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
+import org.flowable.common.engine.impl.persistence.StrongUuidGenerator;
import org.flowable.common.engine.impl.util.CollectionUtil;
import org.flowable.engine.*;
import org.flowable.engine.history.HistoricProcessInstance;
@@ -52,6 +55,7 @@
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
+import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
@@ -435,7 +439,7 @@
Long overtime = getTime(processCoding.getRedTime());
long durationTime = 0l;
if (Objects.nonNull(processCoding.getStartTaskTime())) {
- durationTime = ((new Date()).getTime() - processCoding.getStartTaskTime().getTime()) / 1000;
+ durationTime = DateUtils.getWorkingSed(processCoding.getStartTaskTime(), new Date());
}
if (overtime > durationTime) {
order.setNum((overtime - durationTime) / 3600);
@@ -1616,6 +1620,81 @@
}
/**
+ * 璁剧疆鍘嗗彶浠诲姟淇℃伅
+ *
+ * @param hisTask
+ * @param vo
+ * @param projectId
+ * @param processInsId
+ */
+ private void setHisTaskInfo(HistoricTaskInstance hisTask, CustomerTaskVO vo, String projectId, String processInsId) {
+ // 鏌ュ嚭娴佺▼
+ ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ String deployId = "";
+ String processName = "";
+ String processDefinitionId = "";
+ if (Objects.nonNull(process)) {
+ deployId = process.getDeploymentId();
+ processName = process.getProcessDefinitionName();
+ processDefinitionId = process.getProcessDefinitionId();
+ } else {
+ HistoricProcessInstance hisProcess = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ deployId = hisProcess.getDeploymentId();
+ processName = hisProcess.getProcessDefinitionName();
+ processDefinitionId = hisProcess.getProcessDefinitionId();
+ }
+
+ vo.setProcessInsId(processInsId);
+ vo.setProcessDefId(processDefinitionId);
+ vo.setDeployId(deployId);
+ vo.setTaskName(hisTask.getName());
+ vo.setProcessName(processName);
+
+ // 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
+ List<Long> handlerIds = new ArrayList<>(2);
+ List<String> handlerNames = new ArrayList<>(2);
+ List<Long> handlerUnitIds = new ArrayList<>(2);
+ List<String> handlerUnitNames = new ArrayList<>(2);
+ List<String> promoterNames = new ArrayList<>(2);
+ List<String> promoterUnitNames = new ArrayList<>(2);
+ vo.setHandlerId(handlerIds);
+ vo.setHandlerName(handlerNames);
+ vo.setHandlerUnitId(handlerUnitIds);
+ vo.setHandlerUnitName(handlerUnitNames);
+ vo.setPromoterName(promoterNames);
+ vo.setPromoterUnitName(promoterUnitNames);
+ List<UserTask> targetUserTasks = this.getAllUserTaskElement(processDefinitionId).stream().filter(userTask -> hisTask.getTaskDefinitionKey().equals(userTask.getId())).collect(Collectors.toList());
+ UserTask userTask = null;
+ if (! CollectionUtils.isEmpty(targetUserTasks)) {
+ userTask = targetUserTasks.get(0);
+ }
+ this.setCandidateInfo(userTask, vo, projectId, processInsId);
+
+
+ vo.setTaskStatus(TaskStatusEnum.FINISHED);
+ // 濡傛灉鏄凡瀹屾垚鐨勶紝淇℃伅闇�瑕佸崟鐙祴鍊�
+ vo.setTaskId(hisTask.getId());
+ vo.setExecutionId(hisTask.getExecutionId());
+ vo.setCreateTime(hisTask.getStartTime());
+
+ // 鏌ヨ瀹為檯澶勭悊浜�
+ if (StringUtils.isNotBlank(hisTask.getAssignee())) {
+ long handlerUserId = Long.parseLong(hisTask.getAssignee());
+ SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
+ if (Objects.nonNull(handlerUser)) {
+ vo.getHandlerId().add(handlerUserId);
+ vo.getHandlerName().add(this.getUserShowName(handlerUser));
+ if (Objects.nonNull(handlerUser.getDept())) {
+ vo.getHandlerUnitId().add(handlerUser.getDept().getDeptId());
+ vo.getHandlerUnitName().add(handlerUser.getDept().getDeptName());
+ }
+ }
+ }
+ vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
+ this.distinctVo(vo);
+ }
+
+ /**
* 鐢ㄦ埛鍚嶇О鍚庨潰璺熺數璇濆彿鐮�
*
* @param user
@@ -1664,36 +1743,16 @@
* @return
*/
private Long getOvertimeTaskNum(String processInsId) {
- // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
- List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInsId).list();
-
- if (CollectionUtils.isEmpty(taskList)) {
+ // 鏌ュ嚭宸茶秴鏃剁殑浠诲姟id
+ List<ProcessCoding> overtimeRecords = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ .eq(ProcessCoding::getProcessInsId, processInsId)
+ .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.OVERTIME)
+ .orderByDesc(ProcessCoding::getGmtCreate)
+ .list();
+ if (CollectionUtils.isEmpty(overtimeRecords)) {
return 0L;
}
- List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
- Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
- // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
- List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .eq(ProcessCoding::getProcessInsId, processInsId)
- .in(ProcessCoding::getTaskDefKey, taskKeys)
- .list();
- List<Task> tList = new ArrayList<>();
- // 鍒ゆ柇
- for (String key : taskMap.keySet()) {
- List<ProcessCoding> targetProcessCodings = codeList.stream().filter(code -> key.equals(code.getTaskDefKey())).collect(Collectors.toList());
- // 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
- if (CollectionUtils.isEmpty(targetProcessCodings)) {
- tList.add(taskMap.get(key));
- } else {
- // 鎸夌収鏃堕棿闄嶅簭鎺掑垪
- targetProcessCodings.sort(Comparator.comparing(ProcessCoding::getGmtCreate).reversed());
- ProcessCoding latestProjectProcess = targetProcessCodings.get(0);
- if (Objects.nonNull(latestProjectProcess) && ProcessOverTimeConstants.OVERTIME.equals(latestProjectProcess.getOvertimeStatus())) {
- tList.add(taskMap.get(key));
- }
- }
- }
- return Long.valueOf(taskList.size());
+ return Long.valueOf(overtimeRecords.size());
}
/**
@@ -1712,63 +1771,108 @@
int startNum = pageSize * (pageNum - 1);
int endNum = startNum + pageSize;
- // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
- List<Task> taskList = new ArrayList<>(12);
- if (StringUtils.isNotBlank(taskName)) {
- taskList = taskService.createTaskQuery().processInstanceId(processInsId).taskNameLike(taskName).orderByTaskCreateTime().desc().list();
- } else {
- taskList = taskService.createTaskQuery().processInstanceId(processInsId).orderByTaskCreateTime().desc().list();
- }
- if (CollectionUtils.isEmpty(taskList)) {
+ // 鏌ュ嚭宸茶秴鏃剁殑浠诲姟id
+ List<ProcessCoding> overtimeRecords = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ .eq(ProcessCoding::getProcessInsId, processInsId)
+ .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.OVERTIME)
+ .orderByDesc(ProcessCoding::getGmtCreate)
+ .list();
+ if (CollectionUtils.isEmpty(overtimeRecords)) {
result.total(0);
return new ArrayList<>();
}
- List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
- Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
- // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
- List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .eq(ProcessCoding::getProcessInsId, processInsId)
- .in(ProcessCoding::getTaskDefKey, taskKeys)
- .list();
- List<Task> tList = new ArrayList<>();
- // 鍒ゆ柇
- for (String key : taskMap.keySet()) {
- List<ProcessCoding> targetProcessCodings = codeList.stream().filter(code -> key.equals(code.getTaskDefKey())).collect(Collectors.toList());
- // 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
- if (CollectionUtils.isEmpty(targetProcessCodings)) {
- tList.add(taskMap.get(key));
- } else {
- // 鎸夌収鏃堕棿闄嶅簭鎺掑垪
- targetProcessCodings.sort(Comparator.comparing(ProcessCoding::getGmtCreate).reversed());
- ProcessCoding latestProjectProcess = targetProcessCodings.get(0);
- if (Objects.nonNull(latestProjectProcess) && ProcessOverTimeConstants.OVERTIME.equals(latestProjectProcess.getOvertimeStatus())) {
- tList.add(taskMap.get(key));
- }
- }
- }
-
- if (startNum >= tList.size()) {
+ if (startNum >= overtimeRecords.size()) {
// 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
return new ArrayList<>();
}
- result.total(tList.size());
- int end = Math.min(endNum, tList.size());
- List<Task> pageTaskList = tList.subList(startNum, end);
- List<String> taskDefs = pageTaskList.stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
- Map<String, Task> keyMap = pageTaskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+ result.total(overtimeRecords.size());
+ int end = Math.min(endNum, overtimeRecords.size());
+ List<ProcessCoding> pageOvertimeRecords = overtimeRecords.subList(startNum, end);
- // 寰楀埌鐩爣浠诲姟瀵瑰簲鐨勫畾涔�
- List<UserTask> finishedUserTaskElement = this.getAllUserTaskElement(processDefinitionId).stream().filter(el -> taskDefs.contains(el.getId())).collect(Collectors.toList());
-
- // 鏌ヨ浠诲姟鐩稿叧淇℃伅
- List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
- Task task = keyMap.get(userTask.getId());
+ List<CustomerTaskVO> vos = pageOvertimeRecords.stream().map(record -> {
CustomerTaskVO vo = new CustomerTaskVO();
- this.setRuntimeTaskInfo(task, vo, projectId);
- return vo;
- }).collect(Collectors.toList());
+ Task task = taskService.createTaskQuery().processInstanceId(processInsId).taskId(record.getTaskId()).singleResult();
+ if (Objects.nonNull(task)) {
+ this.setRuntimeTaskInfo(task, vo, projectId);
+ vo.setTaskStatus(TaskStatusEnum.OVER_TIME);
+ return vo;
+ } else {
+ List<HistoricTaskInstance> list = historyService.createHistoricTaskInstanceQuery()
+ .finished()
+ .processInstanceId(processInsId)
+ .taskId(record.getTaskId())
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(list)) {
+ return null;
+ }
+ List<HistoricTaskInstance> hisTask = this.distinctHisTask(list);
+ this.setHisTaskInfo(hisTask.get(0), vo, projectId, processInsId);
+ vo.setTaskStatus(TaskStatusEnum.OVER_TIME_FINISHED);
+ return vo;
+ }
+ }).filter(Objects::nonNull).collect(Collectors.toList());
result.data(vos);
return vos;
+
+// // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
+// List<Task> taskList = new ArrayList<>(12);
+// if (StringUtils.isNotBlank(taskName)) {
+// taskList = taskService.createTaskQuery().processInstanceId(processInsId).taskNameLike(taskName).orderByTaskCreateTime().desc().list();
+// } else {
+// taskList = taskService.createTaskQuery().processInstanceId(processInsId).orderByTaskCreateTime().desc().list();
+// }
+// if (CollectionUtils.isEmpty(taskList)) {
+// result.total(0);
+// return new ArrayList<>();
+// }
+// List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+// Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+// // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
+// List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+// .eq(ProcessCoding::getProcessInsId, processInsId)
+// .in(ProcessCoding::getTaskDefKey, taskKeys)
+// .list();
+// List<Task> tList = new ArrayList<>();
+// // 鍒ゆ柇
+// for (String key : taskMap.keySet()) {
+// List<ProcessCoding> targetProcessCodings = codeList.stream().filter(code -> key.equals(code.getTaskDefKey())).collect(Collectors.toList());
+// // 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
+// if (CollectionUtils.isEmpty(targetProcessCodings)) {
+// tList.add(taskMap.get(key));
+// } else {
+// // 鎸夌収鏃堕棿闄嶅簭鎺掑垪
+// targetProcessCodings.sort(Comparator.comparing(ProcessCoding::getGmtCreate).reversed());
+// ProcessCoding latestProjectProcess = targetProcessCodings.get(0);
+// if (Objects.nonNull(latestProjectProcess) && ProcessOverTimeConstants.OVERTIME.equals(latestProjectProcess.getOvertimeStatus())) {
+// tList.add(taskMap.get(key));
+// }
+// }
+// }
+//
+// if (startNum >= tList.size()) {
+// // 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
+// return new ArrayList<>();
+// }
+// result.total(tList.size());
+// int end = Math.min(endNum, tList.size());
+// List<Task> pageTaskList = tList.subList(startNum, end);
+// List<String> taskDefs = pageTaskList.stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+// Map<String, Task> keyMap = pageTaskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+//
+// // 寰楀埌鐩爣浠诲姟瀵瑰簲鐨勫畾涔�
+// List<UserTask> finishedUserTaskElement = this.getAllUserTaskElement(processDefinitionId).stream().filter(el -> taskDefs.contains(el.getId())).collect(Collectors.toList());
+//
+// // 鏌ヨ浠诲姟鐩稿叧淇℃伅
+// List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
+// Task task = keyMap.get(userTask.getId());
+// CustomerTaskVO vo = new CustomerTaskVO();
+// this.setRuntimeTaskInfo(task, vo, projectId);
+// return vo;
+// }).collect(Collectors.toList());
+// result.data(vos);
+// return vos;
}
/**
@@ -2828,4 +2932,207 @@
private List<Task> getCurrentNodeTaskList(String processInstanceId) {
return taskService.createTaskQuery().processDefinitionId(processInstanceId).list();
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result editFinishedTask(EditFinishedTaskForm form) {
+ List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery().taskId(form.getTaskId()).orderByHistoricTaskInstanceStartTime().desc().list();
+ if (org.apache.commons.collections4.CollectionUtils.isEmpty(hisTasks) || Objects.isNull(hisTasks.get(0))) {
+ return Result.error("浠诲姟涓嶅瓨鍦�");
+ }
+ HistoricTaskInstance task = hisTasks.get(0);
+ ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
+ .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())
+ .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())
+ .one();
+ if (Objects.isNull(projectProcess)) {
+ return Result.error("椤圭洰娴佺▼鏈粦瀹�");
+ }
+ // 鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
+ List<String> dictList = dictTypeService.selectDictDataByType("flow_variables").stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+ Map<String, Object> newV = new HashMap<>(2);
+ if (!org.springframework.util.CollectionUtils.isEmpty(form.getVariables())) {
+ for (String key : form.getVariables().keySet()) {
+ newV.put(task.getTaskDefinitionKey() + "&" + key, form.getVariables().get(key));
+ // 瀛楀吀閲屾湁灏变笉鍋氬鐞�
+ if (!org.apache.commons.collections4.CollectionUtils.isEmpty(dictList) && dictList.contains(key)) {
+ newV.put(key,form.getVariables().get(key));
+ }
+ }
+ }
+ ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
+ Date now = new Date();
+
+ // 1. 琛ㄥ崟鍙橀噺鏇挎崲
+ for (String key : newV.keySet()) {
+ FlowableVarVO var = null;
+ if (Objects.isNull(processInstance)) {
+ // 鏌ヨ鍘嗗彶娴佺▼鍙橀噺
+ var = projectProcessMapper.getHisByteId(projectProcess.getProcessInsId(), key);
+ } else {
+ // 鏌ヨ杩愯鏃舵祦绋嬪彉閲�
+ var = projectProcessMapper.getRuByteId(projectProcess.getProcessInsId(), key);
+ }
+ if (Objects.nonNull(var)) {
+ // 鍏堝垹闄ゅ師鏉ョ殑鍙橀噺锛屽啀鎶婂綋鍓嶇殑淇濆瓨杩涘幓
+ projectProcessMapper.deleteHisFlowableVar(var.getID_());
+ projectProcessMapper.deleteRunFlowableVar(var.getID_());
+ if (StringUtils.isNotBlank(var.getBYTEARRAY_ID_())) {
+ projectProcessMapper.deleteByteArray(var.getID_());
+ }
+ }
+
+ // 淇濆瓨褰撳墠鐨勮〃鍗曟暟鎹�
+ FlowableVarVO run = new FlowableVarVO();
+ FlowableVarVO v = new FlowableVarVO();
+ v.setNAME_(key);
+ v.setPROC_INST_ID_(task.getProcessInstanceId());
+ v.setEXECUTION_ID_(task.getProcessInstanceId());
+ v.setCREATE_TIME_(now);
+ v.setLAST_UPDATED_TIME_(now);
+ v.setID_(new StrongUuidGenerator().getNextId());
+
+ BeanUtils.copyProperties(v, run);
+ run.setID_(new StrongUuidGenerator().getNextId());
+ if (newV.get(key) instanceof String) {
+ v.setVAR_TYPE_("string");
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("string");
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Integer) {
+ v.setVAR_TYPE_("integer");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("integer");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Long) {
+ v.setVAR_TYPE_("long");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("long");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else if (newV.get(key) instanceof Boolean) {
+ v.setVAR_TYPE_("boolean");
+ v.setLONG_((Long) newV.get(key));
+ v.setTEXT_((String) newV.get(key));
+ run.setVAR_TYPE_("boolean");
+ run.setLONG_((Long) newV.get(key));
+ run.setTEXT_((String) newV.get(key));
+ } else {
+ // 鍏跺畠绫诲瀷鐨勮〃鍗曟暟鎹細濡傚浘鐗囥�佹枃浠跺崟鐙瓨琛ㄧ殑銆傚巻鍙层�佽繍琛屼腑鐨勬祦绋嬮渶鍚勫瓨涓�浠�
+ v.setVAR_TYPE_("serializable");
+ v.setBYTEARRAY_ID_(new StrongUuidGenerator().getNextId());
+ projectProcessMapper.insertByteArray(v.getBYTEARRAY_ID_(), 1, "hist.var-" + key, newV.get(key));
+
+ run.setVAR_TYPE_("serializable");
+ run.setBYTEARRAY_ID_(new StrongUuidGenerator().getNextId());
+ projectProcessMapper.insertByteArray(run.getBYTEARRAY_ID_(), 1, "var-" + key, newV.get(key));
+ }
+
+ projectProcessMapper.insertHisFlowableVar(v);
+ projectProcessMapper.insertRunFlowableVar(run);
+
+ }
+ // 2. 浠诲姟鐘舵�佽皟鏁达細浠呮敮鎸� 宸插畬鎴�==銆嬪缂�/璺宠繃 瀹圭己銆�===銆嬭烦杩�
+ if (Objects.nonNull(form.getNowStatus()) && ! Objects.equals(form.getOriginalStatus(), form.getNowStatus())) {
+ if (TaskStatusEnum.FINISHED.equals(form.getOriginalStatus())) {
+ ProcessLog finishedLog = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getTaskId, form.getTaskId())
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.FINISHED)
+ .one();
+ if (Objects.nonNull(finishedLog)) {
+ if (TaskStatusEnum.JUMP.equals(form.getNowStatus())) {
+ // 娣诲姞璺宠繃鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this, null,
+ finishedLog.getUserId(),
+ projectProcess.getProjectId(),
+ projectProcess.getProcessInsId(),
+ form.getTaskId(),
+ task.getTaskDefinitionKey(),
+ task.getName(),
+ ProcessLogEventTypeEnum.JUMP,
+ new JumpData(form.getTaskJumpForm().getDesc())));
+ // 鍒犻櫎鍘熸潵鐨勫畬鎴愭棩蹇�
+ processLogService.removeById(finishedLog.getId());
+ } else if (TaskStatusEnum.WAIT.equals(form.getNowStatus())) {
+ // 娣诲姞瀹圭己鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this, null,
+ finishedLog.getUserId(),
+ projectProcess.getProjectId(),
+ projectProcess.getProcessInsId(),
+ form.getTaskId(),
+ task.getTaskDefinitionKey(),
+ task.getName(),
+ ProcessLogEventTypeEnum.WAIT,
+ new WaitData(form.getTaskWaitForm().getDesc())));
+ // 鍒犻櫎鍘熸潵鐨勫畬鎴愭棩蹇�
+ processLogService.removeById(finishedLog.getId());
+ } else {
+ return Result.error("宸插畬鎴愪换鍔″彧鑳借皟鏁翠负瀹圭己鎴栬烦杩囩姸鎬�");
+ }
+ }
+ }
+ else if (TaskStatusEnum.WAIT.equals(form.getOriginalStatus())) {
+ ProcessLog waitLog = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getTaskId, form.getTaskId())
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.WAIT)
+ .one();
+ if (Objects.nonNull(waitLog)) {
+ if (TaskStatusEnum.JUMP.equals(form.getNowStatus())) {
+ // 娣诲姞璺宠繃鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this, null,
+ waitLog.getUserId(),
+ projectProcess.getProjectId(),
+ projectProcess.getProcessInsId(),
+ form.getTaskId(),
+ task.getTaskDefinitionKey(),
+ task.getName(),
+ ProcessLogEventTypeEnum.JUMP,
+ new JumpData(form.getTaskJumpForm().getDesc())));
+ // 鍒犻櫎鍘熸潵鐨勫缂烘棩蹇�
+ processLogService.removeById(waitLog.getId());
+ } else {
+ return Result.error("瀹圭己浠诲姟鍙兘璋冩暣涓鸿烦杩囩姸鎬�");
+ }
+ }
+ } else if (TaskStatusEnum.JUMP.equals(form.getOriginalStatus())) {
+ ProcessLog jumpLog = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getTaskId, form.getTaskId())
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.JUMP)
+ .one();
+ if (Objects.nonNull(jumpLog)) {
+ if (TaskStatusEnum.WAIT.equals(form.getNowStatus())) {
+ // 娣诲姞瀹圭己鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this, null,
+ jumpLog.getUserId(),
+ projectProcess.getProjectId(),
+ projectProcess.getProcessInsId(),
+ form.getTaskId(),
+ task.getTaskDefinitionKey(),
+ task.getName(),
+ ProcessLogEventTypeEnum.WAIT,
+ new WaitData(form.getTaskWaitForm().getDesc())));
+ // 鍒犻櫎鍘熸潵鐨勮烦杩囨棩蹇�
+ processLogService.removeById(jumpLog.getId());
+ } else {
+ return Result.error("璺宠繃浠诲姟鍙兘璋冩暣涓哄缂轰换鍔�");
+ }
+ }
+ }
+ }
+ // 3. 淇濆瓨淇敼鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this, null,
+ SecurityUtils.getUserId(),
+ projectProcess.getProjectId(),
+ projectProcess.getProcessInsId(),
+ form.getTaskId(),
+ task.getTaskDefinitionKey(),
+ task.getName(),
+ ProcessLogEventTypeEnum.EDIT,
+ null));
+
+ return Result.ok("淇敼鎴愬姛");
+ }
}
--
Gitblit v1.8.0