Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

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

@@ -172,7 +172,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                 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_validaty_date ?? ""
+                cerModel1.china_travel_latest_validaty_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? ""
                 cerModel1.isCanEdit = true
                 item.cerDetailModel = cerModel1
                 sectionItems.append(item)
@@ -183,7 +183,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)", age: age)
                 cerModel1.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
-                cerModel1.china_travel_latest_validate_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? ""
+                cerModel1.china_travel_latest_validaty_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? ""
                 cerModel1.isCanEdit = true
                 item1.cerDetailModel = cerModel1
                 sectionItems.append(item1)
@@ -191,6 +191,8 @@ 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)", age: age)
+                cerModel2.latest_validaty_date = self.viewModel.travelDetailModel?.latest_validaty_date ?? ""
+                cerModel2.china_travel_latest_validaty_date = self.viewModel.travelDetailModel?.china_travel_latest_validaty_date ?? ""
                 cerModel2.isCanEdit = true
                 item2.cerDetailModel = cerModel2
                 sectionItems.append(item2)
@@ -219,7 +221,8 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
         var errorItemCount = 0
         for item in sectionItems {
             if item.type == .certificate {
-                var hasError = false
+                var hasSubmitError = false
+                var isDateValidate = true
                 item.cerDetailModel.isNeedCheckCer = false
                 item.cerDetailModel.isNeedCheckDate = false
 
@@ -237,7 +240,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                     }
                     
                     if noCerInfo {
-                        hasError = true
+                        hasSubmitError = true
                         item.cerDetailModel.isNeedCheckCer = true
                         if item.cerDetailModel.type == 3 { // 港澳通行证
                             item.cerDetailModel.checkTips = item.cerDetailModel.img_front.isEmpty ? "请上传港澳通行证正面" : "请上传港澳通行证反面"
@@ -252,28 +255,31 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                     } else {
                         item.cerDetailModel.isNeedCheckDate = false
                         if item.cerDetailModel.issue_start.isEmpty || item.cerDetailModel.issue_end.isEmpty {
-                            hasError = true
+                            hasSubmitError = true
                             item.cerDetailModel.isNeedCheckDate = true
                             
                         } else {
                             let isValidCertificate = item.cerDetailModel.isValidCer()
                             if !isValidCertificate {
-                                hasError = true
-                                if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validate_date.isEmpty {
+                                if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validaty_date.isEmpty {
                                     // 这个情况直接弹toast
+                                    hasSubmitError = true
                                     YHHUD.flash(message: "赴港行程尚未成功预约，请前往检查")
                                     
                                 } else {
+                                    // 有效期不足也能提交
+                                    isDateValidate = false
                                     item.cerDetailModel.isNeedCheckCer = true
-                                    let deadDate: String = (item.cerDetailModel.type == 2 ? item.cerDetailModel.china_travel_latest_validate_date :  item.cerDetailModel.latest_validaty_date)
+                                    let deadDate: String = (item.cerDetailModel.type == 2 ? item.cerDetailModel.china_travel_latest_validaty_date :  item.cerDetailModel.latest_validaty_date)
                                     item.cerDetailModel.checkTips = "有效期不足，需要为\(deadDate)或以后"
                                 }
                             }
                         }
                     }
                 }
-                if !hasError {
-                    if !item.cerDetailModel.isOCR_failed { // 无法识别也要可以提交
+                if !hasSubmitError {
+                    // 无法识别或有效期不足也要可以提交
+                    if !item.cerDetailModel.isOCR_failed && isDateValidate {
                         item.cerDetailModel.isNeedCheckCer = false
                         item.cerDetailModel.isNeedCheckDate = false
                     }

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

@@ -46,7 +46,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
     
     
     var latest_validaty_date : String = "" //有效期最晚时间
-    var china_travel_latest_validate_date: String = "" // 中国居留许可签证有效期最晚时间
+    var china_travel_latest_validaty_date: String = "" // 中国居留许可签证有效期最晚时间
     var age: Int = 0
 
     // 是否检测时间
@@ -87,10 +87,10 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
             if self.age < 11 { // 小于11岁的不检测
                 return true
             }
-            if self.china_travel_latest_validate_date.isEmpty { // 截止日期为空
+            if self.china_travel_latest_validaty_date.isEmpty { // 截止日期为空
                 return false
             }
-            let isValid = self.compareDates(dateString1: self.issue_end, dateString2: self.china_travel_latest_validate_date)
+            let isValid = self.compareDates(dateString1: self.issue_end, dateString2: self.china_travel_latest_validaty_date)
             return isValid
         }
         

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

@@ -69,7 +69,7 @@ extension YHTravelDocsPreparationViewModel {
                 for item in resultModel.list {
                     if let item = item {
                         item.latest_validaty_date = self.travelDetailModel?.latest_validaty_date ?? ""
-                        item.china_travel_latest_validate_date = self.travelDetailModel?.china_travel_latest_validaty_date ?? ""
+                        item.china_travel_latest_validaty_date = self.travelDetailModel?.china_travel_latest_validaty_date ?? ""
                         item.age = resultModel.age
                     }
                 }