Commit 1d4fc3df authored by litengwei's avatar litengwei

代码提交

parent 9349e2f5
...@@ -47,6 +47,7 @@ import javax.annotation.Resource; ...@@ -47,6 +47,7 @@ import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Service @Service
@Slf4j @Slf4j
...@@ -307,6 +308,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -307,6 +308,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
//更新任务表的状态 已办 //更新任务表的状态 已办
taskType = getUnitId(unitIds, project, superviseRule); taskType = getUnitId(unitIds, project, superviseRule);
unitIds = unitIds.stream().distinct().collect(Collectors.toList());
taskService.saveOrUpdateTask(taskName, true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId); taskService.saveOrUpdateTask(taskName, true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
...@@ -327,6 +329,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -327,6 +329,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
|| project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目负责人.getName()) || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目负责人.getName())
|| project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目资料员.getName()) || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目资料员.getName())
) { ) {
unitIds = unitIds.stream().distinct().collect(Collectors.toList());
AjaxResult ajaxResultR = Workflow.taskClient.getTask(instanceId); AjaxResult ajaxResultR = Workflow.taskClient.getTask(instanceId);
dataObject = JSON.parseObject(JSON.toJSONString(ajaxResultR.get("data"))); dataObject = JSON.parseObject(JSON.toJSONString(ajaxResultR.get("data")));
try { try {
......
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