mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-23 23:09:47 +08:00
update 优化 将返回值从bo改为vo
This commit is contained in:
@ -0,0 +1,36 @@
|
|||||||
|
package org.dromara.workflow.domain.vo;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import org.dromara.common.translation.annotation.Translation;
|
||||||
|
import org.dromara.common.translation.constant.TransConstant;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 抄送对象
|
||||||
|
*
|
||||||
|
* @author AprilWind
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class FlowCopyVo implements Serializable {
|
||||||
|
|
||||||
|
@Serial
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户id
|
||||||
|
*/
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户名称
|
||||||
|
*/
|
||||||
|
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "userId")
|
||||||
|
private String userName;
|
||||||
|
|
||||||
|
public FlowCopyVo(Long userId) {
|
||||||
|
this.userId = userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -5,7 +5,6 @@ import org.dromara.common.translation.annotation.Translation;
|
|||||||
import org.dromara.common.translation.constant.TransConstant;
|
import org.dromara.common.translation.constant.TransConstant;
|
||||||
import org.dromara.warm.flow.core.entity.User;
|
import org.dromara.warm.flow.core.entity.User;
|
||||||
import org.dromara.workflow.common.constant.FlowConstant;
|
import org.dromara.workflow.common.constant.FlowConstant;
|
||||||
import org.dromara.workflow.domain.bo.FlowCopyBo;
|
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@ -192,7 +191,7 @@ public class FlowTaskVo implements Serializable {
|
|||||||
* <p>
|
* <p>
|
||||||
* 根据扩展属性中 CopySettingEnum 类型的数据生成,存储需要抄送的对象 ID
|
* 根据扩展属性中 CopySettingEnum 类型的数据生成,存储需要抄送的对象 ID
|
||||||
*/
|
*/
|
||||||
private List<FlowCopyBo> copyList;
|
private List<FlowCopyVo> copyList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 自定义参数 Map
|
* 自定义参数 Map
|
||||||
|
@ -46,6 +46,7 @@ import org.dromara.workflow.common.enums.TaskAssigneeType;
|
|||||||
import org.dromara.workflow.common.enums.TaskStatusEnum;
|
import org.dromara.workflow.common.enums.TaskStatusEnum;
|
||||||
import org.dromara.workflow.domain.FlowInstanceBizExt;
|
import org.dromara.workflow.domain.FlowInstanceBizExt;
|
||||||
import org.dromara.workflow.domain.bo.*;
|
import org.dromara.workflow.domain.bo.*;
|
||||||
|
import org.dromara.workflow.domain.vo.FlowCopyVo;
|
||||||
import org.dromara.workflow.domain.vo.FlowHisTaskVo;
|
import org.dromara.workflow.domain.vo.FlowHisTaskVo;
|
||||||
import org.dromara.workflow.domain.vo.FlowTaskVo;
|
import org.dromara.workflow.domain.vo.FlowTaskVo;
|
||||||
import org.dromara.workflow.domain.vo.NodeExtVo;
|
import org.dromara.workflow.domain.vo.NodeExtVo;
|
||||||
@ -602,13 +603,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
|
|||||||
//设置按钮权限
|
//设置按钮权限
|
||||||
flowTaskVo.setButtonList(nodeExtVo.getButtonPermissions());
|
flowTaskVo.setButtonList(nodeExtVo.getButtonPermissions());
|
||||||
if (CollUtil.isNotEmpty(nodeExtVo.getCopySettings())) {
|
if (CollUtil.isNotEmpty(nodeExtVo.getCopySettings())) {
|
||||||
List<FlowCopyBo> list = StreamUtils.toList(nodeExtVo.getCopySettings(), x -> {
|
List<FlowCopyVo> list = StreamUtils.toList(nodeExtVo.getCopySettings(), x -> new FlowCopyVo(Convert.toLong(x)));
|
||||||
FlowCopyBo bo = new FlowCopyBo();
|
|
||||||
Long id = Convert.toLong(x);
|
|
||||||
bo.setUserId(id);
|
|
||||||
bo.setUserName(userService.selectUserNameById(id));
|
|
||||||
return bo;
|
|
||||||
});
|
|
||||||
flowTaskVo.setCopyList(list);
|
flowTaskVo.setCopyList(list);
|
||||||
} else {
|
} else {
|
||||||
flowTaskVo.setCopyList(new ArrayList<>());
|
flowTaskVo.setCopyList(new ArrayList<>());
|
||||||
|
Reference in New Issue
Block a user