吉安感知网项目-后端
linwei
2026-04-23 a475d774d2a5302a8cd7549ab3da2bd8ed711fee
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,25 @@
         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()));
         // 将Long类型的部门ID转换为String类型
         List<String> deptIdStrList = new ArrayList<>();
         for (Long deptId : deptList) {
            deptIdStrList.add(String.valueOf(deptId));
         }
         queryWrapper.in(GdOperationalRevenue::getCreateDept, deptIdStrList);
      }
      // 按创建时间倒序
      queryWrapper.orderByDesc(GdOperationalRevenue::getCreateTime);