Merge remote-tracking branch 'origin/master'

李宇

2021-06-25 e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51

 src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java

@@ -1,6 +1,8 @@
package com.nanometer.smartlab.dao;

import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.entity.dto.LaboratoryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;

import java.util.List;
@@ -27,4 +29,10 @@
    public SysLaboratory getSysLaboratoryByBarCodeForExport(String barCode) throws DataAccessException;

    public  void updateLabExport(SysLaboratory sysLaboratory);

    List<Map> exportLabList(Map params);

    List<LaboratoryVo.Laboratory> getLaboratoryByProject(@Param("project") String project);

    SysLaboratory getSysLaboratoryByName(String name);
}