From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 09:57:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java b/src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java
index 32ef20e..55d5219 100644
--- a/src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java
+++ b/src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java
@@ -8,8 +8,27 @@
public interface HazardousWasteService {
- List<HazardousWaste> selectAll(Date startTime, Date endTime, Integer offset, Integer pageSize);
+ List<HazardousWaste> selectAll(Date startTime, Date endTime,String status,String applyPerson,String project,String department,String tid,Integer offset, Integer pageSize);
- int countAll(Date startTime, Date endTime);
+ int countAll(Date startTime, Date endTime,String status,String applyPerson,String project,String department,String tid);
+ List<Map> exportList(Date startTime, Date endTime, String status, String applyPerson, String project, String department,String tid);
+
+ void export2Excel(List<Map> list) throws Exception;
+
+ int countStatistics(Date startTime, Date endTime, String status, String applyPerson, String project, String department);
+
+ List<HazardousWaste> selectStatistics(Date startTime, Date endTime, String status, String applyPerson, String project, String department, int first, int pageSize);
+
+ List<Map> exportStatisticsList(Date startTime, Date endTime, String status, String applyPerson, String project, String department);
+
+ void exportStatistics2Excel(List<Map> list)throws Exception;
+
+ void insertInfo(HazardousWaste hazardousWaste);
+
+ List<HazardousWaste> setAllWasters(String starttime, String endtime, String status, String applyPerson);
+
+ HazardousWaste selectByTid(String tid);
+
+ void updateWaste(HazardousWaste hazardousWaste);
}
--
Gitblit v1.9.2