From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java
index 3aea404..c06cf09 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java
@@ -14,6 +14,7 @@
import org.sxkj.system.cache.SysCache;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -24,7 +25,7 @@
implements GdOperationalRevenueService {
@Override
- public IPage<GdOperationalRevenue> selectPage(Page<GdOperationalRevenue> page, String operatingIncome, String totalCost, String netProfit, String financialIrr, String marketSpace, String nickName) {
+ public IPage<GdOperationalRevenue> selectPage(Page<GdOperationalRevenue> page, String operatingIncome, String totalCost, String netProfit, String financialIrr, String marketSpace, String earnForecast, String nickName) {
LambdaQueryWrapper<GdOperationalRevenue> queryWrapper = new LambdaQueryWrapper<>();
// 根据营业收入查询 (转换为精确查询)
@@ -68,13 +69,20 @@
queryWrapper.like(GdOperationalRevenue::getMarketSpace, marketSpace);
}
+ // 根据收益预测模糊查询
+ if (StringUtils.hasText(earnForecast)) {
+ queryWrapper.like(GdOperationalRevenue::getEarnForecast, earnForecast);
+ }
+
// 根据创建人名称模糊查询
if (StringUtils.hasText(nickName)) {
queryWrapper.like(GdOperationalRevenue::getNickName, nickName);
}
// 创建部门
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- queryWrapper.in(GdOperationalRevenue::getCreateDept, deptList);
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ queryWrapper.in(GdOperationalRevenue::getCreateDept, deptList);
+ }
// 按创建时间倒序
queryWrapper.orderByDesc(GdOperationalRevenue::getCreateTime);
--
Gitblit v1.9.3