问题处理

hx-sale/src/main/java/com/fjhx/sale/service/serviceContract/impl/ServiceContractServiceImpl.java

@@ -3,7 +3,6 @@ package com.fjhx.sale.service.serviceContract.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,19 +60,21 @@ public class ServiceContractServiceImpl extends ServiceImpl<ServiceContractMappe
         //审批状态
         query.eq(ObjectUtil.isNotEmpty(dto.getStatus()),"sc.status",dto.getStatus());
         //服务状态
-        query.eq(ObjectUtil.isNotEmpty(dto.getServiceStatus()),"cc.status",dto.getServiceStatus());
+        query.eq(ObjectUtil.isNotEmpty(dto.getServiceStatus()), "cr.status", dto.getServiceStatus());
         //归属公司查询
-        query.eq(ObjectUtil.isNotEmpty(dto.getSellCorporationId()),"sc.sell_corporation_id",dto.getSellCorporationId());
+        query.eq(ObjectUtil.isNotEmpty(dto.getSellCorporationId()), "sc.sell_corporation_id", dto.getSellCorporationId());
         //客户查询
-        query.eq(ObjectUtil.isNotEmpty(dto.getBuyCorporationId()),"sc.buy_corporation_id",dto.getBuyCorporationId());
+        query.eq(ObjectUtil.isNotEmpty(dto.getBuyCorporationId()), "sc.buy_corporation_id", dto.getBuyCorporationId());
         //合同编码查询
-        query.eq(ObjectUtil.isNotEmpty(dto.getCode()),"sc.code",dto.getCode());
+        query.eq(ObjectUtil.isNotEmpty(dto.getCode()), "sc.code", dto.getCode());
         //合同金额
-        query.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()),"sc.amount",dto.getEndAmount());
-        query.le(ObjectUtil.isNotEmpty(dto.getEndAmount()),"sc.amount",dto.getEndAmount());
+        query.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()), "sc.amount", dto.getEndAmount());
+        query.le(ObjectUtil.isNotEmpty(dto.getEndAmount()), "sc.amount", dto.getEndAmount());
         //下单时间
-        query.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()),"sc.create_time",dto.getBeginAmount());
-        query.ge(ObjectUtil.isNotEmpty(dto.getEndTime()),"sc.create_time",dto.getEndTime());
+        query.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "sc.create_time", dto.getBeginAmount());
+
+
+        query.groupBy("sc.id");
 
         //查询服务合同列表
         Page<ServiceContractVo> page = this.baseMapper.getPage(dto.getPage(), query);