Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-01 2dc478231fd09a88a4d86d44388ae807aca08bc5

 medicalWaste-system/src/main/java/com/sinata/system/service/MwMicroEquipmentRecordService.java

@@ -6,6 +6,7 @@
import com.sinata.system.domain.dto.MwMicroEquipmentRecordDTO;
import com.sinata.system.domain.query.MwMicroEquipmentRecordQuery;
import com.sinata.system.domain.query.MwMicroEquipmentStaticsQuery;
import com.sinata.system.domain.vo.DepartmentReportVO;
import com.sinata.system.domain.vo.MwMicroEquipmentRecordVO;
import com.sinata.system.domain.vo.MwMicroEquipmentStaticsTitleVO;

@@ -29,6 +30,14 @@
     * @return
     */
    PageDTO<MwMicroEquipmentRecordVO> pageList(MwMicroEquipmentRecordQuery query);

    /**
     * 设备使用详情
     *
     * @param id
     * @return
     */
    MwMicroEquipmentRecordVO detail(Long id);

    /**
     * 导出设备使用记录
@@ -60,7 +69,7 @@
     * @param query
     * @return
     */
    List<List<String>> getStaticsData(MwMicroEquipmentStaticsQuery query);
    DepartmentReportVO getStaticsData(MwMicroEquipmentStaticsQuery query);

    /**
     * 处置分析导出
@@ -69,4 +78,5 @@
     * @param response
     */
    void staticsExport(MwMicroEquipmentStaticsQuery query, HttpServletResponse response) throws IOException;

}