修改危废统计

李宇

2021-07-02 3da43e60cd97ad330dcc0911d76bb3c395a65b0c

修改危废统计

 src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java

@@ -62,6 +62,8 @@
                                if (pageCount > 0)
                                    list = hazardousWasteService.selectAll(startTime,endTime,status,applyPerson,getUser().getProject(),department,tid,first, pageSize);
                            }
                        }else {
                            this.setRowCount(0);
                        }
                        //查询更换模式
                        if (isSearch) {
@@ -108,11 +110,21 @@

                    List<HazardousWaste> list = null;
                    try {
                        int pageCount = hazardousWasteService.countStatistics(startTime,endTime,status,applyPerson,project,department);

                        this.setRowCount(pageCount);
                        if (pageCount > 0)
                            list = hazardousWasteService.selectStatistics(startTime,endTime,status,applyPerson,project,department,first, pageSize);
                        if (getUser().getWaster() != null){
                            if (getUser().getWaster().equals(Waster.MANAGE)){
                                int pageCount = hazardousWasteService.countStatistics(startTime,endTime,status,applyPerson,project,department);
                                this.setRowCount(pageCount);
                                if (pageCount > 0)
                                    list = hazardousWasteService.selectStatistics(startTime,endTime,status,applyPerson,project,department,first, pageSize);
                            }else if (StringUtils.isNotBlank(getUser().getProject())){
                                int pageCount = hazardousWasteService.countStatistics(startTime,endTime,status,applyPerson,getUser().getProject(),department);
                                this.setRowCount(pageCount);
                                if (pageCount > 0)
                                    list = hazardousWasteService.selectStatistics(startTime,endTime,status,applyPerson,getUser().getProject(),department,first, pageSize);
                            }
                        }else {
                            this.setRowCount(0);
                        }

                        //查询更换模式
                        if (isAnalysSearch) {
@@ -235,7 +247,14 @@
    }

    public void exportStatistics2Excel(){
        List<Map> list = hazardousWasteService.exportStatisticsList(startTime,endTime,status,applyPerson,project,department);
        List<Map> list = new ArrayList<>();
        if (getUser().getWaster() != null){
            if (getUser().getWaster().equals(Waster.MANAGE)){
                list = hazardousWasteService.exportStatisticsList(startTime,endTime,status,applyPerson,project,department);
            }else if (StringUtils.isNotBlank(getUser().getProject())){
                list = hazardousWasteService.exportStatisticsList(startTime,endTime,status,applyPerson,getUser().getProject(),department);
            }
        }
        try{
            hazardousWasteService.exportStatistics2Excel(list);
        }catch (Exception e){