Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-09 0c03b83cc8e26963275d9ef16ea476ecdc035a0d

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java

@@ -3,12 +3,16 @@
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.SampleProductDto;
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 gaoaoy
@@ -28,6 +32,14 @@

    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);

    String getEnumLabelByValue(String value);
}