update

jinpengyong

2020-04-30 d1f1b489eea7730bb1cb78cdae24c626db835298

 src/main/java/com/moral/controller/ReportController.java

@@ -92,9 +92,18 @@
    public ResultBean<Boolean> getNExcelReport(HttpServletRequest request, HttpServletResponse response) throws Exception {

        Map<String, Object> parameters = getParametersStartingWith(request, null);

        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

        System.out.println(list);

        String type = parameters.get("type").toString();

        String time = parameters.get("time").toString();

        String timeb = parameters.get("timeb").toString();

        System.out.println(parameters);

        String timeb = "";

        if (parameters.get("timeb") == null) {

            timeb = parameters.get("time").toString();

        } else {

            timeb = parameters.get("timeb").toString();

        }





        String[] endTimes = timeb.split("-");

        String dateFormat = "";

        String beginTime = "";