Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r28265 -r28269 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28265) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28269) @@ -11312,11 +11312,14 @@ } List list = new LinkedList(); if (StringUtils.isNotBlank(endDay)) { - endDay += " 23:59:59"; + endDay += ":59"; } + if (StringUtils.isNotBlank(startDay)) { + startDay += ":00"; + } StringBuilder sqlBuilder = new StringBuilder(); String sql = String - .format("select tit.tousseName,f.id,ti.supplierName,i.applicationTime,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.ascriptionDepartment,f.doctor,f.processType,count(tit.id) amount from %s f join %s i on f.id=i.id left join %s ti on ti.recyclingApplication_ID=i.id left join %s tit on tit.foreignTousseApp_id=f.id where (i.applicationTime between %s and %s) ", + .format("select f.receiveTime,tit.tousseName,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.ascriptionDepartment,f.doctor,f.processType,count(tit.id) amount from %s f join %s i on f.id=i.id left join %s ti on ti.recyclingApplication_ID=i.id left join %s tit on tit.foreignTousseApp_id=f.id where (f.receiveTime between %s and %s) ", ForeignTousseApplication.class.getSimpleName(), InvoicePlan.class.getSimpleName(), TousseItem.class.getSimpleName(), @@ -11347,9 +11350,10 @@ if(filterConpanyName){ sqlBuilder.append(" and ti.SupplierName='").append(companyName).append("' "); } - sqlBuilder.append(" group by tit.tousseName,f.id,ti.supplierName,i.applicationTime,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.ascriptionDepartment,f.doctor,f.processType order by f.id asc "); + sqlBuilder.append(" group by f.receiveTime,tit.tousseName,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.ascriptionDepartment,f.doctor,f.processType order by f.id asc "); ResultSet rs = null; try { + String sr = sqlBuilder.toString(); rs = objectDao.executeSql(sqlBuilder.toString()); Map voMap = new LinkedHashMap(); while (rs.next()) { @@ -11364,11 +11368,11 @@ vo.setSupplierName(supplierName); } String applicationTimeStr = ""; - Date applicationTime = rs.getTimestamp("applicationTime"); + Date receiveTime = rs.getTimestamp("receiveTime"); ForeignTousseApplication foreignTousseApplication = null; - if (applicationTime != null) { - applicationTimeStr = Constants.SIMPLEDATEFORMAT_YYYYMMDD - .format(applicationTime); + if (receiveTime != null) { + applicationTimeStr = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM + .format(receiveTime); } vo.setApplicationTimeStr(StringTools.defaultIfBlank(applicationTimeStr,"")); vo.setApplicationTimeStr(StringTools.defaultIfBlank(applicationTimeStr,"")); Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml =================================================================== diff -u -r27621 -r28269 --- ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml (.../foreignTousseApplicationReport.jrxml) (revision 27621) +++ ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml (.../foreignTousseApplicationReport.jrxml) (revision 28269) @@ -1,7 +1,7 @@ - + - +