blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-05-23 ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java


@@ -9,12 +9,12 @@


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.example.erp.common.Constants;


import com.example.erp.dto.sd.OrderDTO;


import com.example.erp.entity.sd.*;


import com.example.erp.entity.userInfo.SysError;


import com.example.erp.exception.ServiceException;


import com.example.erp.mapper.sd.*;


import com.example.erp.service.userInfo.SysErrorService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;


@@ -303,7 +303,7 @@




        Map<String,Object> map = new HashMap<>();


        map.put("data",orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail));


        map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail));


        map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail,"order"));


        List<String> list = new ArrayList<>();


        list.add(startDate);


        list.add(endDate);


@@ -312,8 +312,8 @@


        return map;


    }




    public List<Order> exportOrderReport() {


        return orderDetailMapper.exportOrderReport();


    public List<OrderDTO> exportOrderReport(List<LocalDate> dates) {


        return orderDetailMapper.exportOrderReport(dates);


    }




    public Map<String,Object> getOrderProductSummary(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {


@@ -331,7 +331,7 @@




        Map<String,Object> map = new HashMap<>();


        map.put("data",orderDetailMapper.getOrderProductSummary(offset, pageSize, startDate, endDate, orderDetail));


        map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail));


        map.put("total",orderDetailMapper.getOrderProductSummaryTotal(offset, pageSize, startDate, endDate, orderDetail, "product"));


        List<String> list = new ArrayList<>();


        list.add(startDate);


        list.add(endDate);


@@ -339,4 +339,8 @@


//        map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));


        return map;


    }




    public List<OrderDTO> exportOrderProductSummary(List<LocalDate> dates) {


        return orderDetailMapper.exportOrderProductSummary(dates);


    }


}