Skip to content

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

代码提交

parent 13140b59
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 66 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 @ 48adfdd5
...@@ -451,7 +451,11 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -451,7 +451,11 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
if(project.getStatus().contains("/") && ( 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())
|| 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);
...@@ -687,79 +691,83 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD ...@@ -687,79 +691,83 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
public String getFlowTaskName(String firstName, Project project, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds,Long extendId, String instanceId){ public String getFlowTaskName(String firstName, Project project, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds,Long extendId, String instanceId){
JSONObject dataObject = new JSONObject(); JSONObject dataObject = new JSONObject();
boolean isEnd = false; boolean isEnd = false;
try { if(firstName.equals(ProjectInitiationEnum.安装资料审批) || firstName.equals(ProjectInitiationEnum.设计资料审批)) {
AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId); return "流程结束！";
dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data"))); } else {
System.out.println(dataObject.toJSONString()+"单个流程名称"); try {
}catch (Exception e) { AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
//当存在多个用户任务时 主要是安装/设计提交资料修改 dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
logger.error("当前用户存在多个任务"); System.out.println(dataObject.toJSONString()+"单个流程名称");
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTasksForDisposal(instanceId))); }catch (Exception e) {
JSONArray jsonArray = jsonObject.getJSONArray("data"); //当存在多个用户任务时 主要是安装/设计提交资料修改
logger.error("当前用户存在多个任务");
for(Object o:jsonArray){ JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTasksForDisposal(instanceId)));
String name = JSON.parseObject(JSON.toJSONString(o)).getString("name"); JSONArray jsonArray = jsonObject.getJSONArray("data");
System.out.println(dataObject.toJSONString()+"流程名称循环======");
if(ProjectInitiationEnum.安装开工资料修改.getName().equals(name)){ for(Object o:jsonArray){
return ProjectInitiationEnum.修改资料.getName(); String name = JSON.parseObject(JSON.toJSONString(o)).getString("name");
} System.out.println(dataObject.toJSONString()+"流程名称循环======");
if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(name)){ if(ProjectInitiationEnum.安装开工资料修改.getName().equals(name)){
unitIds.clear(); return ProjectInitiationEnum.修改资料.getName();
unitIds.add(project.getInstallationUnitId());
if(!taskService.findTheTask(instanceId,ProjectInitiationEnum.安装负责人指定项目负责人.getName())) {
taskService.saveOrUpdateTask(ProjectInitiationEnum.安装负责人指定项目负责人.getName(), false, taskType, sendTime, sourceId, TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
} }
} if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(name)){
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(name)){ unitIds.clear();
unitIds.clear(); unitIds.add(project.getInstallationUnitId());
unitIds.add(project.getDesignUnitId()); if(!taskService.findTheTask(instanceId,ProjectInitiationEnum.安装负责人指定项目负责人.getName())) {
if(!taskService.findTheTask(instanceId,ProjectInitiationEnum.设计负责人指定项目负责人.getName())) { taskService.saveOrUpdateTask(ProjectInitiationEnum.安装负责人指定项目负责人.getName(), false, taskType, sendTime, sourceId, TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
taskService.saveOrUpdateTask(ProjectInitiationEnum.设计负责人指定项目负责人.getName(), false, taskType, sendTime, sourceId, TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId); }
}
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(name)){
unitIds.clear();
unitIds.add(project.getDesignUnitId());
if(!taskService.findTheTask(instanceId,ProjectInitiationEnum.设计负责人指定项目负责人.getName())) {
taskService.saveOrUpdateTask(ProjectInitiationEnum.设计负责人指定项目负责人.getName(), false, taskType, sendTime, sourceId, TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
}
} }
}
if(ProjectInitiationEnum.监检员审核.getName().equals(name)){ if(ProjectInitiationEnum.监检员审核.getName().equals(name)){
isEnd = true; isEnd = true;
}
}
if(isEnd){
return ProjectInitiationEnum.监检员审核.getName();
} }
} }
if(isEnd){ if(null != firstName) {
return ProjectInitiationEnum.监检员审核.getName(); if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(firstName)){
} return ProjectInitiationEnum.安装负责人指定项目资料员.getName();
} }
if(null != firstName) { if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(firstName)){
if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(firstName)){ return ProjectInitiationEnum.安装开工资料提交.getName();
return ProjectInitiationEnum.安装负责人指定项目资料员.getName(); }
} if(ProjectInitiationEnum.安装开工资料提交.getName().equals(firstName)){
if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(firstName)){ return ProjectInitiationEnum.安装资料审核.getName();
return ProjectInitiationEnum.安装开工资料提交.getName(); }
} if(ProjectInitiationEnum.安装资料审核.getName().equals(firstName)){
if(ProjectInitiationEnum.安装开工资料提交.getName().equals(firstName)){ return ProjectInitiationEnum.安装资料审批.getName();
return ProjectInitiationEnum.安装资料审核.getName(); }
} if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(firstName)){
if(ProjectInitiationEnum.安装资料审核.getName().equals(firstName)){ return ProjectInitiationEnum.设计负责人指定项目资料员.getName();
return ProjectInitiationEnum.安装资料审批.getName(); }
} if(ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(firstName)){
if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(firstName)){ return ProjectInitiationEnum.设计开工资料提交.getName();
return ProjectInitiationEnum.设计负责人指定项目资料员.getName(); }
} if(ProjectInitiationEnum.设计开工资料提交.getName().equals(firstName)){
if(ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(firstName)){ return ProjectInitiationEnum.设计资料审核.getName();
return ProjectInitiationEnum.设计开工资料提交.getName(); }
} if(ProjectInitiationEnum.设计资料审核.getName().equals(firstName)){
if(ProjectInitiationEnum.设计开工资料提交.getName().equals(firstName)){ return ProjectInitiationEnum.设计资料审批.getName();
return ProjectInitiationEnum.设计资料审核.getName(); }
}
if(ProjectInitiationEnum.设计资料审核.getName().equals(firstName)){
return ProjectInitiationEnum.设计资料审批.getName();
} }
}
String taskName = "流程结束！"; String taskName = "流程结束！";
try { try {
taskName=dataObject.getString("name"); taskName=dataObject.getString("name");
}catch (Exception e) { }catch (Exception e) {
log.error("当前流程名称为空"); log.error("当前流程名称为空");
}
return taskName;
} }
return taskName;
} }
@Autowired @Autowired
......
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