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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  工作经验国家值修改
  时间选择器修改

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -331,12 +331,15 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
             } else if detailItem.type == .educationTime || detailItem.type == .graduateTime { // 入学及毕业年月
                 
                 var title = ""
+                var dateStr = ""
                 if detailItem.type == .educationTime {
                     title = "选择入学日期"
+                    dateStr = detailInfo.admissionTime
                 } else if detailItem.type == .graduateTime {
                     title = "选择毕业日期"
+                    dateStr = detailInfo.graduateTime
                 }
-                YHDatePickView.show(type: .yyyymm, title: title, lastIsTaday: true) {
+                YHDatePickView.show(type: .yyyymm, title: title, lastIsTaday: true, currentDay: dateStr) {
                     [weak self] dateStr in
                     guard let self = self else { return }
                     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -288,7 +288,7 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
                 
             } else if detailItem.type == .conferTime { // 授权年份
                 
-                YHDatePickView.show(type: .yyyy, title:"选择授权年份".local, lastIsTaday: true) {
+                YHDatePickView.show(type: .yyyy, title:"选择授权年份".local, lastIsTaday: true, currentDay: "\(detailInfo.issuingYear)") {
                     [weak self] dateStr in
                     guard let self = self else { return }
                     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -347,14 +347,9 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                 }
                 
                 self.view?.endEditing(true)
-                YHDatePickView.show(type: .yyyymmdd, title: title, lastIsTaday: lastIsTaday) {
-                    [weak self] dateStr  in
-                    
-                    print(dateStr)
                 
-                    guard let self = self else { return }
                 guard let familyMember = self.familyMember else { return }
-                    
+                var timeString = ""
                 var certificate = familyMember.certificates.cnIdentityCard
                 if titleItem.type == .chinaIdCardInfo {
                     certificate = familyMember.certificates.cnIdentityCard
@@ -366,6 +361,20 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                     certificate = familyMember.certificates.passport
                 }
                 
+                if detailItem.type == .certificateSignDate { // 选择签发日期
+                    timeString = certificate.issueDateStartAt
+
+                } else if detailItem.type == .certificateValidDate { // 届满日期
+                    timeString = certificate.issueDateEndAt
+                }
+                
+                YHDatePickView.show(type: .yyyymmdd, title: title, lastIsTaday: lastIsTaday, currentDay: timeString) {
+                    [weak self] dateStr  in
+                    
+                    print(dateStr)
+                    guard let self = self else { return }
+                    
+                    
                     let format = DateFormatter()
                     format.dateFormat = "yyyy-MM-dd"
                     if let selectDate = format.date(from:dateStr) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -460,7 +460,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 if detailItem.type == .stayHKDate {
                     title = "选择逗留日期"
                 }
-                YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: true) { [weak self] dateStr in
+                YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: true, currentDay: self.child?.childInHk.info ?? "") { [weak self] dateStr in
                     guard let self = self else { return }
                     
                     if detailItem.type == .stayHKDate {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -418,7 +418,7 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                 
                 // 子女选择年满18岁则【是否随行至香港】默认选择否，不可修改
                 // 如果未年满18岁则【是否随行至香港】可选择【是/否】,可修改
-                YHDatePickView.show(type: .yyyymmdd, title:"选择出生日期".local, lastIsTaday: true) { [weak self] date in
+                YHDatePickView.show(type: .yyyymmdd, title:"选择出生日期".local, lastIsTaday: true, currentDay: child?.birthday ?? "") { [weak self] date in
                     guard let self = self else { return }
                     
                     if detailItem.type == .birthday {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -422,7 +422,7 @@ extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
             let detailItem = item as! YHFormDetailItem
             
             if detailItem.type == .birthday { // 出生日期
-                YHDatePickView.show(type: .yyyymmdd, title:"选择出生日期".local, lastIsTaday: true) { [weak self] dateStr in
+                YHDatePickView.show(type: .yyyymmdd, title:"选择出生日期".local, lastIsTaday: true, currentDay: self.brotherInfo?.birthday ?? "") { [weak self] dateStr in
                     guard let self = self else { return }
                     
                     if detailItem.type == .birthday {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -470,7 +470,7 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
             let detailItem = item as! YHFormDetailItem
             
             if detailItem.type == .birthday { // 出生日期
-                YHDatePickView.show(type: .yyyymmdd, title:"选择出生日期".local, lastIsTaday: true) { [weak self] dateStr in
+                YHDatePickView.show(type: .yyyymmdd, title:"选择出生日期".local, lastIsTaday: true, currentDay: self.parentInfo?.birthday ?? "") { [weak self] dateStr in
                     guard let self = self else { return }
                     
                     if detailItem.type == .birthday {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -666,7 +666,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 } else if detailItem.type == .stayHKDate {
                     title = "选择逗留日期"
                 }
-                YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: true) { [weak self] dateStr in
+                YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: true, currentDay: spouse?.birthday ?? "") { [weak self] dateStr in
                     guard let self = self else { return }
                     
                     if detailItem.type == .birthday {

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

@@ -35,21 +35,22 @@ class YHDatePickView: UIView {
     var lastIsTaday: Bool = false {
         didSet {
             guard let type = type else { return }
+            let index = self.currentDateCom.year! - self.dateCom.year!
             switch type {
             case .yyyymmdd:
-                pickerView.selectRow(99, inComponent: 0, animated: true)
-                pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
-                pickerView.selectRow(self.currentDateCom.day! - 1, inComponent: 2, animated: true)
+                pickerView.selectRow(99 - index, inComponent: 0, animated: true)
+                pickerView.selectRow(self.dateCom.month! - 1, inComponent: 1, animated: true)
+                pickerView.selectRow(self.dateCom.day! - 1, inComponent: 2, animated: true)
             case .yyyymm:
-                pickerView.selectRow(99, inComponent: 0, animated: true)
-                pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
+                pickerView.selectRow(99 - index, inComponent: 0, animated: true)
+                pickerView.selectRow(self.dateCom.month! - 1, inComponent: 1, animated: true)
             case .yyyy:
-                pickerView.selectRow(99, inComponent: 0, animated: true)
+                pickerView.selectRow(99 - index, inComponent: 0, animated: true)
             }
         }
     }
     private var currentDateCom: DateComponents = Calendar.current.dateComponents([.year, .month, .day],  from: Date())
-    
+    var dateCom: DateComponents = Calendar.current.dateComponents([.year, .month, .day],  from: Date())
     // 日期分割符 eg: 2024-01-01
     static let separator: String = "-"
         
@@ -191,11 +192,23 @@ class YHDatePickView: UIView {
         dismiss()
     }
     
-    static func show(type:YHDateType, title: String? = nil, lastIsTaday: Bool = false, callBack: @escaping ((String) -> Void)) {
+    static func show(type:YHDateType, title: String? = nil, lastIsTaday: Bool = false, currentDay: String = "", callBack: @escaping ((String) -> Void)) {
         let view = YHDatePickView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
         view.type = type
         view.backDate = callBack
         view.title = title ?? ""
+        let dateFormatter = DateFormatter()
+        switch type {
+        case .yyyymmdd:
+            dateFormatter.dateFormat = "yyyy-MM-dd"
+        case .yyyymm:
+            dateFormatter.dateFormat = "yyyy-MM"
+        case .yyyy:
+            dateFormatter.dateFormat = "yyyy"
+        }
+        if currentDay != "", let date = dateFormatter.date(from: currentDay) {
+            view.dateCom = Calendar.current.dateComponents([.year, .month, .day],  from: date)
+        }
         view.lastIsTaday = lastIsTaday
         let window = UIApplication.shared.yhKeyWindow()
         window?.addSubview(view)

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

@@ -448,7 +448,7 @@ class YHItemView: UIView {
                 title = "请选择出生日期"
                 isLastDay = true
             }
-            YHDatePickView.show(type: .yyyymmdd, title: title, lastIsTaday: isLastDay) { date in
+            YHDatePickView.show(type: .yyyymmdd, title: title, lastIsTaday: isLastDay, currentDay: dataSource?.message ?? "") { date in
                 self.dataSource?.message = date
                 self.updateAllViews()
                 if let block = self.block {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherResidenceFillView.swift

@@ -155,7 +155,7 @@ extension YHOtherResidenceFillView {
     
     
     @objc func tapStartDate(_ gestureRecognizer: UIPanGestureRecognizer) {
-        YHDatePickView.show(type: .yyyymm,title: "请选择开始时间", lastIsTaday: true) { date in
+        YHDatePickView.show(type: .yyyymm,title: "请选择开始时间", lastIsTaday: true, currentDay: self.dataModel?.start_time ?? "") { date in
            printLog(date)
             
             self.startView.updateKeyName(name: "开始时间", keyValue: date)
@@ -167,7 +167,7 @@ extension YHOtherResidenceFillView {
     @objc func tapEndDate(_ gestureRecognizer: UIPanGestureRecognizer) {
         
         if !endView.longTimeButton.isSelected {
-            YHDatePickView.show(type: .yyyymm,title: "请选择结束时间") { date in
+            YHDatePickView.show(type: .yyyymm, title: "请选择结束时间", currentDay: self.dataModel?.end_time ?? "") { date in
                printLog(date)
                 self.endView.updateKeyName(name: "结束时间", keyValue: date)
                 self.dataModel?.end_time = date

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

@@ -289,7 +289,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
     
     @objc func startClick() {
         view.endEditing(true)
-        YHDatePickView.show(type: .yyyymmdd, title: "请选择开始时间", lastIsTaday: true) { date in
+        YHDatePickView.show(type: .yyyymmdd, title: "请选择开始时间", lastIsTaday: true, currentDay: dataSource.project_start_time ?? "") { date in
             if date > self.dataSource.project_end_time ?? "" && self.dataSource.project_end_time?.count ?? 0 > 0 {
                 YHHUD.flash(message: "开始时间不能晚于结束时间")
             } else {
@@ -312,7 +312,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
      
     @objc func endClick() {
         view.endEditing(true)
-        YHDatePickView.show(type: .yyyymmdd, title: "请选择结束时间", lastIsTaday: true) { date in
+        YHDatePickView.show(type: .yyyymmdd, title: "请选择结束时间", lastIsTaday: true, currentDay: dataSource.project_end_time ?? "") { date in
             if date < self.dataSource.project_start_time ?? "" {
                 YHHUD.flash(message: "结束时间不能早于开始时间")
             } else {

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

@@ -420,7 +420,7 @@ class YHWorkExperienceItemView: UIView {
                 title = "请选择高管在职结束时间"
                 lastIsTaday = true
             }
-            YHDatePickView.show(type: .yyyymm, title: title, lastIsTaday: lastIsTaday) { date in
+            YHDatePickView.show(type: .yyyymm, title: title, lastIsTaday: lastIsTaday, currentDay: dataSource?.message ?? "") { date in
                 self.dataSource?.message = date
                 self.updateAllViews()
                 if let block = self.block {

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

@@ -255,6 +255,12 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     
     // 0保存 1下一步
     func saveWorkDetail(_ saveType: Int, orderID: Int, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
+        if mainModel.location.country.contains("中国") {
+            mainModel.location_aboard = 0
+        } else {
+            mainModel.location_aboard = 1
+        }
+        
         let area: [String] = mainModel.location.area
         let location = ["area": area,
                         "country": mainModel.location.country,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceTableFootView.swift

@@ -31,7 +31,7 @@ class YHServiceTableFootView: UIView {
         collectinoView.register(YHHomeCollectionViewCell.self, forCellWithReuseIdentifier:YHHomeCollectionViewCell.cellReuseIdentifier)
         collectinoView.delegate = self
         collectinoView.dataSource = self
-        collectinoView.bounces = false
+//        collectinoView.bounces = false
         collectinoView.translatesAutoresizingMaskIntoConstraints = false
         collectinoView.alwaysBounceVertical = true
         collectinoView.showsVerticalScrollIndicator = false