UI走查修改

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -166,17 +166,77 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         case .id9:
             mainModel.certificates.cn_identity_card.issue_at = item.message ?? ""
         case .id10:
-            mainModel.certificates.cn_identity_card.issue_date_start_at = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM-dd"
+            if let selectDate = format.date(from:item.message ?? "") {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let currentTimeInterval = Date().timeIntervalSince1970
+                if selectTimeInterval > currentTimeInterval {
+                    YHHUD.flash(message: "签发日期须早于当前日期")
+                } else {
+                    guard let endDate = format.date(from: mainModel.certificates.cn_identity_card.issue_date_end_at) else {
+                        mainModel.certificates.cn_identity_card.issue_date_start_at = item.message ?? ""
+                        return
+                    }
+                    let endTimeInterval = endDate.timeIntervalSince1970
+                    if selectTimeInterval > endTimeInterval {
+                        YHHUD.flash(message: "签发日期须早于早于届满日期")
+                    } else {
+                        mainModel.certificates.cn_identity_card.issue_date_start_at = item.message ?? ""
+                    }
+                }
+            }
         case .id11:
-            mainModel.certificates.cn_identity_card.issue_date_end_at = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM-dd"
+            if let selectDate = format.date(from:item.message ?? ""), let startDate = format.date(from:mainModel.certificates.cn_identity_card.issue_date_start_at) {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let startTimeInterval = startDate.timeIntervalSince1970
+                if selectTimeInterval < startTimeInterval {
+                    YHHUD.flash(message: "届满日期须晚于签发日期")
+                } else {
+                    mainModel.certificates.cn_identity_card.issue_date_end_at = item.message ?? ""
+                }
+            } else {
+                mainModel.certificates.cn_identity_card.issue_date_end_at = item.message ?? ""
+            }
         case .id12:
             mainModel.certificates.hk_macao_pass.number = item.message ?? ""
         case .id13:
             mainModel.certificates.hk_macao_pass.issue_at = item.message ?? ""
         case .id14:
-            mainModel.certificates.hk_macao_pass.issue_date_start_at = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM-dd"
+            if let selectDate = format.date(from:item.message ?? "") {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let currentTimeInterval = Date().timeIntervalSince1970
+                if selectTimeInterval > currentTimeInterval {
+                    YHHUD.flash(message: "签发日期须早于当前日期")
+                } else {
+                    guard let endDate = format.date(from: mainModel.certificates.hk_macao_pass.issue_date_end_at) else {
+                        mainModel.certificates.hk_macao_pass.issue_date_start_at = item.message ?? ""
+                        return
+                    }
+                    let endTimeInterval = endDate.timeIntervalSince1970
+                    if selectTimeInterval > endTimeInterval {
+                        YHHUD.flash(message: "签发日期须早于早于届满日期")
+                    } else {
+                        mainModel.certificates.hk_macao_pass.issue_date_start_at = item.message ?? ""
+                    }
+                }
+            }
         case .id15:
-            mainModel.certificates.hk_macao_pass.issue_date_end_at = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM-dd"
+            if let selectDate = format.date(from:item.message ?? ""), let startDate = format.date(from:mainModel.certificates.hk_macao_pass.issue_date_start_at) {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let startTimeInterval = startDate.timeIntervalSince1970
+                if selectTimeInterval < startTimeInterval {
+                    YHHUD.flash(message: "届满日期须晚于签发日期")
+                } else {
+                    mainModel.certificates.hk_macao_pass.issue_date_end_at = item.message ?? ""
+                }
+            }
         case .id16:
             mainModel.certificates.passport.passport_type = item.value?.first?.int ?? 0
         case .id17:
@@ -184,9 +244,38 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         case .id18:
             mainModel.certificates.passport.issue_at = item.message ?? ""
         case .id19:
-            mainModel.certificates.passport.issue_date_start_at = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM-dd"
+            if let selectDate = format.date(from:item.message ?? "") {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let currentTimeInterval = Date().timeIntervalSince1970
+                if selectTimeInterval > currentTimeInterval {
+                    YHHUD.flash(message: "签发日期须早于当前日期")
+                } else {
+                    guard let endDate = format.date(from: mainModel.certificates.passport.issue_date_end_at) else {
+                        mainModel.certificates.passport.issue_date_start_at = item.message ?? ""
+                        return
+                    }
+                    let endTimeInterval = endDate.timeIntervalSince1970
+                    if selectTimeInterval > endTimeInterval {
+                        YHHUD.flash(message: "签发日期须早于早于届满日期")
+                    } else {
+                        mainModel.certificates.passport.issue_date_start_at = item.message ?? ""
+                    }
+                }
+            }
         case .id20:
-            mainModel.certificates.passport.issue_date_end_at = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM-dd"
+            if let selectDate = format.date(from:item.message ?? ""), let startDate = format.date(from:mainModel.certificates.passport.issue_date_start_at) {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let startTimeInterval = startDate.timeIntervalSince1970
+                if selectTimeInterval < startTimeInterval {
+                    YHHUD.flash(message: "届满日期须晚于签发日期")
+                } else {
+                    mainModel.certificates.passport.issue_date_end_at = item.message ?? ""
+                }
+            }
         case .id21:
             mainModel.username = item.message ?? ""
         case .id22:
@@ -194,7 +283,17 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         case .id23:
             mainModel.surname = item.message ?? ""
         case .id24:
-            mainModel.birthday = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM-dd"
+            if let selectDate = format.date(from:item.message ?? "") {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let currentTimeInterval = Date().timeIntervalSince1970
+                if selectTimeInterval > currentTimeInterval {
+                    YHHUD.flash(message: "入学日期须早于当前日期")
+                } else {
+                    mainModel.birthday = item.message ?? ""
+                }
+            }
         case .id25:
             mainModel.birth_place_aboard = item.value?.first?.int ?? 0
         case .id26:

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift

@@ -182,9 +182,9 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         let number = dataSource?.count ?? 0
         if number == 0 {
-            return CGFloat(16 + 216)
+            return CGFloat(23 + 216)
         } else {
-            return CGFloat(16 + 154 + 76 * number)
+            return CGFloat(23 + 154 + 76 * number)
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift

@@ -89,7 +89,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
         }
         
         tableView = {
-            let tableView = UITableView(frame:.zero, style:.plain)
+            let tableView = UITableView(frame: .zero, style: .grouped)
             if #available(iOS 11.0, *) {
                 tableView.contentInsetAdjustmentBehavior = .never
             }
@@ -528,4 +528,21 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
             return CGFloat(h + 52 + 14)
         }
     }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 7))
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 7
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.01
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift

@@ -291,12 +291,21 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         view.endEditing(true)
         YHDatePickView.show(type: .yyyymmdd, title: "请选择开始时间") { date in
             if date > self.dataSource.project_end_time ?? "" && self.dataSource.project_end_time?.count ?? 0 > 0 {
-                self.startTextField.text = ""
-                self.dataSource.project_start_time = ""
                 YHHUD.flash(message: "开始时间不能晚于结束时间")
             } else {
-                self.startTextField.text = date
-                self.dataSource.project_start_time = date
+                let format = DateFormatter()
+                format.dateFormat = "yyyy-MM-dd"
+                if let selectDate = format.date(from:date) {
+                    let selectTimeInterval = selectDate.timeIntervalSince1970
+                    let currentTimeInterval = Date().timeIntervalSince1970
+                    if selectTimeInterval > currentTimeInterval {
+                        YHHUD.flash(message: "开始时间不能晚于当前时间")
+                    } else {
+                        self.startTextField.text = date
+                        self.dataSource.project_start_time = date
+                    }
+                }
+               
             }
         }
     }
@@ -305,8 +314,6 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         view.endEditing(true)
         YHDatePickView.show(type: .yyyymmdd, title: "请选择结束时间") { date in
             if date < self.dataSource.project_start_time ?? "" {
-                self.endTextField.text = ""
-                self.dataSource.project_end_time = ""
                 YHHUD.flash(message: "结束时间不能早于开始时间")
             } else {
                 self.endTextField.text = date

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceListTableViewCell.swift

@@ -62,7 +62,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         centerView.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)
-            make.top.equalTo(7)
+            make.top.equalTo(14)
             make.bottom.equalTo(-7)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkHighlightsTableViewCell.swift

@@ -61,7 +61,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
         contentView.addSubview(centerView)
         centerView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.top.equalTo(14)
+            make.top.equalTo(7)
         }
         
         titleLabel = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkResponsibilitiesTableViewCell.swift

@@ -57,7 +57,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
         contentView.addSubview(centerView)
         centerView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.top.equalTo(14)
+            make.top.equalTo(7)
         }
         
         titleLabel = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift

@@ -88,19 +88,36 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         case .id8: // 职位
             mainModel.position = item.message ?? ""
         case .id9: // 入职年月
-            if item.message ?? "" > mainModel.departure_time && mainModel.departure_time.count != 0 {
-                mainModel.entry_time = ""
-                if item.message != "" {
-                    YHHUD.flash(message: "入职日期不能晚于离职日期")
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM"
+            if let selectDate = format.date(from:item.message ?? "") {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let currentTimeInterval = Date().timeIntervalSince1970
+                if selectTimeInterval > currentTimeInterval {
+                    YHHUD.flash(message: "入职日期不能晚于当前日期")
+                } else {
+                    guard let endDate = format.date(from: mainModel.departure_time) else {
+                        mainModel.entry_time = item.message ?? ""
+                        return
+                    }
+                    let endTimeInterval = endDate.timeIntervalSince1970
+                    if selectTimeInterval > endTimeInterval {
+                        YHHUD.flash(message: "入职日期不能晚于离职日期")
+                    } else {
+                        mainModel.entry_time = item.message ?? ""
+                    }
                 }
-            } else {
-                mainModel.entry_time = item.message ?? ""
             }
         case .id10: // 离职年月
-            if item.message ?? "" < mainModel.entry_time {
-                mainModel.departure_time = ""
-                if item.message != "" {
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM"
+            if let selectDate = format.date(from:item.message ?? ""), let startDate = format.date(from:mainModel.entry_time) {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let startTimeInterval = startDate.timeIntervalSince1970
+                if selectTimeInterval < startTimeInterval {
                     YHHUD.flash(message: "离职日期不能早于入职日期")
+                } else {
+                    mainModel.departure_time = item.message ?? ""
                 }
             } else {
                 mainModel.departure_time = item.message ?? ""
@@ -126,9 +143,40 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         case .id20: // 高管证明文件
             mainModel.executives_certificate = item.message ?? ""
         case .id21: // 高管在职开始时间
-            mainModel.top_manager_start_at = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM"
+            if let selectDate = format.date(from:item.message ?? "") {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let currentTimeInterval = Date().timeIntervalSince1970
+                if selectTimeInterval > currentTimeInterval {
+                    YHHUD.flash(message: "高管在职开始时间须早于当前日期")
+                } else {
+                    guard let endDate = format.date(from: mainModel.top_manager_end_at) else {
+                        mainModel.top_manager_start_at = item.message ?? ""
+                        return
+                    }
+                    let endTimeInterval = endDate.timeIntervalSince1970
+                    if selectTimeInterval > endTimeInterval {
+                        YHHUD.flash(message: "高管在职开始时间须早于离职日期")
+                    } else {
+                        mainModel.top_manager_start_at = item.message ?? ""
+                    }
+                }
+            }
         case .id22: // 高管在职结束时间
-            mainModel.top_manager_end_at = item.message ?? ""
+            let format = DateFormatter()
+            format.dateFormat = "yyyy-MM"
+            if let selectDate = format.date(from:item.message ?? ""), let startDate = format.date(from:mainModel.top_manager_start_at) {
+                let selectTimeInterval = selectDate.timeIntervalSince1970
+                let startTimeInterval = startDate.timeIntervalSince1970
+                if selectTimeInterval < startTimeInterval {
+                    YHHUD.flash(message: "高管在职结束时间须晚于开始日期")
+                } else {
+                    mainModel.top_manager_end_at = item.message ?? ""
+                }
+            } else {
+                mainModel.top_manager_end_at = item.message ?? ""
+            }
         }
     }