|
|
@@ -11488,7 +11488,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
task.setCompanyId(companyId);
|
|
|
task.setSapTaskCode(group.getProjectElementID());
|
|
|
task.setName(group.getTaskGroupName()==null?"空的任务名称":group.getTaskGroupName().getName());
|
|
|
- Task three = taskMapper.selectOne(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, task.getProjectId()).eq(Task::getGroupId, task.getGroupId()).eq(Task::getStagesId, task.getStagesId()));
|
|
|
+ Task three = taskMapper.selectOne(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, task.getProjectId()).eq(Task::getSapTaskCode,task.getSapTaskCode()).eq(Task::getGroupId, task.getGroupId()).eq(Task::getStagesId, task.getStagesId()));
|
|
|
if(three!=null){
|
|
|
task.setId(three.getId());
|
|
|
}
|
|
|
@@ -11537,7 +11537,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
task.setCompanyId(companyId);
|
|
|
task.setSapTaskCode(targetStage.getProjectElementID());
|
|
|
task.setName(targetStage.getTaskGroupName()==null?"空的任务名称":targetStage.getTaskGroupName().getName());
|
|
|
- Task two = taskMapper.selectOne(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, task.getProjectId()).eq(Task::getGroupId, task.getGroupId()).eq(Task::getStagesId, task.getStagesId()));
|
|
|
+ Task two = taskMapper.selectOne(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, task.getProjectId()).eq(Task::getSapTaskCode,task.getSapTaskCode()).eq(Task::getGroupId, task.getGroupId()).eq(Task::getStagesId, task.getStagesId()));
|
|
|
if(two!=null){
|
|
|
task.setId(two.getId());
|
|
|
}
|
|
|
@@ -11549,7 +11549,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
stage.setGroupId(Integer.valueOf(String.valueOf(targetGroup.get().get("groupId"))));
|
|
|
stage.setStagesCode(targetStage.getProjectElementID());
|
|
|
stage.setStagesName(targetStage.getTaskGroupName()==null?"":targetStage.getTaskGroupName().getName());
|
|
|
- Stages one = stagesMapper.selectOne(new QueryWrapper<Stages>().eq("project_id", project.getId()).eq("stages_name", targetStage.getProjectElementID()).eq("group_id",stage.getGroupId()));
|
|
|
+ Stages one = stagesMapper.selectOne(new QueryWrapper<Stages>().eq("project_id", project.getId()).eq("stages_code", targetStage.getProjectElementID()).eq("group_id",stage.getGroupId()));
|
|
|
if(one!=null){
|
|
|
stage.setId(one.getId());
|
|
|
}
|
|
|
@@ -11575,7 +11575,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
task.setCompanyId(companyId);
|
|
|
task.setSapTaskCode(targetTask.getProjectElementID());
|
|
|
task.setName(targetTask.getTaskGroupName()==null?"空的任务名称":targetTask.getTaskGroupName().getName());
|
|
|
- Task one = taskMapper.selectOne(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, task.getProjectId()).eq(Task::getGroupId, task.getGroupId()).eq(Task::getStagesId, task.getStagesId()));
|
|
|
+ Task one = taskMapper.selectOne(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, task.getProjectId()).eq(Task::getSapTaskCode,targetTask.getProjectElementID()).eq(Task::getGroupId, task.getGroupId()).eq(Task::getStagesId, task.getStagesId()));
|
|
|
if(one!=null){
|
|
|
task.setId(one.getId());
|
|
|
}
|
Min