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

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java
View File

@@ -24,7 +24,7 @@ public interface ISysOaProjectService {
/**
* 项目盈亏排序
*/
TableDataInfo<ProjectProfitLossVO> getProjectProfitLossList(String projectName,String projectNum,String projectStatus,String isisDomestic,
TableDataInfo<ProjectProfitLossVO> getProjectProfitLossList(String projectName,String projectNum,String projectCode,Integer tradeType,String projectStatus,
BigDecimal minContractAmount,BigDecimal maxContractAmount,BigDecimal minProfitLoss,
BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,
PageQuery pageQuery);

9
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java
View File

@@ -70,10 +70,9 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
*/
@Override
public TableDataInfo<ProjectProfitLossVO> getProjectProfitLossList(
String projectName, String projectNum, String projectStatus, String isDomestic,
BigDecimal minContractAmount, BigDecimal maxContractAmount,
BigDecimal minProfitLoss, BigDecimal maxProfitLoss,
String beginTimeStart, String beginTimeEnd, String profitType,
String projectName,String projectNum,String projectCode,Integer tradeType,String projectStatus,
BigDecimal minContractAmount,BigDecimal maxContractAmount,BigDecimal minProfitLoss,
BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,
PageQuery pageQuery
) {
// 1. 获取实时汇率
@@ -83,6 +82,8 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
QueryWrapper<SysOaProject> wrapper = new QueryWrapper<>();
wrapper.like(StringUtils.isNotBlank(projectName), "p.project_name", projectName);
wrapper.like(StringUtils.isNotBlank(projectNum), "p.project_num", projectNum);
wrapper.like(StringUtils.isNotBlank(projectCode), "p.project_code", projectCode);
wrapper.eq(tradeType != null, "p.trade_type", tradeType);
wrapper.eq(StringUtils.isNotBlank(projectStatus), "p.project_status", projectStatus);
wrapper.ge(minContractAmount != null, "p.funds", minContractAmount);
wrapper.le(maxContractAmount != null, "p.funds", maxContractAmount);