fix bug

src/main/java/com/mgm/mcrm/approval/service/ApprovalService.java

@@ -122,7 +122,6 @@ public class ApprovalService {
     @Autowired
     private BookingControlMsgSender ctrlMsgSender;
 
-
     @Lazy
     @Autowired
     private BookingService bookingService;

src/main/java/com/mgm/mcrm/basesetting/daylight/services/DaylightService.java

@@ -52,7 +52,6 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -588,6 +587,9 @@ public class DaylightService {
 				if (string.contains("InProgress")) {
 					inProgressCount++;
 				}
+
+				// 让进程暂停1.5秒 by Mauve 20260909
+				TimeUnit.MILLISECONDS.sleep(1500L);
 			} while ((responseData.contains("InProgress") || responseData.contains("NotRun")) && notRunCount < 20 && inProgressCount < 50);
 
 			jsonObject = JSON.parseObject(responseData);

src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRequest.java

@@ -161,11 +161,11 @@ public class CreateBookingRequest {
 			this.requestString.append("      				<c:CharacterValue>"+this.booking.getMiscCharge() +"</c:CharacterValue>");
 			this.requestString.append("      			</c:UserDefinedValue>");
 		}
-//		if(this.booking.getApprovalReason()!=null)   {
-//			this.requestString.append("      			<c:UserDefinedValue valueName=\"App.Rea\">");
-//			this.requestString.append("      				<c:CharacterValue>"+this.booking.getApprovalReason() +"</c:CharacterValue>");
-//			this.requestString.append("      			</c:UserDefinedValue>");
-//		}
+		if(this.booking.getApprovalReason()!=null)   {
+			this.requestString.append("      			<c:UserDefinedValue valueName=\"App.Rea\">");
+			this.requestString.append("      				<c:CharacterValue>"+this.booking.getApprovalReason() +"</c:CharacterValue>");
+			this.requestString.append("      			</c:UserDefinedValue>");
+		}
 		this.requestString.append("      		</r:UserDefinedValues>");
 		this.requestString.append("      	</HotelReservation>");
 		this.requestString.append("   	 </CreateBookingRequest>");

src/main/java/com/mgm/mcrm/booking/dtos/search/BookingQueryRequest.java

@@ -26,4 +26,5 @@ public class BookingQueryRequest extends BaseQueryRequest {
     private String permissionGroup;
     private List<Long> searchRoomId;
     private List<Long> searchRoomTypeId;
+    private String searchApproverId;
 }

src/main/java/com/mgm/mcrm/booking/models/BookingsView.java

@@ -246,6 +246,18 @@ public class BookingsView implements Serializable {
 	private Integer bookingTypeId;
 	@Column(name="opera_profile_id")
 	private Long operaProfileId;
+	@Column(name="approval_reason")
+	private String approvalReason;
+	@Column(name="approver_id")
+	private String approverId;
+	@Column(name="approver_name")
+	private String approverName;
+	@Column(name="opera_comment")
+	private String operaComment;
+	@Column(name="fail_platform")
+	private  String failPlatform;
+	@Column(name="booking_approval_reason")
+	private String bookingApprovalReason;
 	
 	@Transient
 	private String status;

src/main/java/com/mgm/mcrm/booking/services/BookingService.java

@@ -240,6 +240,7 @@ public class BookingService {
 		CfgProperties property = propertyDao.getById(propertyId);
 		String miscCharge = param.getMiscCharge();
 		String etaTime = param.getEtaTime();
+		String sectionName = param.getSectionName();
 
 		List<Bookings> resultBookings = new ArrayList<>();
 
@@ -306,7 +307,6 @@ public class BookingService {
 
 			booking.setRemark(remark);
 			booking.setBookType("0");
-//		booking.setDlBlockId(blockName);
 			booking.setBlockCode(blockName);
 			booking.setBooker(userName);
 			booking.setBedTypeMasterGroupId(bedTypeMasterGroupId);
@@ -315,8 +315,8 @@ public class BookingService {
 			booking.setSharer(JSONArray.toJSONString(sharer));
 			booking.setBookingTypeId(bookingTypeId);
 			booking.setMember(JSONObject.toJSONString(member));
-
 			booking.setCategory(property.getCategory());
+			booking.setSectionName(sectionName);
 
 			booking.setEta(etaTime);
 			// 设置mischarge
@@ -575,6 +575,7 @@ public class BookingService {
 		Integer depositType = param.getDepositType();
 		Integer isPost = param.getIsPost();
 		Long roomTypeId;
+		String sectionName = param.getSectionName();
 
 		CfgProperties property = propertyDao.getById(propertyId);
 
@@ -659,6 +660,7 @@ public class BookingService {
 			booking.setBookingTypeId(bookingTypeId);
 			booking.setMember(JSONObject.toJSONString(member));
 			booking.setCategory(property.getCategory());
+			booking.setSectionName(sectionName);
 
 			// 设置etaTime
 			if (StringUtils.isNotBlank(etaTime))
@@ -693,7 +695,7 @@ public class BookingService {
 			}
 
 			String bookRemark = dateItem.getRemark();
-			if (!StringUtils.isEmpty(bookRemark))
+			if (StringUtils.isNotEmpty(bookRemark))
 				booking.setRemark(bookRemark);
 			if (isPost != null) {
 				dateItem.setIsPost(isPost);
@@ -714,7 +716,6 @@ public class BookingService {
 				item = itemDao.findByTierIdAndRoomId(tier.getId(), roomId);
 			}
 
-
 			if (item != null)
 				booking.setItemCode(item.getId() != null ? item.getAmenityPackageCode() : null);
 
@@ -4560,6 +4561,10 @@ public class BookingService {
 					list.add(cb.like(cb.upper(root.get("approvedBy")),
 							"%" + queryFilter.getSearchApproverName().toUpperCase() + "%"));
 				}
+				if (StringUtils.isNotBlank(queryFilter.getSearchApproverId())) {
+					list.add(cb.like(cb.upper(root.get("approverId")),
+							"%" + queryFilter.getSearchApproverId().toUpperCase() + "%"));
+				}
 				if (StringUtils.isNotBlank(queryFilter.getSearchBookerName())) {
 					list.add(cb.like(cb.upper(root.get("booker")),
 							"%" + queryFilter.getSearchBookerName().toUpperCase() + "%"));