Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java =================================================================== diff -u -r33902 -r33905 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java (.../InvoicePlanOptimizeManagerImpl.java) (revision 33902) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java (.../InvoicePlanOptimizeManagerImpl.java) (revision 33905) @@ -54,6 +54,7 @@ import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.util.ConfigUtils; +import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.SqlUtils; /** @@ -2609,7 +2610,8 @@ tableColumnAliasPre = StringUtils.isEmpty(tableColumnAliasPre) ? "" : tableColumnAliasPre; 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_beginTime = ForgonDateUtils.safelyParseDate(applyDateArray[0]); String timeSearchFmt = CssdUtils.getSystemSetConfigByName("timeSearchFmt"); DateStrategyContext dateStrategyContext = new DateStrategyContext(); dateStrategyContext.setDateState(timeSearchFmt);