java/xizang.git

			@@ -580,6 +580,14 @@
			if (processTaskListBO.getSortBy() == 2) {
			stateTaskQuery.orderByDesc(BaseModel::getCreateTime);
			}
			// 查询合同信息
			List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
			.in(TContract::getStatus, 2,3,4));
			List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
			if(CollectionUtils.isEmpty(contractIds)){
			return new PageInfo<>();
			}
			stateTaskQuery.in(StateTaskCenter::getProjectId, contractIds);
			stateTaskQuery.in(StateTaskCenter::getFlowId, instanceIds);
			PageInfo pageInfo = new PageInfo(processTaskListBO.getPageNum(), processTaskListBO.getPageSize());
			PageInfo<StateTaskCenter> taskCenters = stateTaskCenterService.page(pageInfo,stateTaskQuery);
			@@ -803,6 +811,14 @@
			if (processTaskListBO.getSortBy() == 2) {
			stateTaskQuery.orderByDesc(BaseModel::getCreateTime);
			}
			// 查询合同信息
			List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
			.in(TContract::getStatus, 2,3,4));
			List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
			if(CollectionUtils.isEmpty(contractIds)){
			return new PageInfo<>();
			}
			stateTaskQuery.in(StateTaskCenter::getProjectId, contractIds);
			stateTaskQuery.in(StateTaskCenter::getFlowId, instanceId);
			PageInfo pageInfo = new PageInfo<>(processTaskListBO.getPageNum(), processTaskListBO.getPageSize());
			PageInfo<StateTaskCenter> taskCenters = stateTaskCenterService.page(pageInfo,stateTaskQuery);
			@@ -1004,6 +1020,7 @@
			FlwTask flwTask = flwTaskMapper.selectById(taskId);
			// 直接拒绝当前流程
			flowLongEngine.runtimeService().reject(flwTask.getInstanceId(), currentFlowCreator());
			flwTaskMapper.deleteById(taskId);
			// 动作执行记录
			StateProcessInstanceAction record = new StateProcessInstanceAction();
			record.setId(IdUtils.simpleUUID());
			@@ -1334,6 +1351,17 @@
			if (processTaskListBO.getSortBy() == 2) {
			stateTaskQuery.orderByDesc(FlwHisTask::getCreateTime);
			}
			List<TContract> tContracts = contractMapper.selectList(Wrappers.<TContract>lambdaQuery()
			.in(TContract::getStatus, 2,3,4));
			List<String> contractIds = tContracts.stream().map(TContract::getId).collect(Collectors.toList());
			if(CollectionUtils.isEmpty(contractIds)){
			return new PageInfo<>();
			}
			List<StateTaskCenter> list = stateTaskCenterService.list(Wrappers.<StateTaskCenter>lambdaQuery().in(StateTaskCenter::getProjectId, contractIds));
			if(!CollectionUtils.isEmpty(list)){
			List<String> flowIds = list.stream().map(StateTaskCenter::getFlowId).collect(Collectors.toList());
			stateTaskQuery.in(FlwHisTask::getInstanceId, flowIds);
			}
			stateTaskQuery.eq(FlwHisTask::getParentTaskId, 0L);
			stateTaskQuery.like(FlwHisTask::getCreateId, userId);
			PageInfo pageInfo = new PageInfo<>(processTaskListBO.getPageNum(), processTaskListBO.getPageSize());