diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java index 9073600..a617d3f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java @@ -245,6 +245,7 @@ public class SysOaProjectController extends BaseController { @RequestParam(required = false) String beginTimeStart, @RequestParam(required = false) String beginTimeEnd, @RequestParam(required = false) String profitType, + @RequestParam(required = false) Integer signingCompany, @RequestParam(required = false, defaultValue = "profit_loss") String sortField, @RequestParam(required = false, defaultValue = "desc") String sortOrder, PageQuery pageQuery @@ -256,7 +257,7 @@ public class SysOaProjectController extends BaseController { projectName, projectNum, projectCode, tradeType, projectStatus, minContractAmount, maxContractAmount, minProfitLoss, maxProfitLoss, - beginTimeStart, beginTimeEnd, profitType, pageQuery); + beginTimeStart, beginTimeEnd, profitType,signingCompany, pageQuery); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java index 74139ec..2beeb98 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java @@ -26,7 +26,7 @@ public interface ISysOaProjectService { */ TableDataInfo 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, + BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,Integer signingCompany, PageQuery pageQuery); /** * 查询项目管理 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java index bf83d66..1edcdc1 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java @@ -72,7 +72,7 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { public TableDataInfo 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, + BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,Integer signingCompany, PageQuery pageQuery ) { // 1. 获取实时汇率 @@ -89,6 +89,8 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { wrapper.le(maxContractAmount != null, "p.funds", maxContractAmount); wrapper.ge(StringUtils.isNotBlank(beginTimeStart), "p.begin_time", beginTimeStart); wrapper.le(StringUtils.isNotBlank(beginTimeEnd), "p.begin_time", beginTimeEnd); + //把签约公司也作为筛选条件 + wrapper.like(signingCompany!=null, "p.signing_company", signingCompany); // 先把 profit_loss 的 CASE 表达式完整地组装成一个字符串 String profitLossExpr = "(" +