Merge remote-tracking branch 'origin/master' into master

lyfO_o

2021-10-27 ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7

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

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

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

@@ -30,9 +31,25 @@

    OpeUseFlow getOpeUseFlowByCode(@Param("reagentCode") String reagentCode);

    void updateReceiptNumber(String code, String receiptNumber);
    void updateReceiptNumber(String code, String receiptNumber,String note);

    List<Map> getRegentInfoFromReceiptNumber(String receiptNumber);

    Map getUserIdByReagentCode(String reagentCode, String id);

    int countPersonalUseInfo(Map params);

    List<OpeUseFlow> selectPersonalUseInfo(Map params);

    List<PersonUseDetail> getApplyInfo(Map params);

    int getApplyInfoSize(Map params);

    int countOpeUseFlow(OpeUseFlow opeUseFlow);

    OpeUseFlow selectById(@Param("id") String id);

    OpeUseFlow selectByReceiptNumber(Map params);

    List<Map> selectAll(Map params);
}