| | |
| | | if(task.getTaskDefinitionKey().equals("programmingTask") ) {//编制节点 |
| | | //记录实际编程员 |
| | | variables.put(FlowVariableContants.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId())); |
| | | |
| | | if(this.needUploadProgramFile(props.getMachineCode())) { |
| | | String programOnMachine = Func.toStr(variables.getOrDefault("programOnMachine",FlowContants.N));//是否现场编程 |
| | | if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowContants.N)) { |
| | | flowProgramFileService.checkProgramFiles(processInstanceId, FlowContants.Y.equals(operateResult)); |
| | | } |
| | | }else if(task.getTaskDefinitionKey().equals("teamLeaderTask")){ |
| | | if(FlowContants.Y.equals(operateResult)) { |
| | | runtimeService.setVariable(task.getExecutionId(),FlowContants.PROGRAMMER_NAME,userCommonService.getUserNameById(Func.toLong(variables.get("assignee")))); |
| | | } |
| | | |
| | | }else if(task.getTaskDefinitionKey().equals("check")){ |
| | | variables.put(FlowVariableContants.ACT_CHECKER,Func.toStr(AuthUtil.getUserId())); |
| | | }else if(task.getTaskDefinitionKey().equals("approveTask")){ |
| | | variables.put(FlowVariableContants.ACT_SENIOR,Func.toStr(AuthUtil.getUserId())); |
| | | } |
| | | variables.remove("programOnMachine");//其他节点,忽略现场编程标记 |
| | | if (StringUtil.isNoneBlank(processInstanceId, comment)) { |
| | | taskService.addComment(taskId, processInstanceId, comment); |
| | | } |
| | | |
| | | variables.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName()); |
| | | |
| | | |
| | | addApproveRecord(taskId,comment,variables); |
| | | |