Commit e9a47264 authored by zhangyingbin's avatar zhangyingbin

修改已办代办公用方法

parent 539881e9
...@@ -49,6 +49,28 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl ...@@ -49,6 +49,28 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
for (Project project : projectList) { for (Project project : projectList) {
if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) { if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) {
taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr())); taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
} else if (ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())) {
taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
} else if (ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus())) {
taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
} else if (ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus())) {
taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
}
}
} else if(OrgEnum.建设单位.getKey().equals(companyType)){
for (Project project : projectList) {
if (ProjectInitiationEnum.项目立项.getName().equals(project.getStatus())) {
taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
}
}
} else if(OrgEnum.设计单位.getKey().equals(companyType)){
for (Project project : projectList) {
if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) {
taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
} else if (ProjectInitiationEnum.审核人审核.getName().equals(project.getStatus())) {
taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
} else if (ProjectInitiationEnum.审批人审批.getName().equals(project.getStatus())) {
taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
} }
} }
} }
...@@ -77,6 +99,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl ...@@ -77,6 +99,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
task.setStatus(status); task.setStatus(status);
if(status){ if(status){
task.setStatusLabel(TaskTypeEnum.已办.getName()); task.setStatusLabel(TaskTypeEnum.已办.getName());
taskStatus = "已完成";
} else { } else {
task.setStatusLabel(TaskTypeEnum.待办.getName()); task.setStatusLabel(TaskTypeEnum.待办.getName());
} }
......
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