Ver código fonte

feature: 报到与入住时间
1.报到与入住时间为当前时间
2.退房时间为结业当天20:00:00

luoyb 1 ano atrás
pai
commit
e4b840f5fa

+ 4 - 3
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/self/TraineeBusiness.java

@@ -317,15 +317,16 @@ public class TraineeBusiness {
      * @return 入住 信息
      */
     private RemoteOrderVo checkInTeamByBo(YcTraineeBo bo) {
-        String justDate = DateUtil.format(DateUtil.date(), DefaultConstants.DATE_FORMAT) + " 02:00:00";
+
         RemoteOrderBo remoteBo = new RemoteOrderBo();
         remoteBo.setGuestId(bo.getGuestId());
         remoteBo.setGuestName(bo.getUserXm());
         remoteBo.setTeamId(bo.getTeamId());
         remoteBo.setTeamName(bo.getTeamName());
         remoteBo.setRoomCode(bo.getRoomCode());
-        remoteBo.setStartTime(DateUtil.parseDateTime(justDate));
-        remoteBo.setEndTime(bo.getCheckoutDate());
+        remoteBo.setStartTime(DateUtil.date());
+        String temp = DateUtil.format(bo.getCheckoutDate(),"yyyy-MM-dd") + " 19:59:59";
+        remoteBo.setEndTime(DateUtil.parseDateTime(temp));
         remoteBo.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_RZ);
         remoteBo.setUpdatedBy(Long.valueOf(bo.getUserId()));