|
@@ -68,7 +68,6 @@ public class RoomChangeApplicationControllerBean extends AbstractRoomChangeAppli
|
|
|
SelectorItemCollection sicOccupants = new SelectorItemCollection();
|
|
|
sicOccupants.add("CheckOutDate");
|
|
|
//换宿单分录
|
|
|
- IRoomChangeApplicationEntry iEntry = RoomChangeApplicationEntryFactory.getLocalInstance(ctx);
|
|
|
SelectorItemCollection sicEntry = new SelectorItemCollection();
|
|
|
sicEntry.add("occupants");
|
|
|
//生成入住人员信息
|
|
@@ -76,6 +75,8 @@ public class RoomChangeApplicationControllerBean extends AbstractRoomChangeAppli
|
|
|
RoomChangeApplicationEntryInfo entryInfo = info.getEntrys().get(i);
|
|
|
//原入住人员信息
|
|
|
OccupantsInfo oldOccupants = entryInfo.getOldOccupants();
|
|
|
+ //原退宿日期
|
|
|
+ entryInfo.setOldCheckoutDate(oldOccupants.getCheckOutDate());
|
|
|
//新增新的入住人员信息
|
|
|
oldOccupants = iOccupants.getOccupantsInfo(new ObjectUuidPK(oldOccupants.getId()));
|
|
|
//修改原入住人员信息的宿时间等于换宿单入住时间的前一天。
|
|
@@ -105,6 +106,7 @@ public class RoomChangeApplicationControllerBean extends AbstractRoomChangeAppli
|
|
|
iOccupants.addnew(occupantsInfo);
|
|
|
// 保存新的入住人员信息到
|
|
|
entryInfo.setOccupants(occupantsInfo);
|
|
|
+
|
|
|
}
|
|
|
update(ctx, new ObjectUuidPK(info.getId()), info);
|
|
|
IObjectPK iObjectPK = super._submitEffect(ctx, info);
|
|
@@ -135,22 +137,17 @@ public class RoomChangeApplicationControllerBean extends AbstractRoomChangeAppli
|
|
|
//人员入住信息修改字段
|
|
|
SelectorItemCollection sicOccupants = new SelectorItemCollection();
|
|
|
sicOccupants.add("CheckOutDate");
|
|
|
- try {
|
|
|
- for (int i = 0; i < entrys.size(); i++) {
|
|
|
- RoomChangeApplicationEntryInfo roomChangeApplicationEntryInfo = entrys.get(i);
|
|
|
- //入住人员信息
|
|
|
- OccupantsInfo occupants = roomChangeApplicationEntryInfo.getOccupants();
|
|
|
- //删除
|
|
|
- iOccupants.delete(new ObjectUuidPK(occupants.getId()));
|
|
|
- //原入住人员信息
|
|
|
- OccupantsInfo oldOccupants = roomChangeApplicationEntryInfo.getOldOccupants();
|
|
|
- oldOccupants.setCheckOutDate(DateTimeUtils.parseDate("2199-12-31", "yyyy-MM-dd"));
|
|
|
- iOccupants.updatePartial(oldOccupants, sicOccupants);
|
|
|
- }
|
|
|
- } catch (ParseException e) {
|
|
|
- e.printStackTrace();
|
|
|
- throw new RuntimeException(e);
|
|
|
+ for (int i = 0; i < entrys.size(); i++) {
|
|
|
+ RoomChangeApplicationEntryInfo roomChangeApplicationEntryInfo = entrys.get(i);
|
|
|
+ //入住人员信息
|
|
|
+ OccupantsInfo occupants = roomChangeApplicationEntryInfo.getOccupants();
|
|
|
+ //删除
|
|
|
+ iOccupants.delete(new ObjectUuidPK(occupants.getId()));
|
|
|
+ //原入住人员信息
|
|
|
+ OccupantsInfo oldOccupants = roomChangeApplicationEntryInfo.getOldOccupants();
|
|
|
+ //oldOccupants.setCheckOutDate(DateTimeUtils.parseDate("2199-12-31", "yyyy-MM-dd"));
|
|
|
+ oldOccupants.setCheckOutDate(roomChangeApplicationEntryInfo.getOldCheckoutDate());
|
|
|
+ iOccupants.updatePartial(oldOccupants, sicOccupants);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|