|  | @@ -35,8 +35,6 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	private final IFlowClient flowClient;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -//	private final IProjectItemClient projectItemClient;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  	@Override
 | 
	
		
			
				|  |  |  	@Transactional(rollbackFor = Exception.class)
 | 
	
		
			
				|  |  |  	// @GlobalTransactional
 | 
	
	
		
			
				|  | @@ -67,47 +65,4 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 | 
	
		
			
				|  |  |  		return true;
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -/*	@Override
 | 
	
		
			
				|  |  | -	@GlobalTransactional
 | 
	
		
			
				|  |  | -	@Transactional
 | 
	
		
			
				|  |  | -	public boolean startCheckProcess(ProcessLeave check) {
 | 
	
		
			
				|  |  | -		ServiceProjectItem item = projectItemClient.findItemById(check.getItemId());
 | 
	
		
			
				|  |  | -		if (item.getStatus() > 0) {
 | 
	
		
			
				|  |  | -			throw new ServiceException("已请核的禁止重复提交");
 | 
	
		
			
				|  |  | -		}
 | 
	
		
			
				|  |  | -		R res = projectItemClient.check(check.getItemId(), 1, null, null, null, null);
 | 
	
		
			
				|  |  | -		if (!res.isSuccess()) {
 | 
	
		
			
				|  |  | -			throw new ServiceException("请求调用请核失败");
 | 
	
		
			
				|  |  | -		}
 | 
	
		
			
				|  |  | -		check.setTaskUser(String.valueOf(AuthUtil.getUserId()));
 | 
	
		
			
				|  |  | -		String businessTable = FlowUtil.getBusinessTable(ProcessConstant.LEAVE_KEY);
 | 
	
		
			
				|  |  | -		if (Func.isEmpty(check.getId())) {
 | 
	
		
			
				|  |  | -			// 保存leave
 | 
	
		
			
				|  |  | -			check.setApplyTime(DateUtil.now());
 | 
	
		
			
				|  |  | -			save(check);
 | 
	
		
			
				|  |  | -			// 启动流程
 | 
	
		
			
				|  |  | -			String CheckUser = TaskUtil.getTaskUser(check.getCheckUser());
 | 
	
		
			
				|  |  | -			String CheckSecondsUser = TaskUtil.getTaskUser(check.getCheckSecondsUser());
 | 
	
		
			
				|  |  | -			String applyUser = TaskUtil.getTaskUser(String.valueOf(AuthUtil.getUserId()));
 | 
	
		
			
				|  |  | -			Kv variables = Kv.create()
 | 
	
		
			
				|  |  | -				.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
 | 
	
		
			
				|  |  | -				.set("CheckUser", CheckUser)
 | 
	
		
			
				|  |  | -				.set("CheckSecondsUser", CheckSecondsUser)
 | 
	
		
			
				|  |  | -				.set("applyUser", applyUser);
 | 
	
		
			
				|  |  | -			R<BladeFlow> result = flowClient.startProcessInstanceById(check.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(check.getId())), variables);
 | 
	
		
			
				|  |  | -			if (result.isSuccess()) {
 | 
	
		
			
				|  |  | -				log.debug("流程已启动,流程ID:" + result.getData().getProcessInstanceId());
 | 
	
		
			
				|  |  | -				// 返回流程id写入leave
 | 
	
		
			
				|  |  | -				check.setProcessInstanceId(result.getData().getProcessInstanceId());
 | 
	
		
			
				|  |  | -				updateById(check);
 | 
	
		
			
				|  |  | -			} else {
 | 
	
		
			
				|  |  | -				throw new ServiceException("操作失败,请关闭页面再次尝试");
 | 
	
		
			
				|  |  | -			}
 | 
	
		
			
				|  |  | -		} else {
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -			updateById(check);
 | 
	
		
			
				|  |  | -		}
 | 
	
		
			
				|  |  | -		return true;
 | 
	
		
			
				|  |  | -	}*/
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  }
 |