Commit 0ceac638 authored by zhangyingbin's avatar zhangyingbin

修改ugp任务接口逻辑

parent ec909c7e
...@@ -147,10 +147,8 @@ public class ProblemInitiationServiceImpl { ...@@ -147,10 +147,8 @@ public class ProblemInitiationServiceImpl {
System.out.println("任务完成失败:"+e.getMessage()); System.out.println("任务完成失败:"+e.getMessage());
} finally { } finally {
//更新任务表的状态 已办 //更新任务表的状态 已办
if(!ValidationUtil.isEmpty(unitIds)) {
taskType = getUnitId(unitIds, objectd); taskType = getUnitId(unitIds, objectd);
taskService.saveOrUpdateTask(objectd.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds); taskService.saveOrUpdateTask(objectd.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds);
}
//更新problem中的status字段,表示当前流程下一个执行的任务 //更新problem中的status字段,表示当前流程下一个执行的任务
qualityProblemService.updateById(objectd); qualityProblemService.updateById(objectd);
...@@ -158,12 +156,10 @@ public class ProblemInitiationServiceImpl { ...@@ -158,12 +156,10 @@ public class ProblemInitiationServiceImpl {
QualityProblem quality = qualityProblemService.getById(objectd.getSequenceNbr()); QualityProblem quality = qualityProblemService.getById(objectd.getSequenceNbr());
objectd.setStatus(quality.getStatus()); objectd.setStatus(quality.getStatus());
if(!ValidationUtil.isEmpty(unitIds)) {
taskType = getUnitId(unitIds, objectd); taskType = getUnitId(unitIds, objectd);
taskService.saveOrUpdateTask(objectd.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds); taskService.saveOrUpdateTask(objectd.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds);
} }
} }
}
/** /**
* 获取任务的执行单位id 和 TaskType * 获取任务的执行单位id 和 TaskType
......
...@@ -170,22 +170,19 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -170,22 +170,19 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
System.out.println("任务完成失败:"+e.getMessage()); System.out.println("任务完成失败:"+e.getMessage());
} finally { } finally {
//更新任务表的状态 已办 //更新任务表的状态 已办
if(!ValidationUtil.isEmpty(unitIds)) {
taskType = getUnitId(unitIds, project, superviseRule); taskType = getUnitId(unitIds, project, superviseRule);
taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds); taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds);
}
//更新project种的status字段,表示当前流程下一个执行的任务 //更新project种的status字段,表示当前流程下一个执行的任务
updateProjectFlowStatus(instanceId); updateProjectFlowStatus(instanceId);
//新增任务表的状态 待办 //新增任务表的状态 待办
if(!ValidationUtil.isEmpty(unitIds)) {
project = projectService.getById(object.getLong("sequenceNbr")); project = projectService.getById(object.getLong("sequenceNbr"));
taskType = getUnitId(unitIds, project, superviseRule); taskType = getUnitId(unitIds, project, superviseRule);
taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds); taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds);
} }
} }
}
/** /**
* 获取任务的执行单位id 和 TaskType * 获取任务的执行单位id 和 TaskType
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment