From de34eb656f91cea45f07bb76bbc923bc2ce75069 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 27 二月 2025 15:08:52 +0800
Subject: [PATCH] 审批流
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index 9714146..9cd0bf1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -914,6 +914,7 @@
stateProcessInstanceAction.setActionType(StateProcessActionEnum.APPROVED.getValue());
stateProcessInstanceAction.setNodeId(processAgreeBO.getTaskId());
stateProcessInstanceAction.setRemark(processAgreeBO.getRemark());
+ stateProcessInstanceAction.setPictures(processAgreeBO.getPictures());
stateProcessInstanceActionService.save(stateProcessInstanceAction);
}
@@ -931,6 +932,7 @@
record.setActionType(StateProcessActionEnum.REJECTED.getValue());
record.setNodeId(processRefuseBO.getTaskId());
record.setRemark(processRefuseBO.getRemark());
+ record.setPictures(processRefuseBO.getPictures());
stateProcessInstanceActionService.save(record);
}
@@ -1196,8 +1198,8 @@
List<FlwHisTask> flwHisTasks = flwHisTaskMapper.selectList(Wrappers.<FlwHisTask>lambdaQuery().eq(FlwHisTask::getInstanceId, instanceId));
processDetailVO.setFlwHisTasks(flwHisTasks);
- List<StateProcessInstanceAction> list = stateProcessInstanceActionService.list(Wrappers.<StateProcessInstanceAction>lambdaQuery().eq(StateProcessInstanceAction::getInstanceId, flwTask.getInstanceId())
- .orderByDesc(StateProcessInstanceAction::getCreateTime));
+ List<StateProcessInstanceAction> list = stateProcessInstanceActionService.list(Wrappers.<StateProcessInstanceAction>lambdaQuery().eq(StateProcessInstanceAction::getInstanceId, instanceId)
+ .orderByAsc(StateProcessInstanceAction::getCreateTime));
for (StateProcessInstanceAction stateProcessInstanceAction : list) {
SysUser sysUser = sysUserService.selectUserById(Long.valueOf(stateProcessInstanceAction.getAuditorId()));
if(Objects.nonNull(sysUser)){
--
Gitblit v1.7.1