DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重新修改盈亏逻辑

Browse Source
This commit is contained in:
Joshi
2025-06-23 10:38:17 +08:00
parent ca2ea16d40
commit cd2aa28f0d
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
View File

@@ -235,15 +235,16 @@ public class SysOaProjectController extends BaseController {
public TableDataInfo<ProjectProfitLossVO> projectProfit(
@RequestParam(required = false) String projectName,
@RequestParam(required = false) String projectNum,
@RequestParam(required = false) String projectCode,
@RequestParam(required = false) Integer tradeType,
@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) String profitType,
@RequestParam(required = false, defaultValue = "profit_loss") String sortField,
@RequestParam(required = false, defaultValue = "desc") String sortOrder,
PageQuery pageQuery
@@ -252,7 +253,7 @@ public class SysOaProjectController extends BaseController {
pageQuery.setIsAsc(sortOrder);
System.out.println("收到");
return iSysOaProjectService.getProjectProfitLossList(
projectName, projectNum, projectStatus,isDomestic,
projectName, projectNum, projectCode, tradeType, projectStatus,
minContractAmount, maxContractAmount,
minProfitLoss, maxProfitLoss,
beginTimeStart, beginTimeEnd, profitType, pageQuery);