blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/MdmUser.java
@@ -22,4 +22,8 @@ * 真名 */ private String realName; /** * 逗号分隔的数据 */ private String roleId; } blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
@@ -96,7 +96,8 @@ @GetMapping("flow-user-list") @ApiOperationSupport(order = 3) @Operation(summary = "用户下拉数据", description = "用户下拉数据") public R<List<User>> flowUserList(@Parameter(description = "部门ID") String deptId) { public R<List<User>> flowUserList(@Parameter(description = "部门ID") String deptId,String taskId) { //userSearchClient.listByRole() return userSearchClient.listByDept(deptId); } blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -34,8 +34,6 @@ private final RuntimeService runtimeService; private final HistoryService historyService; private final TaskService taskService; private final IdentityService identityService; private final NodeDeptQueryService nodeDeptQueryService; private final NcNodeService ncNodeService; @@ -43,7 +41,7 @@ private final FlowProgramFileService flowProgramFileService; private final ProduceDivisionService produceDivisionService; private final MachineService machineService; private final FlowCommonService flowCommonService; /** * 启动固化流程 @@ -84,14 +82,16 @@ vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel()); vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName()); /* ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo()); vars.put(FlowContants.PROGRAMMER,div.getProgrammerId()); vars.put(FlowContants.CHECKER,div.getCheckerId()); vars.put(FlowContants.SENIOR,div.getSeniorId()); vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId()); vars.put(FlowContants.ASSIGNEE,div.getProgrammerId()); */ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null); //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo()); vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER)); identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -156,7 +156,6 @@ if(ru.isSuccess()) { flow.setStartUserName(ru.getData().getName()); } ; List<Comment> comments = lastStepComments(task);//taskService.getTaskComments(task.getId()); if(!comments.isEmpty()){ flow.setComment(comments.get(0).getFullMessage()); @@ -203,15 +202,7 @@ return Collections.emptyList(); } } /** * 获取历史流程 * * @param processInstanceId 流程实例id * @return HistoricProcessInstance */ private HistoricProcessInstance getHistoricProcessInstance(String processInstanceId) { return historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); } public IPage<FlowVO> selectAllTaskPage(IPage<FlowVO> page, String keyword) { @@ -377,6 +368,11 @@ vo.setProcessCreateTime(processInstance.getStartTime()); vo.setHistoryTaskEndTime(processInstance.getEndTime()); R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId())); if(ru.isSuccess()) { vo.setStartUserName(ru.getData().getName()); } vo.setFile(getFileString(processInstance.getId())); records.add(vo); } @@ -442,7 +438,10 @@ vo.setProcessCreateTime(processInstance.getStartTime()); vo.setHistoryTaskEndTime(processInstance.getEndTime()); R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId())); if(ru.isSuccess()) { vo.setStartUserName(ru.getData().getName()); } vo.setFile(getFileString(processInstance.getId())); records.add(vo); } blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
@@ -60,6 +60,9 @@ ]]></script> </scriptTask> <sequenceFlow id="sid-7f62f3c2-08bf-4007-807d-3403ad831ed5" sourceRef="exceptionHandleTask" targetRef="sid-59124fa5-62ee-4ba5-8bd9-cafc65aa5fcf"/> <sequenceFlow id="programmerEndLine" sourceRef="programmingTask" targetRef="exceptionHandleTask" name="工艺员结束"> <conditionExpression>${approve=='E'}</conditionExpression> </sequenceFlow> </process> <bpmndi:BPMNDiagram id="BPMNDiagram_dispatch"> <bpmndi:BPMNPlane bpmnElement="dispatch" id="BPMNPlane_dispatch"> @@ -147,6 +150,10 @@ <omgdi:waypoint x="-300.0" y="-17.5"/> <omgdi:waypoint x="-295.0" y="37.5"/> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="edge-a96e2c79-7b1b-4eef-9779-c6398a84f2ad" bpmnElement="programmerEndLine"> <omgdi:waypoint x="-72.5" y="-92.5"/> <omgdi:waypoint x="-245.0" y="-28.75"/> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </definitions>
