business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -538,7 +538,7 @@ jsonData.setAfterHandlerIds(afterHandlerIds); jsonData.setAfterHandlerType(form.getPeopleType()); // 添加日志 flowLogService.add(task.getId(), form.getProcessInsId(), FlowLogEventTypeEnum.DELEGATE, form.getProjectId(), JSON.toJSONString(jsonData)); flowLogService.add(task.getId(), task.getProcessInstanceId(), FlowLogEventTypeEnum.DELEGATE, form.getProjectId(), JSON.toJSONString(jsonData)); return Result.ok("转办成功"); } flowable/src/main/java/com/ycl/controller/FlowLogController.java
flowable/src/main/java/com/ycl/domain/entity/FlowLog.java
flowable/src/main/java/com/ycl/domain/query/FlowLogQuery.java
flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java
flowable/src/main/java/com/ycl/mapper/FlowLogMapper.java
flowable/src/main/java/com/ycl/service/FlowLogService.java
File was renamed from business/src/main/java/com/ycl/service/FlowLogService.java @@ -58,4 +58,13 @@ * @return */ Result all(); /** * 判断任务转办过没 * * @param processInstanceId 流程实例id * @param taskId 任务id * @return */ Boolean taskDelegation(String processInstanceId, String taskId); } flowable/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
File was renamed from business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java @@ -1,6 +1,7 @@ package com.ycl.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.ycl.common.enums.business.FlowLogEventTypeEnum; import com.ycl.domain.entity.FlowLog; import com.ycl.mapper.FlowLogMapper; @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.domain.vo.FlowLogVO; import com.ycl.domain.query.FlowLogQuery; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; import com.ycl.framework.utils.PageUtil; @@ -106,4 +108,14 @@ .collect(Collectors.toList()); return Result.ok().data(vos); } @Override public Boolean taskDelegation(String processInstanceId, String taskId) { List<FlowLog> list = new LambdaQueryChainWrapper<>(baseMapper) .eq(FlowLog::getFlowInsId, processInstanceId) .eq(FlowLog::getTaskId, taskId) .eq(FlowLog::getEventType, FlowLogEventTypeEnum.DELEGATE) .list(); return CollectionUtils.isNotEmpty(list); } } flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -28,6 +28,7 @@ import com.ycl.flow.FindNextNodeUtil; import com.ycl.flow.FlowableUtils; import com.ycl.mapper.ProcessCodingMapper; import com.ycl.service.FlowLogService; import com.ycl.service.IFlowTaskService; import com.ycl.service.ISysDeployFormService; import com.ycl.service.ISysFormService; @@ -93,6 +94,7 @@ private final ISysFormService sysFormService; private final TaskCommonService taskCommonService; private final ProcessCodingMapper processCodingMapper; private final FlowLogService flowLogService; /** * 完成审核任务 @@ -136,17 +138,18 @@ if (!org.springframework.util.CollectionUtils.isEmpty(variables)) { for (String key : variables.keySet()) { newV.put(task.getTaskDefinitionKey() + "&" + key, variables.get(key)); // if (ProcessConstants.TASK_FORM_KEY.equals(key)) { // newV.put(task.getTaskDefinitionKey() + "_" + ProcessConstants.TASK_FORM_KEY, variables.get(key)); // } else if (ProcessConstants.WIDGET_LIST.equals(key)){ // newV.put(task.getTaskDefinitionKey() + "_" + ProcessConstants.WIDGET_LIST, variables.get(key)); // } } } taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "完成提交"); // 判断当前任务是不是转办过的 Boolean delegation = flowLogService.taskDelegation(task.getProcessInstanceId(), task.getId()); if (delegation) { taskService.resolveTask(taskId, newV); } // 先让当前用户认领这个任务 taskService.claim(taskId, SecurityUtils.getUserId() + ""); taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "完成提交"); taskService.complete(taskId, newV); return AjaxResult.success("提交成功"); } @@ -1239,21 +1242,22 @@ */ private List<FormDetailVO> getBeforeNodeForm(Map<String, Object> parameters, String formKey, String taskName, String processDefId, String processDefKey, Boolean currentNeedData) { if (!parameters.keySet().stream().anyMatch(key -> key.contains(ProcessConstants.TASK_FORM_KEY))) { FormDetailVO formDetailVO = new FormDetailVO(); formDetailVO.setBeforeNodeName(taskName); formDetailVO.setCurrent(Boolean.TRUE); // 如果是空的，使用formId去查 if (StringUtils.isNotBlank(formKey)) { SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(formKey)); if (Objects.isNull(sysForm)) { throw new RuntimeException("该流程绑定的表单不存在或已被删除"); } FormDetailVO formDetailVO = new FormDetailVO(); Map<String, Object> data = new HashMap<>(1); data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent())); formDetailVO.setFormJsonObj(data); formDetailVO.setBeforeNodeName(taskName); formDetailVO.setCurrent(Boolean.TRUE); return Arrays.asList(formDetailVO); } else { return new ArrayList<>(1); return Arrays.asList(formDetailVO); } } // 这里只需要查自身以及上一个节点(如果并行的有多个)的表单数据 flowable/src/main/resources/mapper/FlowLogMapper.xml
system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -66,6 +66,9 @@ <if test="userName != null and userName != ''"> AND u.user_name like concat('%', #{userName}, '%') </if> <if test="nickName != null and nickName != ''"> AND u.nick_name like concat('%', #{nickName}, '%') </if> <if test="status != null and status != ''"> AND u.status = #{status} </if>
