|
|
@ -359,6 +359,8 @@ public class TaskController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 添加任务部门
|
|
|
|
List dpIdList = new ArrayList();
|
|
|
|
List dpIdList = new ArrayList();
|
|
|
|
List<Integer> departmentIdList = task.getDepartmentList();
|
|
|
|
List<Integer> departmentIdList = task.getDepartmentList();
|
|
|
|
if (departmentIdList != null && departmentIdList.size() > 0) {
|
|
|
|
if (departmentIdList != null && departmentIdList.size() > 0) {
|
|
|
@ -380,7 +382,7 @@ public class TaskController {
|
|
|
|
taskDepartmentService.remove(new QueryWrapper<TaskDepartment>().eq("taskId", id));
|
|
|
|
taskDepartmentService.remove(new QueryWrapper<TaskDepartment>().eq("taskId", id));
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
List<TaskDepartment> departmentListOri = taskDepartmentService.list(new QueryWrapper<TaskDepartment>().eq("taskId",task.getId()));
|
|
|
|
List<TaskDepartment> departmentListOri = taskDepartmentService.list(new QueryWrapper<TaskDepartment>().eq("taskId",task.getId()));
|
|
|
|
taskDepartmentService.remove(new QueryWrapper<TaskDepartment>().eq("taskId", id).notIn((dpIdList!=null&&dpIdList.size()!=0),"brandId", departmentIdList));
|
|
|
|
taskDepartmentService.remove(new QueryWrapper<TaskDepartment>().eq("taskId", id).notIn((dpIdList!=null&&dpIdList.size()!=0),"departmentId", departmentIdList));
|
|
|
|
List departmentIdListOri = new ArrayList();
|
|
|
|
List departmentIdListOri = new ArrayList();
|
|
|
|
for (TaskDepartment taskDepartment : departmentListOri) {
|
|
|
|
for (TaskDepartment taskDepartment : departmentListOri) {
|
|
|
|
departmentIdListOri.add(taskDepartment.getDepartmentId());
|
|
|
|
departmentIdListOri.add(taskDepartment.getDepartmentId());
|
|
|
@ -391,8 +393,9 @@ public class TaskController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
taskService.upReferenceInTask(task,task.getReferenceList(),task.getReferenceUrlList());
|
|
|
|
return Result.success();
|
|
|
|
taskService.upTeachRefeInTask(task,task.getTeachRefeList(),task.getTeachRefeUrlList());
|
|
|
|
|
|
|
|
return Result.success(null,"修改完成");
|
|
|
|
// if (tagList != null && tagList.size() > 0) {
|
|
|
|
// if (tagList != null && tagList.size() > 0) {
|
|
|
|
// taskTagService.addGroup(tagList, id);
|
|
|
|
// taskTagService.addGroup(tagList, id);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|