Commit 2b24737f by tangzhaoqian Committed by chenzg

审批Router解析

parent 08422e2e
...@@ -24,6 +24,7 @@ import cn.hutool.core.bean.BeanUtil; ...@@ -24,6 +24,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.timer.api.bean.spmk.SpmkApprovalG; import cn.timer.api.bean.spmk.SpmkApprovalG;
import cn.timer.api.bean.spmk.SpmkApprovalTemplate; import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
...@@ -380,7 +381,8 @@ public class SpmkServiceImpl { ...@@ -380,7 +381,8 @@ public class SpmkServiceImpl {
listRouter.add(spmkApproveSummaryDto.getRouter()); listRouter.add(spmkApproveSummaryDto.getRouter());
JSONObject jSONObject = spmkApproveSummaryDto.getRequestData() JSONObject jSONObject = spmkApproveSummaryDto.getRequestData()
.put("orgCode", FromData.builder().value(String.valueOf(userBean.getOrgCode())).build()) .put("orgCode", FromData.builder().value(String.valueOf(userBean.getOrgCode())).build())
.put("initiator", FromData.builder().value(spmkApproveSummaryDto.getInitiator()).build()); .put("initiator", FromData.builder().value(spmkApproveSummaryDto.getInitiator()).build())
.put("id", FromData.builder().value(StrUtil.toString(userBean.getEmpNum())).build());
RouterUtils.NextNode(listRouter, jSONObject, ISFIRST); RouterUtils.NextNode(listRouter, jSONObject, ISFIRST);
List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>(); List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>();
RouterUtils.getIsFlowChildren(listRouter,listFlowChildren); RouterUtils.getIsFlowChildren(listRouter,listFlowChildren);
......
...@@ -65,7 +65,20 @@ public class RouterUtils { ...@@ -65,7 +65,20 @@ public class RouterUtils {
Console.log("发起人逻辑"); Console.log("发起人逻辑");
router.setExecute(EXECUTED); router.setExecute(EXECUTED);
router.setFlow(true); router.setFlow(true);
router.getRelation().get(0).setName(obj.get("initiator",FromData.class).getValue());
List<User> users = new ArrayList<User>();
User userFirst = User.builder()
.name(obj.get("initiator",FromData.class).getValue())
.id(obj.get("id",FromData.class).getValue())
.execute("0")
.build();
users.add(userFirst);
List<Relation> relations = new ArrayList<Relation>();
Relation relation = Relation.builder().type("user").users(users).build();
relations.add(relation);
router.setRelation(relations);
// router.getRelation().get(0).setName(obj.get("initiator",FromData.class).getValue());
NextNode(router.getChildren(),obj, isFirse, isAuditNext); NextNode(router.getChildren(),obj, isFirse, isAuditNext);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment