From e706cc37a9643f2aac1791e45e30817ebcb564ae Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期三, 01 五月 2024 10:13:28 +0800 Subject: [PATCH] 费用统计增加时间段搜索 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java index d7c78b8..e2df74a 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java @@ -1,22 +1,43 @@ package com.yuanchu.mom.mapper; -import com.yuanchu.mom.dto.OrderThingDto; -import com.yuanchu.mom.pojo.InsOrder; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.dto.CostStatisticsDto; +import com.yuanchu.mom.dto.SampleOrderDto; +import com.yuanchu.mom.dto.SampleProductDto2; +import com.yuanchu.mom.pojo.InsOrder; +import com.yuanchu.mom.vo.SampleDefectsFatherVo; import java.util.List; import java.util.Map; +import java.util.Set; /** -* @author Administrator -* @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淢apper -* @createDate 2024-03-08 09:44:13 -* @Entity com.yuanchu.mom.pojo.InsOrder -*/ + * @author gaoaoy + * @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淢apper + * @createDate 2024-03-12 16:17:55 + * @Entity com.yuanchu.mom.pojo.InsOrder + */ public interface InsOrderMapper extends BaseMapper<InsOrder> { - List<OrderThingDto> getOrderThing(); + //鑾峰彇妫�楠屼笅鍗曟暟鎹� + IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew); + //淇敼妫�楠屼笅鍗曟暟鎹� + int upInsOrderParameter(InsOrder itemParameter); + + String getLaboratoryCode(String name); + + IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew); + + IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew); + + List<Map<String, String>> selectDeviceList(Set<String> names); + List<SampleDefectsFatherVo> selectSampleDefects(Page page, String inspectionItems, String orderNumber); + + Long getCount(String inspectionItems, String orderNumber); } -- Gitblit v1.9.3