|
@@ -47,7 +47,8 @@ public class TaskGroupServiceImpl extends ServiceImpl<TaskGroupMapper, TaskGroup
|
|
|
private UserMapper userMapper;
|
|
|
@Resource
|
|
|
private TaskExecutorService taskExecutorService;
|
|
|
-
|
|
|
+ @Resource
|
|
|
+ private ProjectMapper projectMapper;
|
|
|
@Override
|
|
|
public void saveGroupIncharger(TaskGroup taskGroup) {
|
|
|
if (StringUtils.isEmpty(taskGroup.getInchargerId())) {
|
|
@@ -65,6 +66,9 @@ public class TaskGroupServiceImpl extends ServiceImpl<TaskGroupMapper, TaskGroup
|
|
|
User user = userMapper.selectById(token);
|
|
|
List<GroupTemplate> groupTemplates = JSONArray.parseArray(templateJson, GroupTemplate.class);
|
|
|
List<TaskGroup> list=new ArrayList<>();
|
|
|
+ Project project = projectMapper.selectById(projectId);
|
|
|
+ String inchargerId = project.getInchargerId();
|
|
|
+ User inchargerUser = userMapper.selectById(inchargerId);
|
|
|
for(GroupTemplate template:groupTemplates){
|
|
|
TaskGroup taskGroup = new TaskGroup();
|
|
|
taskGroup.setName(template.getName());
|
|
@@ -101,6 +105,9 @@ public class TaskGroupServiceImpl extends ServiceImpl<TaskGroupMapper, TaskGroup
|
|
|
task.setCreaterId(user.getId());
|
|
|
task.setCreaterName(user.getName());
|
|
|
task.setCreatorColor(user.getColor());
|
|
|
+ task.setExecutorId(inchargerUser.getId());
|
|
|
+ task.setExecutorName(inchargerUser.getName());
|
|
|
+ task.setExecutorId(inchargerUser.getColor());
|
|
|
taskList.add(task);
|
|
|
});
|
|
|
taskService.saveBatch(taskList);
|