Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r32261 -r32270 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 32261) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 32270) @@ -8359,8 +8359,8 @@ List list = new ArrayList(); if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { - String startDateTime = startTime + " 00:00:00"; - String endDateTime = endTime + " 23:59:59"; + String startDateTime = startTime + ":00"; + String endDateTime = endTime + ":59"; // 是否在装配界面显示检查人,默认值为false Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js =================================================================== diff -u -r30854 -r32270 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js (.../statisticalWorkloadView.js) (revision 30854) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js (.../statisticalWorkloadView.js) (revision 32270) @@ -166,8 +166,10 @@ }); supplyRoomRemoteStore.load();//20181225 end var dt = new Date(); - var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01"; - + var fullYear = dt.getFullYear(); + var startDayofMonth = fullYear + "/" + (dt.getMonth() + 1) + "/01"; + var currentDate = fullYear + "/" + (dt.getMonth() + 1) + "/" + dt.getDate(); + var endOfToday = new Date(Date.parse(currentDate + " 23:59:59")); /** * 器械包combo的store */ @@ -210,7 +212,7 @@ id : 'startTime', name : 'startTime', editable : false, - format : 'Y-m-d', + format : 'Y-m-d H:i', altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', allowBlank : false, anchor : '95%', @@ -240,11 +242,13 @@ id : 'endTime', name : 'endTime', editable : false, - format : 'Y-m-d', + format : 'Y-m-d H:i', altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', allowBlank : false, anchor : '95%', - value:new Date(), + value: endOfToday, + theHours : 23, + theMinutes : 59, listeners : { specialkey : function(field, e) { if (e.getKey() == Ext.EventObject.ENTER) { @@ -471,11 +475,10 @@ minWidth : 70, iconCls : 'icon_search', handler : function() { - var dateTime = new Date(); - var startDate = dateTime.getFullYear() + "/01/01"; - var endDate = dateTime.getFullYear() + "/12/31"; - Ext.getCmp('startTime').setValue(startDate); - Ext.getCmp('endTime').setValue(endDate); + var startDate = fullYear + "/01/01"; + var endDate = fullYear + "/12/31"; + Ext.getCmp('startTime').setValue(new Date(Date.parse(startDate + " 00:00"))); + Ext.getCmp('endTime').setValue(new Date(Date.parse(endDate + " 23:59"))); reloadReport(); } },{