change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/java/com/nanometer/smartlab/service/HazardousWasteServiceImpl.java

@@ -16,7 +16,7 @@
    private HazardousWasteMapper hazardousWasteMapper;

    @Override
    public List<HazardousWaste> selectAll(Date startTime, Date endTime,String status,String applyPerson,String project,String department,
    public List<HazardousWaste> selectAll(Date startTime, Date endTime,String status,String applyPerson,Long projectId,String department,
                                          String tid, Integer offset, Integer pageSize) {
        Map<String, Object> params = new HashMap<>();
        params.put("startTime", startTime);
@@ -27,14 +27,14 @@
            params.put("status", status);
        }
        params.put("applyPerson", applyPerson);
        params.put("project", project);
        params.put("projectId", projectId);
        params.put("department", department);
        params.put("tid", tid);
        return hazardousWasteMapper.selectAll(params);
    }

    @Override
    public int countAll(Date startTime, Date endTime,String status,String applyPerson,String project,String department,String tid) {
    public int countAll(Date startTime, Date endTime,String status,String applyPerson,Long projectId,String department,String tid) {
        Map<String, Object> params = new HashMap<>();
        params.put("startTime", startTime);
        params.put("endTime", endTime);
@@ -42,14 +42,14 @@
            params.put("status", status);
        }
        params.put("applyPerson", applyPerson);
        params.put("project", project);
        params.put("projectId", projectId);
        params.put("department", department);
        params.put("tid", tid);
        return hazardousWasteMapper.countAll(params);
    }

    @Override
    public List<Map> exportList(Date startTime, Date endTime, String status, String applyPerson, String project, String department,String tid) {
    public List<Map> exportList(Date startTime, Date endTime, String status, String applyPerson, Long projectId, String department,String tid) {
        Map<String, Object> params = new HashMap<>();
        params.put("startTime", startTime);
        params.put("endTime", endTime);
@@ -57,7 +57,7 @@
            params.put("status", status);
        }
        params.put("applyPerson", applyPerson);
        params.put("project", project);
        params.put("projectId", projectId);
        params.put("department", department);
        params.put("tid", tid);
        return hazardousWasteMapper.selectExportList(params);
@@ -83,7 +83,7 @@
    }

    @Override
    public int countStatistics(Date startTime, Date endTime, String status, String applyPerson, String project, String department) {
    public int countStatistics(Date startTime, Date endTime, String status, String applyPerson, Long projectId, String department) {
        Map<String, Object> params = new HashMap<>();
        params.put("startTime", startTime);
        params.put("endTime", endTime);
@@ -91,13 +91,13 @@
            params.put("status", status);
        }
        params.put("applyPerson", applyPerson);
        params.put("project", project);
        params.put("projectId", projectId);
        params.put("department", department);
        return hazardousWasteMapper.countStatistics(params);
    }

    @Override
    public List<HazardousWaste> selectStatistics(Date startTime, Date endTime, String status, String applyPerson, String project, String department, int first, int pageSize) {
    public List<HazardousWaste> selectStatistics(Date startTime, Date endTime, String status, String applyPerson, Long projectId, String department, int first, int pageSize) {
        Map<String, Object> params = new HashMap<>();
        params.put("startTime", startTime);
        params.put("endTime", endTime);
@@ -107,13 +107,13 @@
            params.put("status", status);
        }
        params.put("applyPerson", applyPerson);
        params.put("project", project);
        params.put("projectId", projectId);
        params.put("department", department);
        return hazardousWasteMapper.selectStatistics(params);
    }

    @Override
    public List<Map> exportStatisticsList(Date startTime, Date endTime, String status, String applyPerson, String project, String department) {
    public List<Map> exportStatisticsList(Date startTime, Date endTime, String status, String applyPerson, Long projectId, String department) {
        Map<String, Object> params = new HashMap<>();
        params.put("startTime", startTime);
        params.put("endTime", endTime);
@@ -121,7 +121,7 @@
            params.put("status", status);
        }
        params.put("applyPerson", applyPerson);
        params.put("project", project);
        params.put("projectId", projectId);
        params.put("department", department);
        return hazardousWasteMapper.selectStatisticsExportList(params);
    }