Merge remote-tracking branch 'origin/master'

zss

2024-07-26 ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e

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

@@ -24,7 +24,7 @@
public interface InsOrderMapper extends BaseMapper<InsOrder> {

    //获取检验下单数据
    IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew);
    IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, @Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory);

    //修改检验下单数据
    int upInsOrderParameter(InsOrder itemParameter);
@@ -34,6 +34,8 @@
    IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew);

    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, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
@@ -49,4 +51,11 @@
    String selLaboratoryCode(String laboratory);

    List<Map<Integer, Object>> selectReportModelByOrderId(@Param("id") Integer id, @Param("laboratory") String laboratory);

    String seldepLimsId(int depLimsId);

    Map<String, Object> getDeviceMessage(@Param("ip")String ip,
                                         @Param("inspectionItem") String inspectionItem,
                                         @Param("inspectionItemSubclass") String inspectionItemSubclass,
                                         @Param("sample") String sample);
}