mdm.git - Gitblit

			@@ -24,6 +24,7 @@
			import org.springblade.mdm.flow.service.execute.*;
			import org.springblade.mdm.flow.vo.BatchDispatchVO;
			import org.springblade.mdm.flow.vo.DispathTaskQueryVO;
			import org.springblade.mdm.flow.vo.FlowStartResult;
			import org.springblade.mdm.flow.vo.TaskAssignVO;
			import org.springframework.beans.BeanUtils;
			import org.springframework.web.bind.annotation.*;
			@@ -60,7 +61,7 @@
			.like(StringUtils.isNotBlank(queryVO.getDrawingNo()), TaskDispatch::getDrawingNo,queryVO.getDrawingNo())
			.ne(TaskDispatch::getStatus,TaskDispatch.STATUS_INIT).ne(TaskDispatch::getStatus,TaskDispatch.STATUS_STARTED)
			.ge(queryVO.getCreateTimeBegin()!=null, TaskDispatch::getCreateTime,queryVO.getCreateTimeBegin())
			.le(queryVO.getCreateTimeEnd()!=null, TaskDispatch::getCreateTime,end)
			.le(queryVO.getCreateTimeEnd()!=null, TaskDispatch::getCreateTime,end).orderByDesc(TaskDispatch::getCreateTime)
			.page(Condition.getPage(queryVO)));
			}
			/**
			@@ -89,13 +90,15 @@
			BeanUtils.copyProperties(dispatch, startVO);
			startVO.setTitle(startVO.getDrawingNo()+"-"+startVO.getProcessNo()+"-"+startVO.getProcessEdition()+"数控程序编制");
			try {
			String instId = dispatcher.start(startVO);
			FlowStartResult result = dispatcher.start(startVO);
			dispatch.setStatus(TaskDispatch.STATUS_STARTED);
			dispatch.setProcessInstanceId(instId);
			dispatch.setProcessInstanceId(result.getProcessInstanceId());
			dispatch.setProgramNo(result.getProgramNo());
			taskDispatchService.updateById(dispatch);
			} catch (Exception e) {
			log.error("流程启动异常",e);
			dispatch.setStatus(TaskDispatch.STATUS_EXCEPTION);
			dispatch.setErrMsg(e.getMessage());
			taskDispatchService.updateById(dispatch);
			return R.fail("任务启动异常");
			}