Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r40929 -r41304 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 40929) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 41304) @@ -359,5 +359,10 @@ * @return 装配提醒放置指示卡器械包 */ public List loadConfirmIndicatorCardTD(); - + /** + * 获取一天的开始时间和结束时间 + * @param systemParamsObj + * @return + */ + public String[] getStartDateAndEndDate(SupplyRoomConfig systemParamsObj, String ymd); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r40929 -r41304 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 40929) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 41304) @@ -5,6 +5,7 @@ import java.math.BigInteger; import java.sql.ResultSet; import java.sql.SQLException; +import java.text.ParseException; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -42,6 +43,7 @@ import com.forgon.tools.IPAddressValidator; import com.forgon.tools.MathTools; import com.forgon.tools.cache.ForgonThreadLocalResourceManager; +import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; import com.forgon.tools.hibernate.BasePoManagerImpl; @@ -1372,5 +1374,31 @@ ConfirmIndicatorCardTD.class.getSimpleName()); return objectDao.findByHql(hql); } - + @Override + public String[] getStartDateAndEndDate(SupplyRoomConfig systemParamsObj , String ymd) { + //获取当天开始时间 + if(systemParamsObj == null){ + systemParamsObj = getSystemParamsObj(); + } + Date stDate = null; + try { + stDate = DateTools.YMDFORMAT.get().parse(ymd); + } catch (ParseException e) { + e.printStackTrace(); + } + String beginStr = null; + String endStr = null; + if(systemParamsObj != null && StringUtils.isNotBlank(systemParamsObj.getDayStartTime())){ + beginStr = ymd + " "+ systemParamsObj.getDayStartTime() +":00"; + Calendar calendar = Calendar.getInstance(); + calendar.setTime(stDate); + calendar.add(Calendar.DATE, 1); + endStr = DateTools.YMDFORMAT.get().format(calendar.getTime()) + " " + systemParamsObj.getDayStartTime() + ":00"; + }else{ + beginStr = ymd + " 00:00:00"; + endStr = ymd + " 23:59:59"; + } + String[] strArray = {beginStr, endStr}; + return strArray; + } }