时间对比

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -254,16 +254,19 @@ extension YHServiceCenterMainViewController {
     }
     
     @objc func pushOrderView() {
-//        let vc = YHOrderDetailViewController()
-//        vc.model = oldModel
-//        vc.backDate = { [weak self] model in
-//            guard let self = self else { return }
-//            self.model = model
-//        }
-//        self.navigationController?.pushViewController(vc)
-        let vc = YHAddAdoptersViewController()
-        vc.orderId = orderId
-        navigationController?.pushViewController(vc)
+        let vc = YHOrderDetailViewController()
+        vc.model = oldModel
+        vc.backDate = { [weak self] model in
+            guard let self = self else { return }
+            self.model = model
+        }
+        self.navigationController?.pushViewController(vc)
+        
+        
+        
+//        let vc = YHAddAdoptersViewController()
+//        vc.orderId = orderId
+//        navigationController?.pushViewController(vc) //for test pete
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/UploadCertificate(7上传过关证件)/C/YHUploadCertificateDetailVC.swift

@@ -175,7 +175,6 @@ private extension YHUploadCertificateDetailVC {
         if detailType == .SmallWhiteNote {
             
             if startDateStr.isEmpty {
-                
                 YHHUD.flash(message: "选择入境日期")
                 return false
             }
@@ -184,6 +183,34 @@ private extension YHUploadCertificateDetailVC {
                 YHHUD.flash(message: "选择逗留截止日期")
                 return false
             }
+            
+            //检验先后 startDateStr < endDateStr
+            
+            let dateFormatter = DateFormatter()
+            dateFormatter.dateFormat = "yyyy-MM-dd"
+            
+            // 假设我们有两个日期
+            if let date1 = dateFormatter.date(from: startDateStr),let date2 = dateFormatter.date(from: endDateStr) {
+                // 使用Calendar比较两个日期
+                let calendar = Calendar.current
+
+                // 比较结果
+                let isDate1Earlier = calendar.compare(date1, to: date2, toGranularity: .day) == .orderedAscending
+//                let isDate2Earlier = calendar.compare(date1, to: date2, toGranularity: .day) == .orderedDescending
+
+                if isDate1Earlier {
+                    print("date1 在 date2 之前")
+                } else {
+                    YHHUD.flash(message: "逗留截止日期必须晚于入境日期")
+                    return false
+                    
+                }
+//                else if isDate2Earlier {
+//                    print("date2 在 date1 之前")
+//                } else {
+//                    print("两个日期相同")
+//                }
+            }
         }
         return true
     }
@@ -201,7 +228,7 @@ private extension YHUploadCertificateDetailVC {
     func submitSmallWhiteBarInfo() {
         
         let params : [String : Any] = [
-            "idcard_url":uploadImageUrl,
+            "small_white_note_url":uploadImageUrl,
             "small_white_note_validity_start":startDateStr,
             "small_white_note_validity_end":endDateStr,
             
@@ -251,7 +278,7 @@ private extension YHUploadCertificateDetailVC {
             defaultDate = endDateStr
         }
         
-        YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: true, currentDay: defaultDate) { [weak self] dateStr in
+        YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: false, currentDay: defaultDate) { [weak self] dateStr in
             guard let self = self else { return }