mdm.git - Gitblit

			@@ -13,6 +13,7 @@
			import org.springblade.mdm.basesetting.machine.entity.Machine;
			import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
			import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
			import org.springblade.mdm.commons.service.UserCommonService;
			import org.springblade.mdm.flow.constants.FlowContants;
			import org.springblade.mdm.flow.constants.FlowVariableContants;
			import org.springblade.mdm.program.entity.NcNode;
			@@ -32,7 +33,7 @@
			private final ProduceDivisionService produceDivisionService;
			private final NodeDeptQueryService nodeDeptQueryService;
			private final MachineService machineService;
			private final IUserClient userClient;
			private final UserCommonService userCommonService;
			/**
			* 根据流程实例id获取definitionKey
			* @param processInstanceId
			@@ -80,6 +81,11 @@
			return programProperties;
			}

			/**
			* 从map中赋值流程便利到vo
			* @param programProperties vo
			* @param vars 变量map
			*/
			void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){

			programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
			@@ -114,6 +120,8 @@
			programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
			programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
			programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));

			programProperties.setProgramNo(Func.toStr(vars.get(FlowContants.PROGRAM_NO)));

			programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableContants.ACT_PROGRAMMER)));
			}
			@@ -178,10 +186,7 @@
			vars.put(FlowContants.ASSIGNEE, defaultAssignee);//第一个审批用户：组长
			}

			R<User> programmerResult = userClient.userInfoById(div.getProgrammerId());
			if(programmerResult.isSuccess()) {
			vars.put(FlowContants.PROGRAMMER_NAME, programmerResult.getData().getName());
			}
			vars.put(FlowContants.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
			return div;
			}