Merge remote-tracking branch 'origin/master'

zss

2023-08-07 78c62a33671bdcfb0f2019c520f807a4c56fc741

 standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java

@@ -20,9 +20,15 @@
 */
public interface ProductMapper extends BaseMapper<Product> {

    List<Product> selectProductByMaterialId(String materialId);
    //根据物料id查询检验项目
    List<Map> selectProductByMaterialId(int materialId);

    IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);

    Map<String, Object> selectOneChildren(Object father);

    Map<String, Object> getProductInformation(Integer productId);

    //通过项目名查询项目的试验方法
    List<Map> selectInstrumentByProname(String name);
}