|
|
@@ -146,7 +146,7 @@ public class ProjectReviewManage { |
|
|
|
&& !ProjectStatus.COMPLIANCE_REVIEW_PASSED.eq(w.getStatus()) |
|
|
|
&& !ProjectStatus.WITHOUT_PROJECT_REVIEW.eq(w.getStatus()) |
|
|
|
&& !ProjectStatus.ON_PROJECT_REVIEW.eq(w.getStatus()) |
|
|
|
&& !ProjectStatus.CHANGE.eq(w.getStage())) { |
|
|
|
&& !ProjectStatus.ON_CHANGE_APPLY.eq(w.getStatus())) { |
|
|
|
return ProjectStatus.PROJECT_REVIEW_PASSED; |
|
|
|
} |
|
|
|
return ProjectStatus.getNoNull(w.getStatus()); |
|
|
@@ -198,7 +198,7 @@ public class ProjectReviewManage { |
|
|
|
&& !ProjectStatus.COMPLIANCE_REVIEW_PASSED.eq(w.getStatus()) |
|
|
|
&& !ProjectStatus.WITHOUT_PROJECT_REVIEW.eq(w.getStatus()) |
|
|
|
&& !ProjectStatus.ON_PROJECT_REVIEW.eq(w.getStatus()) |
|
|
|
&& !ProjectStatus.CHANGE.eq(w.getStage())) { |
|
|
|
&& !ProjectStatus.ON_CHANGE_APPLY.eq(w.getStatus())) { |
|
|
|
item.setStatus(ProjectStatus.PROJECT_REVIEW_PASSED.getCode()); |
|
|
|
} |
|
|
|
return item; |
|
|
|