update 优化 支持前端返回节点扩展数据(按钮权限 抄送人 扩展变量)

dev
疯狂的狮子Li 4 months ago
parent 7c341548c4
commit 971f0070f7

@ -5,12 +5,14 @@ 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;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* *
@ -185,6 +187,20 @@ public class FlowTaskVo implements Serializable {
*/ */
private List<ButtonPermissionVo> buttonList; private List<ButtonPermissionVo> buttonList;
/**
* ID
* <p>
* CopySettingEnum ID
*/
private List<FlowCopyBo> copyList;
/**
* Map
* <p>
* VariablesEnum key=value
*/
private Map<String, String> varList;
//业务扩展信息开始 //业务扩展信息开始
/** /**
* *
@ -198,4 +214,3 @@ public class FlowTaskVo implements Serializable {
//业务扩展信息结束 //业务扩展信息结束
} }

@ -603,6 +603,19 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
NodeExtVo nodeExtVo = flwNodeExtService.parseNodeExt(flowNode.getExt()); NodeExtVo nodeExtVo = flwNodeExtService.parseNodeExt(flowNode.getExt());
//设置按钮权限 //设置按钮权限
flowTaskVo.setButtonList(nodeExtVo.getButtonPermissions()); flowTaskVo.setButtonList(nodeExtVo.getButtonPermissions());
if (CollUtil.isNotEmpty(nodeExtVo.getCopySettings())) {
List<FlowCopyBo> list = StreamUtils.toList(nodeExtVo.getCopySettings(), x -> {
FlowCopyBo bo = new FlowCopyBo();
Long id = Convert.toLong(x);
bo.setUserId(id);
bo.setUserName(remoteUserService.selectUserNameById(id));
return bo;
});
flowTaskVo.setCopyList(list);
} else {
flowTaskVo.setCopyList(new ArrayList<>());
}
flowTaskVo.setVarList(nodeExtVo.getVariables());
flowTaskVo.setNodeRatio(flowNode.getNodeRatio()); flowTaskVo.setNodeRatio(flowNode.getNodeRatio());
flowTaskVo.setApplyNode(flowNode.getNodeCode().equals(flwCommonService.applyNodeCode(task.getDefinitionId()))); flowTaskVo.setApplyNode(flowNode.getNodeCode().equals(flwCommonService.applyNodeCode(task.getDefinitionId())));
return flowTaskVo; return flowTaskVo;

Loading…
Cancel
Save