Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js =================================================================== diff -u -r17582 -r19137 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 17582) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 19137) @@ -7,7 +7,6 @@ */ var myMask; function reloadReport(){ - if (!form.getForm().isValid()) { showResult('请正确填写表单各值'); return false; @@ -29,7 +28,6 @@ "&departCoding=" + departCoding + "&tousseTypes=" + tousseTypes, 'thisIframe', '_self'); - } @@ -64,19 +62,21 @@ height : 40, labelWidth : 70, items : [{ - width : 200, + width : 230, layout : 'form', items : [{ - xtype : 'datefield', + xtype : 'datefieldWithMin', fieldLabel : '开始日期', 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%', value: new Date(startDayofMonth), + theHours : 0, + theMinutes : 0, listeners : { specialkey : function(field, e) { if (e.getKey() == Ext.EventObject.ENTER) { @@ -94,19 +94,21 @@ } }] },{ - width : 200, + width : 230, layout : 'form', items : [{ - xtype : 'datefield', + xtype : 'datefieldWithMin', fieldLabel : '结束日期', 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(), + theHours : 23, + theMinutes : 59, listeners : { specialkey : function(field, e) { if (e.getKey() == Ext.EventObject.ENTER) { Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r19054 -r19137 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 19054) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 19137) @@ -10430,11 +10430,11 @@ public List getTousseWorkLoadData(String startTime, String endTime, String departCoding, String tousseTypes) { long ll = System.currentTimeMillis(); - if(StringUtils.isNotBlank(startTime) && startTime.trim().length() == 10){ - startTime = startTime + " 00:00:00"; + if(StringUtils.isNotBlank(startTime) && startTime.trim().length() == 16){ + startTime = startTime + ":00"; } - if(StringUtils.isNotBlank(endTime) && endTime.trim().length() == 10){ - endTime = endTime + " 23:59:59"; + if(StringUtils.isNotBlank(endTime) && endTime.trim().length() == 16){ + endTime = endTime + ":59"; } String dateFormatter = "yyyy-mm-dd HH24:MI:SS";