// 预约

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

@@ -36,6 +36,8 @@ class YHResignAppointContainerViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        NotificationCenter.default.addObserver(self, selector: #selector(requestData), name: YhConstant.YhNotification.didUpdateResignAppointStatusList, object: nil)
+        
         self.addChild(appointVC)
         self.addChild(scheduleVC)
         
@@ -48,10 +50,14 @@ class YHResignAppointContainerViewController: YHBaseViewController {
         requestData()
     }
     
-    func requestData() {
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+    
+    @objc func requestData() {
         
         YHHUD.show(.progress(message: "加载中..."))
-        viewModel.getAppointInfoList(renewalId: renewalId) {
+        viewModel.getScheduleInfoList(renewalId: renewalId) {
             [weak self] success1, error1 in
             YHHUD.hide()
             guard let self = self else { return }

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

@@ -105,9 +105,16 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
             make.left.right.bottom.equalToSuperview()
             make.height.equalTo(98)
         }
+        self.tableView.reloadData()
         self.updateBottomBtnAndMotifyBtnStatus()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        requestList()
+        
+    }
+    
     @objc func didNextBtnClicked() {
         //查看续签结果
         let vc = YHLookResignResultViewController()
@@ -329,10 +336,8 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
     }
     
     func requestList() {
-        YHHUD.show(.progress(message: "加载中..."))
-        self.viewModel.getAppointInfoList(renewalId: self.renewalId) {
+        self.viewModel.getScheduleInfoList(renewalId: self.renewalId) {
             [weak self] success,error in
-            YHHUD.hide()
             guard let self else { return }
             self.scheduleArr.removeAll()
             self.scheduleArr.append(contentsOf: self.viewModel.scheduleInfoList.renewal_List)

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

@@ -337,8 +337,13 @@ class YHResignAppointTimeViewController: YHBaseViewController {
             YHHUD.hide()
             guard let self = self else { return }
             if success {
-                YHHUD.flash(message: "提交成功")
-                self.navigationController?.popViewController(animated: true)
+                if self.isUpdate { // 是行程修改
+                    YHHUD.flash(message: "提交成功")
+                    self.navigationController?.popViewController(animated: true)
+                    return
+                }
+                // 是首次预约 需要刷新展示行程安排列表
+                NotificationCenter.default.post(name: YhConstant.YhNotification.didUpdateResignAppointStatusList, object: nil)
                 return
             }
             let msg = error?.errorMsg ?? "提交失败"

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

@@ -17,7 +17,7 @@ class YHResignAppointTogetherSetting: SmartCodable {
     }
 }
 
-class YHResignAppointListModel: SmartCodable {
+class YHResignScheduleListModel: SmartCodable {
     
     var is_together: Int = 0 // 1 是2不是 一起赴港
     var renewal_List: [YHResignAppointGroup] = []

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

@@ -13,7 +13,7 @@ class YHResignAppointViewModel: NSObject {
     // 赴港人员列表
     var appointUsers: [YHResignAppointMember] = []
     // 预约列表预约
-    var scheduleInfoList: YHResignAppointListModel = YHResignAppointListModel()
+    var scheduleInfoList: YHResignScheduleListModel = YHResignScheduleListModel()
     
     // 赴港人员列表
     func getResignAppointUserlist(renewalId: Int, callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
@@ -68,14 +68,14 @@ class YHResignAppointViewModel: NSObject {
     }
     
     // 预约列表预约
-    func getAppointInfoList(renewalId: Int, callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
+    func getScheduleInfoList(renewalId: Int, callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
         let params = ["renewal_id" : renewalId]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignAppoint.appointInfoList
         let _ = YHNetRequest.getRequest(url: strUrl, params:params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHResignAppointListModel.deserialize(from: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHResignScheduleListModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBack(false, err)
                     return
@@ -85,11 +85,11 @@ class YHResignAppointViewModel: NSObject {
                 
             } else {
                 let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
-                self.scheduleInfoList = YHResignAppointListModel()
+                self.scheduleInfoList = YHResignScheduleListModel()
                 callBack(false,err)
             }
         } failBlock: { err in
-            self.scheduleInfoList = YHResignAppointListModel()
+            self.scheduleInfoList = YHResignScheduleListModel()
             callBack(false,err)
         }
     }

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -305,6 +305,9 @@ extension YhConstant {
         // 跳转到首页生活tab - 教育
         public static let didJumpToHomePageLifeEduTabNotification = Notification.Name(rawValue: "com.yinhe.homePage.life.edu")
         
+        // 刷新续签预约状态列表
+        public static let didUpdateResignAppointStatusList = Notification.Name(rawValue: "com.yinhe.resign.appoint.list.update")
+        
         
     }
 }