abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复 变量名修改错误

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-12-15 18:13:51 +08:00
parent a0bf365f32
commit 87afa637ba
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
View File

@ -37,7 +37,7 @@ public class CompleteTaskBo implements Serializable {
/** /**
* 抄送人员 * 抄送人员
*/ */
private List<FlowCopy> FlowCopyList; private List<FlowCopy> flowCopyList;
/** /**
* 消息类型 * 消息类型

24
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@ -135,7 +135,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
List<String> messageType = completeTaskBo.getMessageType(); List<String> messageType = completeTaskBo.getMessageType();
String notice = completeTaskBo.getNotice(); String notice = completeTaskBo.getNotice();
// 获取抄送人 // 获取抄送人
List<FlowCopy> FlowCopyList = completeTaskBo.getFlowCopyList(); List<FlowCopy> flowCopyList = completeTaskBo.getFlowCopyList();
FlowTask flowTask = flowTaskMapper.selectById(taskId); FlowTask flowTask = flowTaskMapper.selectById(taskId);
Instance ins = insService.getById(flowTask.getInstanceId()); Instance ins = insService.getById(flowTask.getInstanceId());
// 获取流程定义信息 // 获取流程定义信息
@ -153,7 +153,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
flowParams.hisTaskExt(completeTaskBo.getFileId()); flowParams.hisTaskExt(completeTaskBo.getFileId());
// 执行任务跳转，并根据返回的处理人设置下一步处理人 // 执行任务跳转，并根据返回的处理人设置下一步处理人
setHandler(taskService.skip(taskId, flowParams), flowTask, FlowCopyList); setHandler(taskService.skip(taskId, flowParams), flowTask, flowCopyList);
// 消息通知 // 消息通知
WorkflowUtils.sendMessage(definition.getFlowName(), ins.getId(), messageType, notice); WorkflowUtils.sendMessage(definition.getFlowName(), ins.getId(), messageType, notice);
return true; return true;
@ -168,14 +168,14 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
* *
* @param instance 实例 * @param instance 实例
* @param task (当前任务)未办理的任务 * @param task (当前任务)未办理的任务
* @param FlowCopyList 抄送人 * @param flowCopyList 抄送人
*/ */
private void setHandler(Instance instance, FlowTask task, List<FlowCopy> FlowCopyList) { private void setHandler(Instance instance, FlowTask task, List<FlowCopy> flowCopyList) {
if (instance == null) { if (instance == null) {
return; return;
} }
//添加抄送人 //添加抄送人
setCopy(task, FlowCopyList); setCopy(task, flowCopyList);
// 根据流程实例ID查询所有关联的任务 // 根据流程实例ID查询所有关联的任务
List<FlowTask> flowTasks = selectByInstId(instance.getId()); List<FlowTask> flowTasks = selectByInstId(instance.getId());
List<User> userList = new ArrayList<>(); List<User> userList = new ArrayList<>();
@ -201,10 +201,10 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
* 添加抄送人 * 添加抄送人
* *
* @param task 任务信息 * @param task 任务信息
* @param FlowCopyList 抄送人 * @param flowCopyList 抄送人
*/ */
private void setCopy(FlowTask task, List<FlowCopy> FlowCopyList) { private void setCopy(FlowTask task, List<FlowCopy> flowCopyList) {
if (CollUtil.isEmpty(FlowCopyList)) { if (CollUtil.isEmpty(flowCopyList)) {
return; return;
} }
// 添加抄送人记录 // 添加抄送人记录
@ -220,16 +220,16 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
FlowParams flowParams = FlowParams.build(); FlowParams flowParams = FlowParams.build();
flowParams.skipType(SkipType.NONE.getKey()); flowParams.skipType(SkipType.NONE.getKey());
flowParams.hisStatus(TaskStatusEnum.COPY.getStatus()); flowParams.hisStatus(TaskStatusEnum.COPY.getStatus());
flowParams.message("【抄送给】" + StreamUtils.join(FlowCopyList, FlowCopy::getUserName)); flowParams.message("【抄送给】" + StreamUtils.join(flowCopyList, FlowCopy::getUserName));
HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams); HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams);
hisTask.setCreateTime(updateTime); hisTask.setCreateTime(updateTime);
hisTask.setUpdateTime(updateTime); hisTask.setUpdateTime(updateTime);
hisTaskService.save(hisTask); hisTaskService.save(hisTask);
List<User> userList = FlowCopyList.stream() List<User> userList = flowCopyList.stream()
.map(FlowCopy -> { .map(flowCopy -> {
FlowUser flowUser = new FlowUser(); FlowUser flowUser = new FlowUser();
flowUser.setType(TaskAssigneeType.COPY.getCode()); flowUser.setType(TaskAssigneeType.COPY.getCode());
flowUser.setProcessedBy(String.valueOf(FlowCopy.getUserId())); flowUser.setProcessedBy(String.valueOf(flowCopy.getUserId()));
flowUser.setAssociated(taskId); flowUser.setAssociated(taskId);
return flowUser; return flowUser;
}).collect(Collectors.toList()); }).collect(Collectors.toList());