Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-09-30 e18c4a8ac170fea6e079047a27f72032c80eee67

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java

@@ -114,9 +114,9 @@
        if(timeStart_open != null && timeStart_open != "") {
            timeStart_open = timeStart_open + " 00:00:00";
        } else {
            timeStart_open = LocalDate.now() + " 00:00:00";
            timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00";
        }
        qo.setTimeStop_open(timeStart_open);
        qo.setTimeStart_open(timeStart_open);

        if(timeStop_open != null && timeStop_open != "") {
            timeStop_open = timeStop_open + " 23:59:59";
@@ -130,7 +130,7 @@
        if(timeStart_close != null && timeStart_close != "") {
            timeStart_close = timeStart_close + " 00:00:00";
        } else {
            timeStart_close = LocalDate.now() + " 00:00:00";
            timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00";
        }
        qo.setTimeStart_close(timeStart_close);

@@ -163,7 +163,7 @@
        String timeStop_open = qo.getTimeStop_open();
        if(timeStart_open != null) {
            timeStart_open = timeStart_open + " 00:00:00";
            qo.setTimeStop_open(timeStart_open);
            qo.setTimeStart_open(timeStart_open);
        }
        if(timeStop_open != null) {
            timeStop_open = timeStop_open + " 23:59:59";