// 预约

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

@@ -17,6 +17,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
     // 所有预约人员
     var allAppointUsers: [YHResignAppointMember] = []
     
+    let viewModel = YHResignAppointViewModel()
     // 申请人是否在港
     var togetherArr: [YHResignAppointTogetherSetting] = []
     lazy var togetherSetting = {
@@ -273,13 +274,13 @@ class YHResignAppointTimeViewController: YHBaseViewController {
         for group in self.selectGroupArr {
             group.isClickSubmit = false
             if group.users.count <= 0 { // 说明是一起递交
-                let allUserIds = allAppointUsers.map {
-                    let item = $0
-                    return "\(item.id)"
+                let allUserInfoArr = allAppointUsers.map {
+                    let dict = ["member_id" : "\($0.id)"]
+                    return dict
                 }
                 let dict = ["ready_to_submit_at" : group.ready_to_submit_at,
-                            "leave_hk_at" : group.notleaveHK ? group.leave_hk_at : "",
-                            "users" : allUserIds] as! [String : Any]
+                            "leave_hk_at" : group.notleaveHK ? "" : group.leave_hk_at,
+                            "users" : allUserInfoArr] as! [String : Any]
                 batchs.append(dict)
                 
             } else { // 说明是分批递交
@@ -287,13 +288,13 @@ class YHResignAppointTimeViewController: YHBaseViewController {
                     let item = $0
                     return item.isSelected
                 }
-                let selectUserIds = selectUser.map {
-                    let item = $0
-                    return "\(item.id)"
+                let allUserInfoArr = selectUser.map {
+                    let dict = ["member_id" : "\($0.id)"]
+                    return dict
                 }
                 let dict = ["ready_to_submit_at" : group.ready_to_submit_at,
-                            "leave_hk_at" : group.leave_hk_at,
-                            "users" : selectUserIds] as! [String : Any]
+                            "leave_hk_at" : group.notleaveHK ? "" : group.leave_hk_at,
+                            "users" : allUserInfoArr] as! [String : Any]
                 batchs.append(dict)
             }
         }
@@ -302,7 +303,19 @@ class YHResignAppointTimeViewController: YHBaseViewController {
                                      "is_together" : self.togetherSetting.is_together,
                                      "batch" : batchs]
         printLog(param)
-        
+        YHHUD.show(.progress(message: "加载中..."))
+        viewModel.submitAppointInfo(params: param) {
+            [weak self] success, error in
+            YHHUD.hide()
+            guard let self = self else { return }
+            if success {
+                YHHUD.flash(message: "提交成功")
+                self.navigationController?.popViewController(animated: true)
+                return
+            }
+            let msg = error?.errorMsg ?? "提交失败"
+            YHHUD.flash(message: msg)
+        }
     }
 }
 
@@ -354,6 +367,11 @@ extension YHResignAppointTimeViewController: UITableViewDelegate, UITableViewDat
                     model.notleaveHK = isOn
                     self.tableView.reloadData()
                 }
+                cell2.refreshBlock = {
+                    [weak self] in
+                    guard let self = self else { return }
+                    self.tableView.reloadData()
+                }
                 return cell2
             }
             // 分组选择cell
@@ -370,6 +388,11 @@ extension YHResignAppointTimeViewController: UITableViewDelegate, UITableViewDat
                 model.notleaveHK = isOn
                 self.tableView.reloadData()
             }
+            cell3.refreshBlock = {
+                [weak self] in
+                guard let self = self else { return }
+                self.tableView.reloadData()
+            }
             return cell3
         }
         

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

@@ -21,6 +21,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
     var selectUserBlock: ((_ member: YHResignAppointMember, _ isSelect: Bool, _ groupIndex: Int)->())?
     // switch按钮点击事件
     var switchBlock: ((Bool)->())?
+    var refreshBlock: (()->())?
 
     lazy var whiteContentView: UIView = {
         let view = UIView()
@@ -98,6 +99,12 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
         view.clickBlock = {
             [weak self] in
             guard let self = self else { return }
+            self.selectDetailDate(title: "选择在港递交时间") {
+                [weak self] dateStr in
+                guard let self = self else { return }
+                self.model.ready_to_submit_at = "2024-11-04 17:44:58"
+                self.refreshBlock?()
+            }
         }
         return view
     }()
@@ -112,6 +119,12 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
         view.clickBlock = {
             [weak self] in
             guard let self = self else { return }
+            self.selectDetailDate(title: "选择离港时间") {
+                [weak self] dateStr in
+                guard let self = self else { return }
+                self.model.leave_hk_at = "2024-12-04 17:44:58"
+                self.refreshBlock?()
+            }
         }
         return view
     }()
@@ -198,6 +211,14 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
         self.layoutIfNeeded()
     }
     
+    func selectDetailDate(title: String, selectBlock:((_ dateStr: String)->())?) {
+        YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: false, currentDay:"") {
+            [weak self] dateStr in
+            guard let self = self else { return }
+            selectBlock?(dateStr)
+        }
+    }
+    
     func setupUI() {
         
         self.selectionStyle = .none
@@ -307,17 +328,17 @@ extension YHResignAppointTimeMultipleCell: UICollectionViewDelegate, UICollectio
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         
-            if 0 <= indexPath.item && indexPath.item < arr.count {
-                let member = arr[indexPath.item]
-                let selectArr = arr.filter {
-                    return $0.isSelected == true
-                }
-                if selectArr.count == 1, member.isSelected == true, member.id == selectArr[0].id {
-                    // 分组中仅有一个选中用户 且点击的是该用户
-                    YHHUD.flash(message: "每一批赴港申请人不可为空，请确保每位申请人都在列")
-                    return
-                }
-                selectUserBlock?(member, !member.isSelected, self.model.itemIndex)
+        if 0 <= indexPath.item && indexPath.item < arr.count {
+            let member = arr[indexPath.item]
+            let selectArr = arr.filter {
+                return $0.isSelected == true
             }
+            if selectArr.count == 1, member.isSelected == true, member.id == selectArr[0].id {
+                // 分组中仅有一个选中用户 且点击的是该用户
+                YHHUD.flash(message: "每一批赴港申请人不可为空，请确保每位申请人都在列")
+                return
+            }
+            selectUserBlock?(member, !member.isSelected, self.model.itemIndex)
+        }
     }
 }

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

@@ -15,6 +15,7 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
     var model = YHResignAppointTimeSettingModel()
     
     var switchBlock: ((Bool)->())?
+    var refreshBlock: (()->())?
     
     lazy var whiteContentView: UIView = {
         let view = UIView()
@@ -43,6 +44,12 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
         view.clickBlock = {
             [weak self] in
             guard let self = self else { return }
+            self.selectDetailDate(title: "选择在港递交时间") {
+                [weak self] dateStr in
+                guard let self = self else { return }
+                self.model.ready_to_submit_at = "2024-11-04 17:44:58"
+                self.refreshBlock?()
+            }
         }
         return view
     }()
@@ -57,6 +64,12 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
         view.clickBlock = {
             [weak self] in
             guard let self = self else { return }
+            self.selectDetailDate(title: "选择离港时间") {
+                [weak self] dateStr in
+                guard let self = self else { return }
+                self.model.leave_hk_at = "2024-12-04 17:44:58"
+                self.refreshBlock?()
+            }
         }
         return view
     }()
@@ -126,6 +139,14 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
         self.layoutIfNeeded()
     }
     
+    func selectDetailDate(title: String, selectBlock:((_ dateStr: String)->())?) {
+        YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: false, currentDay:"") {
+            [weak self] dateStr in
+            guard let self = self else { return }
+            selectBlock?(dateStr)
+        }
+    }
+    
     func setupUI() {
         
         self.selectionStyle = .none

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

@@ -94,4 +94,21 @@ class YHResignAppointViewModel: NSObject {
             callBack(false,err)
         }
     }
+    
+    // 提交预约
+    func submitAppointInfo(params: [String : Any], callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignAppoint.submitAppoint
+        let _ = YHNetRequest.postRequest(url: strUrl, params:params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let _ = self else { return }
+            if json.code == 200 {
+                callBack(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBack(false, error)
+            }
+        } failBlock: { err in
+            callBack(false, err)
+        }
+    }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -554,6 +554,8 @@ class YHAllApiName {
         static let appointUserList = "super-app/renewal/user"
         // 预约列表预约
         static let appointInfoList = "super-app/renewal/reservation/list"
+        // 提交预约
+        static let submitAppoint = "super-app/renewal/reservation/submit"
     }
     
     // 在港记录