Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/instrumentrepairreport/handler/InstrumentRepairBarChartReportHandler.java =================================================================== diff -u -r41570 -r41577 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/instrumentrepairreport/handler/InstrumentRepairBarChartReportHandler.java (.../InstrumentRepairBarChartReportHandler.java) (revision 41570) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/instrumentrepairreport/handler/InstrumentRepairBarChartReportHandler.java (.../InstrumentRepairBarChartReportHandler.java) (revision 41577) @@ -23,6 +23,7 @@ import com.forgon.disinfectsystem.jasperreports.service.JasperReportsHandler; import com.forgon.systemsetting.model.HttpOption; import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.date.DateTools; import com.forgon.tools.db.InitDbConnection; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.SqlUtils; @@ -53,7 +54,9 @@ return null; } startTime += "-01 00:00:00"; - endTime += "-01 00:00:00"; + //把endTime 改为2021-02 - 月底的时分秒 + String[] endTimeStr = endTime.split("-"); + endTime = DateTools.getLastDayOfMonthByDate(endTimeStr[0], endTimeStr[1]) + " 23:59:59"; String repairStatus = requestParameters.get("repairStatus"); String registrantName = requestParameters.get("registrantName"); String materialName = requestParameters.get("materialName");