|
|
@@ -760,8 +760,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
}
|
|
|
ContractTask task = techProjectService.selectTaskById(taskId);
|
|
|
if(task != null){
|
|
|
- if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode())
|
|
|
+ if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode()){
|
|
|
res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
task.setId(taskId);
|
|
|
task.setTaskReceiver(taskReceiverId);
|
|
|
task.setTaskAllocator(TokenManager.getAdminId());
|
|
|
@@ -828,8 +830,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
}
|
|
|
ContractTask task = techProjectService.selectTaskById(taskId);
|
|
|
if(task != null){
|
|
|
- if(task.getTaskStatus() != TaskState.DISTRIBUTION.getCode())
|
|
|
+ if(task.getTaskStatus() != TaskState.DISTRIBUTION.getCode()){
|
|
|
res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
task.setTaskStatus(TaskState.STARTED.getCode());
|
|
|
techProjectService.updateProjectTask(task);
|
|
|
}
|
|
|
@@ -850,11 +854,13 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
}
|
|
|
ContractTask task = techProjectService.selectTaskById(taskId);
|
|
|
if(task != null){
|
|
|
- if(task.getTaskStatus() != TaskState.STARTED.getCode());
|
|
|
- res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
|
|
|
+ if(task.getTaskStatus() != TaskState.STARTED.getCode()){
|
|
|
+ res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ task.setTaskStatus(TaskState.COMPLETE.getCode());
|
|
|
+ techProjectService.updateProjectTask(task);
|
|
|
}
|
|
|
- task.setTaskStatus(TaskState.COMPLETE.getCode());
|
|
|
- techProjectService.updateProjectTask(task);
|
|
|
return res;
|
|
|
}
|
|
|
|