处理 数据模式

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift

@@ -22,6 +22,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
     
     // 无需预约办证人员
     var noNeedAppointMembers:[YHHKMemberModel] = []
+    
     // 需要办证人员
     var waitAppointMembers:[YHHKMemberModel] = []
     let viewModel = YHCerAppointViewModel()
@@ -366,7 +367,9 @@ extension YHCertificateAppointViewController {
             waitAppointMembers.removeAll()
             for user in users {
                 if user.isAtLeast11Years() { // 不小于11岁的人才能预约赴港
+                    user.isSelectedFlag = true
                     waitAppointMembers.append(user)
+                    
                 } else {
                     noNeedAppointMembers.append(user)
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHAppointItem.swift

@@ -9,6 +9,7 @@
 import UIKit
 
 enum YHAppointItemType: Int {
+    //未知
     case none = 0
     // 赴港办证
     case goHKMakeCertificate = 1
@@ -18,7 +19,7 @@ enum YHAppointItemType: Int {
     case noNeedMakeCertificateMembers = 3
     // 赴港激活签证
     case activeVisa = 4
-    // 请您确认第一批赴港信息
+    // 请您确认第X批赴港信息
     case confirmGoHKInfo = 5
     // 待预约赴港成员
     case needReAppointMembers = 6
@@ -30,12 +31,26 @@ enum YHAppointItemType: Int {
 }
 
 class YHAppointItem: NSObject {
-    
     var type: YHAppointItemType = .none
-    
+    var model : YHSelectGroupMemberModel? // type = .confirmGoHKInfo 时候的赋值
     init(type: YHAppointItemType) {
         self.type = type
     }
+}
+
+class YHSelectGroupMemberModel {
+    //赴港激活签证的申请人信息
+    var arr:[YHHKMemberModel] = []
+    
+    //赴港办证时间类型
+    var dateTye : Int = 0 //0 - 具体日期  1-具体时段
+    
+    //开始时间
+    var startDateStr : String = ""
     
+    //结束时间
+    var endDateStr : String = ""
     
+    //办证地点
+    var hkPlaceName : String = ""
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHHKMemberModel.swift

@@ -19,6 +19,8 @@ class YHHKMemberModel: SmartCodable {
     var isCheck: Int = 0
     var url: String = ""
     var approvalDate: String = ""
+    
+    var isSelectedFlag : Bool = false //本地使用
 
     enum CodingKeys: String, CodingKey {
         case id = "id"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectApplicantGroupCell.swift

@@ -25,7 +25,7 @@ class YHSelectApplicantGroupCell: UITableViewCell {
 
     lazy var selecters:[YHSelectApplicantInfo] = {
         return [YHSelectApplicantInfo(name: "李小龙", isSelect: true),
-                YHSelectApplicantInfo(name: "成龙", isSelect: false),
+                YHSelectApplicantInfo(name: "成龙", isSelect: true),
                 YHSelectApplicantInfo(name: "甄子丹", isSelect: true),
                 YHSelectApplicantInfo(name: "吉田双阴", isSelect: false),]
     }()

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -346,19 +346,20 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             return
         }
         
-        if true {
-            // test dy
-//            if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
-//                let vc = YHFamilyInfoConfirmViewController()
-//                vc.orderId = orderID
-//                self.navigationController?.pushViewController(vc)
-//            }
-            
+
+//        if true {
+//            // test dy
+////            if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
+////                let vc = YHFamilyInfoConfirmViewController()
+////                vc.orderId = orderID
+////                self.navigationController?.pushViewController(vc)
+////            }
+//            
             let vc = YHCertificateAppointViewController()
-            vc.orderId = 151090
+            vc.orderId = 151085
             self.navigationController?.pushViewController(vc)
             return
-        }
+//        }
         
         let item: PersonalModuleItem = items[indexPath.row]
         switch item.type {