//

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift

@@ -156,6 +156,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
             
         } else { // 没有上传过证件
             
+            let age = self.viewModel.travelDetailModel?.age ?? 0
             var userId = 0
             if let uid = YHLoginManager.shared.userModel?.id {
                 userId = Int(uid) ?? 0
@@ -171,7 +172,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                 } else if self.type == .HK {
                     type = 3
                 }
-                let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: type, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)")
+                let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: type, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
                 
                 cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
                 cerModel1.china_travel_latest_validate_date = self.viewModel.travelDetailModel?.china_travel_latest_validate_date ?? ""
@@ -183,7 +184,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                 
                 // 外国护照
                 let item1 = YHTravelCerSectionItem(type: .certificate, tipsArr: [])
-                let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: 1, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)")
+                let cerModel1 = YHTravelDocsPreparationDetailItemModel(type: 1, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
                 cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
                 cerModel1.china_travel_latest_validate_date = self.viewModel.travelDetailModel?.china_travel_latest_validate_date ?? ""
                 cerModel1.isCanEdit = true
@@ -192,7 +193,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                 
                 // 中国居留许可签证
                 let item2 = YHTravelCerSectionItem(type: .certificate, tipsArr: [])
-                let cerModel2 = YHTravelDocsPreparationDetailItemModel(type: 2, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)")
+                let cerModel2 = YHTravelDocsPreparationDetailItemModel(type: 2, order_id: self.orderId, order_sn: "", img_back: "", img_front: "", status: 0, issue_start: "", issue_end: "", user_id:userId  , user_type: dataModel.type, remark: "", nationality: "\(dataModel.nationality)", age: age)
                 cerModel2.isCanEdit = true
                 item2.cerDetailModel = cerModel2
                 sectionItems.append(item2)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/M/YHTravelDocsPreparationDetailModel.swift

@@ -13,6 +13,7 @@ class YHTravelDocsPreparationDetailModel: SmartCodable {
     var ttl : Int = -1 //电子签证有效期
     var latest_validaty_date : String = "" //有效期最晚时间
     var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
+    var age: Int = 0
     var list : [YHTravelDocsPreparationDetailItemModel?] = [] //电子签证有效期
     
     required init() {
@@ -46,6 +47,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     
     var latest_validaty_date : String = "" //有效期最晚时间
     var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
+    var age: Int = 0
 
     // 是否检测时间
     var isNeedCheckDate: Bool = false
@@ -58,7 +60,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
         
     }
     
-    init(type: Int, order_id: Int, order_sn: String, img_back: String, img_front: String, status: Int, issue_start: String, issue_end: String, user_id: Int, user_type: String, remark: String, nationality: String) {
+    init(type: Int, order_id: Int, order_sn: String, img_back: String, img_front: String, status: Int, issue_start: String, issue_end: String, user_id: Int, user_type: String, remark: String, nationality: String, age: Int) {
         
         self.type = type
         self.order_id = order_id
@@ -72,22 +74,28 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
         self.user_type = user_type
         self.remark = remark
         self.nationality = nationality
+        self.age = age
+
     }
     
     func isValidCer() -> Bool {
-        var latestDate = self.latest_validaty_date
+        
         if self.type == 2 { // 中国居留许可签证
-            latestDate = self.china_travel_latest_validate_date
+            if self.age < 11 { // 小于11岁的不检测
+                return true
             }
-        
-        if latestDate.isEmpty {
-            if self.type == 2 {
+            if self.china_travel_latest_validate_date.isEmpty { // 截止日期为空
                 return false
             }
+            let isValid = self.compareDates(dateString1: self.issue_end, dateString2: self.china_travel_latest_validate_date)
+            return isValid
+        }
+        
+        if self.latest_validaty_date.isEmpty { // 截止日期为空
             return true
         }
         
-        let isValid = self.compareDates(dateString1: self.issue_end, dateString2: latestDate)
+        let isValid = self.compareDates(dateString1: self.issue_end, dateString2: self.latest_validaty_date)
         return isValid
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/VM/YHTravelDocsPreparationViewModel.swift

@@ -70,6 +70,7 @@ extension YHTravelDocsPreparationViewModel {
                     if let item = item {
                         item.latest_validaty_date = self.travelDetailModel?.latest_validaty_date ?? ""
                         item.china_travel_latest_validate_date = self.travelDetailModel?.china_travel_latest_validate_date ?? ""
+                        item.age = resultModel.age
                     }
                 }
                 callBackBlock(true, nil)