// 行程

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -214,6 +214,7 @@ class YHServiceOrderListView: YHBaseViewController {
         } else if type == 34 {
             //在港递交预约
             let vc = YHResignAppointContainerViewController()
+            vc.orderId = orderId
             vc.renewalId = stepId
             UIViewController.current?.navigationController?.pushViewController(vc)
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointContainerViewController.swift

@@ -10,11 +10,16 @@ import UIKit
 
 class YHResignAppointContainerViewController: YHBaseViewController {
 
+    // 订单ID
+    var orderId: Int = 0
+    // 批次ID
     var renewalId: Int = 0
+    
     let viewModel = YHResignAppointViewModel()
     
     lazy var appointVC: YHResignAppointTimeViewController = {
         let vc = YHResignAppointTimeViewController()
+        vc.orderId = orderId
         vc.renewalId = renewalId
         vc.view.isHidden = true
         return vc
@@ -22,6 +27,7 @@ class YHResignAppointContainerViewController: YHBaseViewController {
     
     lazy var scheduleVC: YHResignAppointSubmitScheduleViewController = {
         let vc = YHResignAppointSubmitScheduleViewController()
+        vc.orderId = orderId
         vc.renewalId = renewalId
         vc.view.isHidden = true
         return vc

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointSubmitScheduleViewController.swift

@@ -10,7 +10,11 @@ import UIKit
 
 class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
 
+    // 订单ID
+    var orderId: Int = 0
+    // 批次ID
     var renewalId: Int = 0
+
     let viewModel = YHResignAppointViewModel()
     var scheduleArr: [YHResignAppointGroup] = [] {
         didSet {
@@ -111,7 +115,11 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
     }
     
     @objc func didNextBtnClicked() {
-        
+        //查看续签结果
+        let vc = YHLookResignResultViewController()
+        vc.orderId = orderId
+        vc.batchId = renewalId
+        self.navigationController?.pushViewController(vc)
     }
     
     @objc func didGuideBtnClicked() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointTimeViewController.swift

@@ -14,6 +14,9 @@ import SwifterSwift
 
 class YHResignAppointTimeViewController: YHBaseViewController {
 
+    // 订单ID
+    var orderId: Int = 0
+    // 批次ID
     var renewalId: Int = 0
 
     // 所有预约人员

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/M/YHResignAppointGroup.swift

@@ -42,7 +42,7 @@ class YHResignAppointGroup: SmartCodable {
     func getConfirmInHKStatus() -> YHResignConfirmHKStatus {
         
         let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm"
         let nowDateString = dateFormatter.string(from: Date())
         
         var confirmStatus = YHResignConfirmHKStatus.waitConfirmHK
@@ -59,9 +59,20 @@ class YHResignAppointGroup: SmartCodable {
     }
     
     // dateString1 是否不小于dateString2
-    func compareDates(_ dateString1: String, _ dateString2: String) -> Bool {
+    func compareDates(_ dateStr1: String, _ dateStr2: String) -> Bool {
+        
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd HH:mm"
+        let dateFormatCount = dateFormatter.dateFormat.count
+        
+        var dateString1 = dateStr1
+        if dateString1.count > dateFormatCount {
+            dateString1 = String(dateString1.prefix(dateFormatCount))
+        }
+        var dateString2 = dateStr2
+        if dateString2.count > dateFormatCount {
+            dateString2 = String(dateString2.prefix(dateFormatCount))
+        }
         
         // 将字符串转换为 Date 对象
         guard let date1 = dateFormatter.date(from: dateString1),

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTimeMultipleCell.swift

@@ -102,7 +102,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
             self.selectDetailDate(title: "选择在港递交时间") {
                 [weak self] dateStr in
                 guard let self = self else { return }
-                self.model.ready_to_submit_at = "2024-11-04 17:44:"
+                self.model.ready_to_submit_at = "2024-11-04 17:44"
                 self.refreshBlock?()
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleSingleItemView.swift

@@ -121,11 +121,11 @@ class YHResignAppointedScheduleSingleItemView: UIView {
             }
         }
         
-        confirmHKTimeLabel.removeFromSuperview()
+        confirmHKTimeLabel.isHidden = true
         confirmHKTimeLabel.snp.removeConstraints()
         
         if self.confirmHKStatus == .haveConfirmHK { // 已确认在港 需要显示确认在港时间
-            self.addSubview(confirmHKTimeLabel)
+            confirmHKTimeLabel.isHidden = false
             confirmHKTimeLabel.snp.remakeConstraints { make in
                 make.left.equalTo(18)
                 make.right.equalTo(-18)
@@ -156,26 +156,6 @@ class YHResignAppointedScheduleSingleItemView: UIView {
         self.layoutIfNeeded()
     }
     
-    // dateString1 是否不小于dateString2
-    func compareDates(_ dateString1: String, _ dateString2: String) -> Bool {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm"
-        
-        // 将字符串转换为 Date 对象
-        guard let date1 = dateFormatter.date(from: dateString1),
-              let date2 = dateFormatter.date(from: dateString2) else {
-            print("日期格式错误")
-            return false
-        }
-        
-        // 比较日期
-        if date1 < date2 {
-            print("\(dateString1) 小于 \(dateString2)")
-            return false
-        }
-        return true
-    }
-    
     func createUI() {
         self.addSubview(lineView)
         self.addSubview(applicantNamesLabel)