Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-18 b864a88a6d34cbed2cfaad7f5e843ea1330c9c91

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.dto.sd.OrderDetailProductDTO;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;

@@ -28,4 +29,18 @@
    Map<String,Integer>  getOrderProductSummaryTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, String product);

    List<OrderDTO> exportOrderProductSummary(List<LocalDate> dates);

    List<OrderDetailProductDTO> exportOrderReportProduct(List<LocalDate> dates);

    Map<String, String> getOrderProductDetailTag(String orderId);

    List<Map<String,Object>> getOrderProductDistinctById(String orderId);

    List<Map<String,Object>> getOrderProductDistinctByIds(String orderId,List<String> productId);

    List<OrderDetail> getOrderProductByProductId(Object productId, String orderId);

    List<Map<String,Object>> getOrderProductByProductIds(Object productId, String orderId);


}