|
|
@@ -145,7 +145,6 @@ public class PurchaseManage { |
|
|
|
} |
|
|
|
//待采购状态 |
|
|
|
query.notIn(Project::getStage, ProjectStatus.STOPPED.getCode(), ProjectStatus.CHANGE.getCode()) |
|
|
|
.eq(Project::getStage, ProjectStatus.PROJECT_APPROVED.getCode()) |
|
|
|
.eq(Project::getNewest, Boolean.TRUE) |
|
|
|
.exists(ExistsSqlConst.PROJECT_EXISTS_STATUS_CHANGE + |
|
|
|
" and npsc.event = {0}", ProjectStateChangeEvent.DECLARED_RECORD_PASS) |
|
|
@@ -187,7 +186,6 @@ public class PurchaseManage { |
|
|
|
} |
|
|
|
//待采购状态 |
|
|
|
query.notIn(Project::getStage, ProjectStatus.STOPPED.getCode(), ProjectStatus.CHANGE.getCode()); |
|
|
|
query.eq(Project::getStage, ProjectStatus.PROJECT_APPROVED.getCode()); |
|
|
|
query.eq(Project::getNewest, Boolean.TRUE); |
|
|
|
query.orderByAsc(Project::getApprovalDate); |
|
|
|
ProjectManageUtil.projectBaseQuery(query); |
|
|
|