mdm.git - Gitblit

			@@ -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);
			}
			@@ -398,6 +394,8 @@
			public IPage<FlowVO> selectExceptionPage(IPage<FlowVO> page, String myProcessName, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
			HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
			//.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程

			query.variableValueEquals(FlowContants.EXCEPTION, "1");
			if(Func.isNotEmpty(myProcessName)) {
			query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
			}
			@@ -440,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);
			}
			@@ -548,4 +549,5 @@

			return page;
			}

			}