大屏溯源统计次数sql修改

guoshilong

2022-11-08 72b971c98c46531064d74b68fc8fe8864ed0b544

 src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java

@@ -26,6 +26,7 @@

import java.util.List;
import java.util.Map;
import java.util.function.Consumer;

/**
 * 销售记录表 服务实现类
@@ -38,7 +39,19 @@

   @Override
   public IPage<SaleVO> selectSalePage(IPage<SaleVO> page, SaleVO sale) {
      return page.setRecords(baseMapper.selectSalePage(page, sale));

      List<SaleVO> saleVO = baseMapper.selectSalePage(page, sale);
      saleVO.forEach(new Consumer<SaleVO>() {
         @Override
         public void accept(SaleVO saleVO) {
            if (saleVO.getCityName() != null) {
               saleVO.setSaleDestination2(saleVO.getDistrict() + saleVO.getCityName() + saleVO.getCountyName());
            }else {
               saleVO.setSaleDestination2(saleVO.getDistrict());
            }
         }
      });
      return page.setRecords(saleVO);
   }

   @Override
@@ -61,8 +74,8 @@
      return baseMapper.selectMarketCirculate(sale);
   }
   @Override
   public List<Map<Object, String>> selectMarketDistrict(String farmId) {
      return baseMapper.selectMarketDistrict(farmId);
   public List<Map<Object, String>> selectMarketDistrict(String farmId,String startTime,String endTime) {
      return baseMapper.selectMarketDistrict(farmId,startTime,endTime);
   }

}