Skip to content

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

代码提交

parent a75f0ea2
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 20 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 @ 88629063
......@@ -310,10 +310,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
// if(ProjectInitiationEnum.设计开工资料提交.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装开工资料提交.getName().equals(project.getStatus())){
// project.setStatus(ProjectInitiationEnum.提交资料.getName());
// }
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus())){
project.setStatus(ProjectInitiationEnum.建设负责人指定项目资料员.getName());
}
taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
//更新project种的status字段,更新关系表中的state字段，表示当前流程下一个执行的任务
......@@ -350,8 +346,8 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
unitIds.add(project.getConstructionUnitId());
taskType = TaskTypeEnum.填报.getKey();
}
if ( ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus()) ||
ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus()) ) {
if ( ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus()) || ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(project.getStatus()) ||
ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(project.getStatus())) {
if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
unitIds.add(project.getInstallationUnitId());
} else if(OrgEnum.设计单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
......@@ -539,9 +535,15 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
if(ProjectInitiationEnum.安装开工资料修改.getName().equals(name)){
return ProjectInitiationEnum.修改资料.getName();
}
if(ProjectInitiationEnum.设计开工资料提交.getName().equals(name)){
if(ProjectInitiationEnum.设计开工资料修改.getName().equals(name)){
return ProjectInitiationEnum.提交资料.getName();
}
if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(name)){
return ProjectInitiationEnum.安装负责人指定项目负责人.getName();
}
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(name)){
return ProjectInitiationEnum.设计负责人指定项目负责人.getName();
}
if(ProjectInitiationEnum.监检员审核.getName().equals(name)){
isEnd = true;
}
......@@ -569,14 +571,14 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
Project project = projectService.getOne(wrapper);
String taskName = getFlowTaskName(instanceId);
boolean bool = true;
if ((ProjectInitiationEnum.提交资料.getName().equals(project.getStatus()) || project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName()) || project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) && "流程结束！".equals(taskName)){
if (( project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName()) || project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) && "流程结束！".equals(taskName)){
bool = false;
if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
taskName = ProjectInitiationEnum.设计开工资料提交.getName();
}
if(OrgEnum.设计单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
taskName = ProjectInitiationEnum.安装开工资料提交.getName();
}
// if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
// taskName = ProjectInitiationEnum.设计开工资料提交.getName();
// }
// if(OrgEnum.设计单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
// taskName = ProjectInitiationEnum.安装开工资料提交.getName();
// }
}
if(ProjectInitiationEnum.修改资料.getName().equals(project.getStatus()) && ProjectInitiationEnum.监检员审核.getName().equals(taskName)){
String companyType = orgService.getReginParams().getBusinessInfo().getCompanyType();
......@@ -592,11 +594,9 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
}
// 部门审核/审批逻辑
if (ProjectInitiationEnum.建设负责人指定项目资料员.getName().equals(project.getStatus())) {
if (ProjectInitiationEnum.建设负责人指定项目资料员.getName().equals(project.getStatus()) && "流程结束！".equals(taskName) ) {
bool = false;
taskName = ProjectInitiationEnum.设计负责人指定项目负责人.getName() + "/" + ProjectInitiationEnum.安装负责人指定项目负责人.getName();
// 部门审核/审批逻辑
} else {
if (ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(taskName)) {
taskName = ProjectInitiationEnum.设计负责人指定项目资料员.getName() + "/" + project.getStatus().split("/")[1];
......@@ -607,6 +607,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
if (!"流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus()) && project.getStatus().contains("/")) {
String azStatus = StringUtils.substringBefore(project.getStatus(), "/");
String sjStatus = StringUtils.substringAfter(project.getStatus(), "/");
if (taskName.contains("安装")) {
......@@ -617,9 +618,9 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
}
if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) {
if (project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) {
taskName = StringUtils.substringBefore(project.getStatus(), "/");
} else if (project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName())) {
taskName = StringUtils.substringAfter(project.getStatus(), "/");
} else if (project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName())) {
taskName = StringUtils.substringBefore(project.getStatus(), "/");
}
}
......
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