盈亏排序

This commit is contained in:
2025-06-20 15:45:53 +08:00
parent f5875180a4
commit 7a1128f316
4 changed files with 62 additions and 13 deletions

View File

@@ -1,5 +1,6 @@
package com.ruoyi.oa.controller;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Date;
@@ -232,14 +233,28 @@ public class SysOaProjectController extends BaseController {
*/
@GetMapping("/projectProfit")
public TableDataInfo<ProjectProfitLossVO> projectProfit(
@RequestParam(required = false) String projectName,
@RequestParam(required = false) String projectNum,
@RequestParam(required = false) String projectStatus,
@RequestParam(required = false) String isDomestic, // 国内外
@RequestParam(required = false) BigDecimal minContractAmount,
@RequestParam(required = false) BigDecimal maxContractAmount,
@RequestParam(required = false) BigDecimal minProfitLoss,
@RequestParam(required = false) BigDecimal maxProfitLoss,
@RequestParam(required = false) String beginTimeStart,
@RequestParam(required = false) String beginTimeEnd,
@RequestParam(required = false) String profitType, // "profit" 只看盈利, "loss" 只看亏损, null看全部
@RequestParam(required = false, defaultValue = "profit_loss") String sortField,
@RequestParam(required = false, defaultValue = "desc") String sortOrder,
PageQuery pageQuery
) {
// 这里PageQuery会自动带上orderByColumn和isAsc
pageQuery.setOrderByColumn(sortField);
pageQuery.setIsAsc(sortOrder);
return iSysOaProjectService.getProjectProfitLossList(sortField, sortOrder, pageQuery);
return iSysOaProjectService.getProjectProfitLossList(
projectName, projectNum, projectStatus, isDomestic,
minContractAmount, maxContractAmount,
minProfitLoss, maxProfitLoss,
beginTimeStart, beginTimeEnd, profitType,sortField, sortOrder, pageQuery);
}