Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js =================================================================== diff -u -r22210 -r22214 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js (.../sterilizationTransitionView.js) (revision 22210) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js (.../sterilizationTransitionView.js) (revision 22214) @@ -216,6 +216,7 @@ labelWidth: 55, id : 'startDateTime', name : 'startDateTime', + allowBlank: false, selectOnFocus :true, format : 'Y-m-d H:i' },'-',{ @@ -224,6 +225,7 @@ labelWidth: 55, id : 'endDateTime', name : 'endDateTime', + allowBlank: false, selectOnFocus :true, format : 'Y-m-d H:i' },'-',{ Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java =================================================================== diff -u -r22210 -r22214 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (.../SterilizationTransitionAction.java) (revision 22210) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (.../SterilizationTransitionAction.java) (revision 22214) @@ -26,6 +26,7 @@ import com.forgon.exception.service.ExceptionHandler; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; +import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; @@ -118,8 +119,8 @@ } //3、按灭菌交接时间过滤 - String startDateTime = StrutsParamUtils.getPraramValue("startDateTime", ""); - String endDateTime = StrutsParamUtils.getPraramValue("endDateTime", ""); + String startDateTime = StrutsParamUtils.getPraramValue("startDateTime", DateTools.startOfTodDay(Constants.DATEFORMAT_YYYYMMDDHHMM)); + String endDateTime = StrutsParamUtils.getPraramValue("endDateTime", DateTools.endOfToday(Constants.DATEFORMAT_YYYYMMDDHHMM)); String transitionTimeSql = ""; if (StringTools.isNotBlank(startDateTime) && startDateTime.length() == 16 && StringTools.isNotBlank(endDateTime) && endDateTime.length() == 16) {