Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r16301 -r16464 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 16301) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 16464) @@ -55,6 +55,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem; @@ -2042,10 +2043,17 @@ +" order by ti.sterileStartTime desc"; if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) { - sql += " where ti.sterileStartTime between " + //由于包实例TousseInstance表的sterileStartTime字段并不是date类型而是文本类型,所以改为直接用文件比较判断,虽然效率会低一点,后期优化还需待改造 + /*sql += " where ti.sterileStartTime between " + dateQueryAdapter.dateConverAdapter2(startDate+" 00:00:00", "yyyy-mm-dd HH24:MI:SS") + " and " + dateQueryAdapter.dateConverAdapter2(endDate+" 23:59:59", "yyyy-mm-dd HH24:MI:SS") + " and ti.status <> '已审核' " + ;*/ + + sql += " where ti.sterileStartTime between '" + + startDate+" 00:00:00'" + + " and '" + endDate+" 23:59:59'" + + " and ti.status <> '"+TousseInstance.STATUS_REVIEWED+"' " ;