修改

xuhy

4 天以前 b8cebfa38ff8cd2065431a8f18c79e480d64ff10

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.system.dto.TSysOrderDto;
import com.ruoyi.system.dto.TSysOrderNextDto;
import com.ruoyi.system.mapper.*;
@@ -12,6 +13,8 @@
import com.ruoyi.system.service.TCrmClinicService;
import com.ruoyi.system.service.TErpClinicOutboundService;
import com.ruoyi.system.service.TSysOrderService;
import com.ruoyi.system.vo.ClinicSalesStatisticsGoodsCountVO;
import com.ruoyi.system.vo.ClinicSalesStatisticsGoodsTypeVO;
import com.ruoyi.system.vo.TSysOrderPageVo;
import com.ruoyi.system.vo.TSysOrderVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,7 +72,7 @@
        for (TSysOrderVO sysOrderVO : sysOrderVOS) {
            sysOrderVO.setSysOrderGoods(sysOrderGoodsList.stream().filter(sysOrderGoods -> sysOrderGoods.getOrderId().equals(sysOrderVO.getId())).collect(Collectors.toList()));
        }
        return this.baseMapper.queryListByAppUserId(id);
        return sysOrderVOS;
    }

    @Override
@@ -116,6 +119,7 @@
            tSysOrderGoods1.setBatchId(tErpClinicWarehousingBatch.getId());
            tSysOrderGoods1.setBatchNumber(tErpClinicWarehousingBatch.getBatchNumber());
            tSysOrderGoods1.setRemainingQuantity(sysOrderNextDto.getRemainingQuantity());
            tSysOrderGoods1.setGoodsId(goods.getId());
            tSysOrderGoods.add(tSysOrderGoods1);


@@ -156,4 +160,34 @@
        }

    }

    @Override
    public Integer clinicSalesStatisticsCount(List<String> clinicIds) {
        return this.baseMapper.clinicSalesStatisticsCount(clinicIds);
    }

    @Override
    public Integer clinicSalesStatisticsTypeCount(List<String> clinicIds) {
        return this.baseMapper.clinicSalesStatisticsTypeCount(clinicIds);
    }

    @Override
    public BigDecimal clinicSalesStatisticsMoney(String clinicId, String startTime, String endTime) {
        return this.baseMapper.clinicSalesStatisticsMoney(clinicId,startTime,endTime);
    }

    @Override
    public List<ClinicSalesStatisticsGoodsTypeVO> clinicSalesStatisticsGoodsType(String clinicId, String startTime, String endTime) {
        return this.baseMapper.clinicSalesStatisticsGoodsType(clinicId,startTime,endTime);
    }

    @Override
    public List<ClinicSalesStatisticsGoodsCountVO> clinicSalesStatisticsGoodsCount(String clinicId, String startTime, String endTime, String goodsName) {
        return this.baseMapper.clinicSalesStatisticsGoodsCount(clinicId,startTime,endTime,goodsName);
    }

    @Override
    public List<ClinicSalesStatisticsGoodsCountVO> clinicSalesStatisticsGoodsCountMonth(String clinicId, String startTime, String endTime, String goodsName) {
        return this.baseMapper.clinicSalesStatisticsGoodsCountMonth(clinicId,startTime,endTime,goodsName);
    }
}