diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmQuoteInfoMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmQuoteInfoMapper.java index f5d9ac4d..3a772e60 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmQuoteInfoMapper.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmQuoteInfoMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.oa.crm.domain.CrmQuoteInfo; import org.dromara.oa.crm.domain.vo.CrmQuoteInfoVo; @@ -27,6 +29,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus selectCustomCrmQuoteInfoVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); /** @@ -35,6 +41,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus selectCustomCrmQuoteInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); /** @@ -59,6 +69,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus queryWrapper); /** @@ -68,6 +82,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus selectCustomCrmQuoteInfoVoPage(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); /** @@ -108,6 +126,10 @@ public interface CrmQuoteInfoMapper extends BaseMapperPlus queryWrapper); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java index edf01aea..70e7026f 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java @@ -12,7 +12,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.oa.crm.domain.*; import org.dromara.oa.crm.domain.bo.CrmQuoteInfoBo; import org.dromara.oa.crm.domain.bo.CrmQuoteMaterialBo; -import org.dromara.oa.crm.domain.bo.CrmSupplierInfoBo; import org.dromara.oa.crm.domain.vo.CrmCustomerContactVo; import org.dromara.oa.crm.domain.vo.CrmQuoteInfoVo; import org.dromara.oa.crm.domain.vo.CrmQuoteMaterialVo; @@ -23,9 +22,9 @@ import org.dromara.oa.crm.service.ICrmQuoteInfoService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.*; import java.util.stream.Collectors; /** @@ -88,7 +87,7 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService { @Override public List queryList(CrmQuoteInfoBo bo) { MPJLambdaWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + return baseMapper.selectCustomCrmQuoteInfoVoList(lqw); } private MPJLambdaWrapper buildQueryWrapper(CrmQuoteInfoBo bo) {