Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java =================================================================== diff -u -r29301 -r29522 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java (.../SignRecordManagerImpl.java) (revision 29301) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java (.../SignRecordManagerImpl.java) (revision 29522) @@ -36,6 +36,7 @@ import com.forgon.keyvalue.service.KeyValueManager; import com.forgon.timeout.service.TimeoutManager; import com.forgon.tools.MathTools; +import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.json.JSONUtil; @@ -364,7 +365,7 @@ // (1表示待签收的物品不需要过期提醒,0表示待签收的物品已经超时需要过期提醒(红色)) if(hour != 0 || minute != 0){ Date warningTime = new Date(); - long time = invoiceSendTime.getTime(); + long time = DateTools.coverStrToDate(invoiceSendTimeStr, DateTools.COMMON_DATE_HMS).getTime(); time += hour*60*60*1000 + minute*60*1000; warningTime.setTime(time); map.put("warnTime", warningTime.after(now) ? 1 : 0);