From 8d4ad0d13ef71e22cc1036e2c6c00aafb20ed597 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 10 十二月 2024 17:41:58 +0800 Subject: [PATCH] 电路试验的驻波比csv报告解析 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 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 0158ffb..6f930c5 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 @@ -6,10 +6,10 @@ 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.SampleProductDto; import com.yuanchu.mom.dto.SampleProductDto2; import com.yuanchu.mom.pojo.InsOrder; import com.yuanchu.mom.vo.SampleDefectsFatherVo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -24,23 +24,33 @@ public interface InsOrderMapper extends BaseMapper<InsOrder> { //鑾峰彇妫�楠屼笅鍗曟暟鎹� - IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew); + IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew, String laboratory); //淇敼妫�楠屼笅鍗曟暟鎹� int upInsOrderParameter(InsOrder itemParameter); String getLaboratoryCode(String name); - IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew); + IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew,Integer id); IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew); + List<CostStatisticsDto> selectCostStatistics2(@Param("ew") QueryWrapper<CostStatisticsDto> ew); + List<Map<String, String>> selectDeviceList(Set<String> names); - List<SampleDefectsFatherVo> selectSampleDefects(Page page, String inspectionItems, String orderNumber); + List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber); - Long getCount(String inspectionItems, String orderNumber); -} + Long getCount(@Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber); + String getEnumLabelByValue(String value); + int updateStatus( Integer id); + String selLaboratoryCode(String laboratory); + List<Map<Integer, Object>> selectReportModelByOrderId(@Param("id") Integer id, @Param("laboratory") String laboratory); + + String seldepLimsId(int depLimsId); + + InsOrder selectById2(Integer id); +} \ No newline at end of file -- Gitblit v1.9.3