Skip to content

A
amos-boot-biz
Commit 5c742fa7 authored by litengwei's avatar litengwei
Browse files
Options

代码提交

parent 73057ab6
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 8 deletions
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
View file @ 5c742fa7
...@@ -326,18 +326,45 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -326,18 +326,45 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
unitIds = new ArrayList<>(); unitIds = new ArrayList<>();
taskType = getUnitId(unitIds, project, superviseRule); taskType = getUnitId(unitIds, project, superviseRule);
if(project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目负责人.getName()) if(project.getStatus().contains("/") && ( project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目负责人.getName())
|| project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目资料员.getName()) || project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目资料员.getName())
|| 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()); unitIds = unitIds.stream().distinct().collect(Collectors.toList());
AjaxResult ajaxResultR = Workflow.taskClient.getTaskNoAuth(instanceId); // AjaxResult ajaxResultR = Workflow.taskClient.getTaskNoAuth(instanceId);
dataObject = JSON.parseObject(JSON.toJSONString(ajaxResultR.get("data"))); // dataObject = JSON.parseObject(JSON.toJSONString(ajaxResultR.get("data")));
try { // JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTasksForDisposal(instanceId)));
taskName=dataObject.getString("name"); // JSONArray jsonArray = jsonObject.getJSONArray("data");
}catch (Exception e) { // for(Object o:jsonArray){
log.error("当前流程名称为空"); // String name = JSON.parseObject(JSON.toJSONString(o)).getString("name");
// if(name.equals(taskName)) {
//
// }
// }
if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(taskName)){
taskName = ProjectInitiationEnum.安装负责人指定项目资料员.getName();
}
if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(taskName)){
taskName = ProjectInitiationEnum.安装开工资料提交.getName();
}
if(ProjectInitiationEnum.安装开工资料提交.getName().equals(taskName)){
taskName = ProjectInitiationEnum.安装资料审核.getName();
}
if(ProjectInitiationEnum.安装资料审核.getName().equals(taskName)){
taskName = ProjectInitiationEnum.安装资料审批.getName();
}
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(taskName)){
taskName = ProjectInitiationEnum.设计负责人指定项目资料员.getName();
}
if(ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(taskName)){
taskName = ProjectInitiationEnum.设计开工资料提交.getName();
}
if(ProjectInitiationEnum.设计开工资料提交.getName().equals(taskName)){
taskName = ProjectInitiationEnum.设计资料审核.getName();
}
if(ProjectInitiationEnum.设计资料审核.getName().equals(taskName)){
taskName = ProjectInitiationEnum.设计资料审批.getName();
} }
taskService.saveOrUpdateTask(taskName, false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId); taskService.saveOrUpdateTask(taskName, false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
} else { } else {
......
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