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

lyfO_o

2021-06-11 e1454a154718e20abbab36d0def4de9124a07254

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

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

import com.nanometer.smartlab.entity.HazardousWaste;
import org.apache.ibatis.annotations.Param;

import java.util.*;

@@ -20,4 +21,18 @@
    List<HazardousWaste> selectAll(Map params);

    int countAll(Map params);
}

    List<Map> selectExportList(Map params);

    int countStatistics(Map<String, Object> params);

    List<HazardousWaste> selectStatistics(Map<String, Object> params);

    List<Map> selectStatisticsExportList(Map<String, Object> params);

    List<HazardousWaste> setAllWasters(@Param("starttime") String starttime,@Param("endtime") String endtime,@Param("status") String status,@Param("applyPerson") String applyPerson);

    HazardousWaste selectByTid(@Param("tid") String tid);

    List<HazardousWaste> setAllWasterCount(@Param("starttime") String starttime,@Param("endtime") String endtime,@Param("status") String status,@Param("applyPerson") String applyPerson);
}