Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r16047 -r16048 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 16047) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 16048) @@ -947,11 +947,9 @@ SimpleDateFormat sdf = new SimpleDateFormat(DateTools.COMMON_DATE_HMS); try { String[] applyDateArray = StringUtils.split(applyDate, Constants.IDS_SEPARATOR); - //如果是时间转换出错,尝试重新再转换(花都区人民医院要求:发货时间精确到上午和下午的时分,而上面的方式精确到时分秒) + //如果convertTime方法转换出错,尝试重新再转换(花都区人民医院要求:发货时间精确到上午和下午的时分,而之前默认的方法是精确到时分秒,所以要尝试再次转换) Date out_beginTime = DateTools.convertTime(applyDateArray[0] + " 00:00:00", sdf, DateTools.COMMON_DATE_HM); - // Date out_beginTime = DateTools.convertTime(applyDateArray[0] + " 00:00:00", sdf, DateTools.COMMON_DATE_HM); Date out_endTime = DateTools.convertTime(applyDateArray[1] + " 23:59:59", sdf, DateTools.COMMON_DATE_HM); - // Date out_endTime = DateTools.convertTime(applyDateArray[1] + " 23:59:59", sdf, DateTools.COMMON_DATE_HM); String where7 = String.format("(applicationTime between %s and %s or po in (select recyclingApplication from RecyclingRecord where recyclingTime between %s and %s))", dateQueryAdapter.dateAdapter(out_beginTime), dateQueryAdapter.dateAdapter(out_endTime),