|
|
@@ -540,7 +540,7 @@ public class PurchaseManage { |
|
|
|
projectService.updateById(project); |
|
|
|
} |
|
|
|
|
|
|
|
public AdaptionProgressStatVO adaptionProgressStatistics() { |
|
|
|
public AdaptionProgressStatVO adaptionProgressStatistics(PurchaseAdaptionListReq req) { |
|
|
|
LambdaQueryWrapper<Purchase> query = Wrappers.lambdaQuery(Purchase.class) |
|
|
|
.select(Purchase::getStatus, Purchase::getId) |
|
|
|
.eq(Purchase::getBidType, BidTypeEnum.BUILD_APP.getCode()) |
|
|
@@ -554,6 +554,16 @@ public class PurchaseManage { |
|
|
|
if (!purchaseService.buildPurchaseQueryPermission(query, user)) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
if (req.hasProjectQuery()) { |
|
|
|
List<Long> projectIds = filterProjectIdsForPurchase(req); |
|
|
|
if (projectIds.isEmpty()) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
query.in(Purchase::getProjectId, projectIds); |
|
|
|
} |
|
|
|
query.like(StrUtil.isNotBlank(req.getBidName()), Purchase::getBidName, req.getBidName()) |
|
|
|
.le(req.getCreateOnMax() != null, Purchase::getCreateOn, req.getCreateOnMax()) |
|
|
|
.ge(req.getCreateOnMin() != null, Purchase::getCreateOn, req.getCreateOnMin()); |
|
|
|
List<Purchase> purchases = purchaseService.list(query); |
|
|
|
return adaptionProgressStatistics(purchases); |
|
|
|
} |
|
|
|