Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r34504 -r34510 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34504) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34510) @@ -24052,15 +24052,15 @@ String tousseDefinitionIdCondition = DatabaseUtil.isPoIdValid(tousseDefinitionId) ? "and td.ancestorId=" + tousseDefinitionId : ""; //时间过滤 String dateCondition = "and " + dateQueryAdapter.dateAreaSql("trdr.operateDate", startDate, endDate, true); - String sql = "select trdr.operateDate,trdr.orgUnitName,td.tousseType,trdi.tousseName,sum(trdi.amount) amount " + String sql = "select trdr.orgUnitName,td.tousseType,trdi.tousseName,sum(trdi.amount) amount " + " from TousseReturnDisinfectRecord trdr join TousseReturnDisinfectItem trdi on trdr.id=trdi.tousseReturnDisinfectRecordId " + " join TousseDefinition td on td.id=trdi.tousseDefinitionId " + " where 1=1 " + departmentCodeCondition + dateCondition + tousseTypesCondition + tousseDefinitionIdCondition - + " group by trdr.orgUnitName,td.tousseType,trdi.tousseName,trdr.operateDate " + + " group by trdr.orgUnitName,td.tousseType,trdi.tousseName " + " order by trdr.orgUnitName,td.tousseType,trdi.tousseName"; ResultSet rs = null; try{ @@ -24081,7 +24081,6 @@ detailVo.setAmount(rs.getInt("amount")); detailVo.setTousseName(rs.getString("tousseName")); detailVo.setTousseType(rs.getString("tousseType")); - detailVo.setOperateDate(ForgonDateUtils.safelyFormatDate(rs.getTimestamp("operateDate"),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM,"")); list.add(detailVo); departMap.put(orgUnitName, list); }