fix(gd): 修复线索事件查询中的SQL语法错误

linwei

8 hours ago 08ddfad4530a014094c06fe68b8c2d9a0753403a

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java

@@ -5,13 +5,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Service;
import org.sxkj.gd.workorder.entity.GdOperationalRevenue;
import org.sxkj.gd.workorder.mapper.GdOperationalRevenueMapper;
import org.sxkj.gd.workorder.service.GdOperationalRevenueService;
import org.sxkj.gd.workorder.vo.GdOperationalRevenueVo;
import org.sxkj.system.cache.SysCache;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

/**
 * 运营收益Service实现类
@@ -21,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<>();

      // 根据营业收入查询 (转换为精确查询)
@@ -65,12 +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);
      }


      // 创建部门
       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);