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

feat(oa): 增加签约公司作为项目盈亏列表的筛选条件

Browse Source 
- 在 ISysOaProjectService 接口中，增加了 signingCompany 参数
- 在 SysOaProjectController 控制器中，添加了 signingCompany 参数的请求处理
- 在 SysOaProjectServiceImpl 服务实现类中，实现了签约公司作为筛选条件的查询逻辑
This commit is contained in:
Joshi
2025-09-06 16:30:22 +08:00
parent ed96307797
commit b1bbbec067
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

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

@@ -26,7 +26,7 @@ public interface ISysOaProjectService {
*/
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,
BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType,Integer signingCompany,
PageQuery pageQuery);
/**
* 查询项目管理

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

@@ -72,7 +72,7 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
public 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,
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 = "(" +