工作经验主申请人bug修复

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6709,7 +6709,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -6854,7 +6854,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -7062,7 +7062,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -7112,7 +7112,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -158,13 +158,13 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let addressCountry = mainModel.address.country
         let nationality = mainModel.nationality
         let is_live_oversea_year = mainModel.is_live_oversea_year
-        if (nationality.contains("中国") && addressCountry.contains("中国")) || (nationality.contains("中国") && is_live_oversea_year == 0) {
+        if (nationality.contains("中国-China") && addressCountry.contains("中国-China")) || (nationality.contains("中国-China") && is_live_oversea_year == 0) {
             if mainModel.is_handled == 1 {
                 return [section, section1]
             } else {
                 return [section]
             }
-        } else if nationality.contains("中国") && is_live_oversea_year == 1 {
+        } else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
             return [section, section2]
         } else {
             return [section2]
@@ -620,24 +620,22 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             let nationality = mainModel.nationality
             let is_live_oversea_year = mainModel.is_live_oversea_year
             let addressCountry = mainModel.address.country
-            if (nationality.contains("中国") && addressCountry.contains("中国")) || (nationality.contains("中国") && is_live_oversea_year == 0) {
-                if nationality.contains("中国-China") {
-                    guard cn_identity_card_number.count == 18 else { return false }
-                    guard cn_identity_card_issue_at.count > 0 else { return false }
-                    guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
-                    guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
-                }
-                guard hk_macao_pass_number.count > 0 else { return false }
-                guard hk_macao_pass_issue_at.count > 0 else { return false }
-                guard hk_macao_pass_issue_date_start_at.count > 0 else { return false }
-                guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
-            } else if nationality.contains("中国") && is_live_oversea_year == 1 {
-                if nationality.contains("中国-China") {
-                    guard cn_identity_card_number.count == 18 else { return false }
-                    guard cn_identity_card_issue_at.count > 0 else { return false }
-                    guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
-                    guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
+            if (nationality.contains("中国-China") && addressCountry.contains("中国-China")) || (nationality.contains("中国-China") && is_live_oversea_year == 0) {
+                guard cn_identity_card_number.count == 18 else { return false }
+                guard cn_identity_card_issue_at.count > 0 else { return false }
+                guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
+                guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
+                if mainModel.is_handled == 1 {
+                    guard hk_macao_pass_number.count > 0 else { return false }
+                    guard hk_macao_pass_issue_at.count > 0 else { return false }
+                    guard hk_macao_pass_issue_date_start_at.count > 0 else { return false }
+                    guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
                 }
+            } else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
+                guard cn_identity_card_number.count == 18 else { return false }
+                guard cn_identity_card_issue_at.count > 0 else { return false }
+                guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
+                guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
                 guard passport_number.count > 0 else { return false }
                 guard passport_issue_at.count > 0 else { return false }
                 guard passport_issue_date_start_at.count > 0 else { return false }

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

@@ -147,7 +147,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
                 guard let self = self else { return }
                 let firstModel = self.dataSource?.first
                 let vc = YHWorkExperienceViewController()
-                vc.workExperienceID = "\(model.id ?? 0)"
+                vc.workId = model.id ?? 0
                 vc.orderID = self.orderId
                 vc.isShowMessageSelect = true
                 if firstModel?.id == model.id {
@@ -173,7 +173,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
                         let vc = YHWorkExperienceViewController()
                         vc.isShowMessageSelect = true
                         vc.orderID = self.orderId
-                        vc.workExperienceID = "\(self.viewModel?.workId ?? 0)"
+                        vc.workId = self.viewModel?.workId ?? 0
                         self.navigationController?.pushViewController(vc, animated: true)
                     })
                 }

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

@@ -263,7 +263,11 @@ class YHCompanySelectFileCell: UITableViewCell {
     
     typealias SelectBlock = (_ select: YHWorkExperienceCompanyModel) -> ()
     var selectBlock: SelectBlock?
-    var selectItem: [Int] = []
+    var selectItem: [Int] = [] {
+        didSet {
+            updateAllViews()
+        }
+    }
     var centerView: UIView!
     var titleLabel: UILabel!
     var subTitleLabel: UILabel!
@@ -271,22 +275,18 @@ class YHCompanySelectFileCell: UITableViewCell {
     var model: YHWorkExperienceCompanyModel = YHWorkExperienceCompanyModel() {
         didSet {
             var i = 0
+            var temp = 5
             for item in dataSource {
                 if item == model.company_location {
-                    selectData = [i]
-                    return
+                    temp = i
                 }
                 i += 1
             }
-            selectData = []
+            selectItem = [temp]
         }
     }
     var dataSource: [String] = ["内地", "香港", "澳门", "境外"]
-    var selectData: [Int]? {
-        didSet {
-            updateAllViews()
-        }
-    }
+    
     var messageDataSource: [String] = ["公司是否为上市公司", "您目前是否拥有此公司10%以上股权", "您目前是否拥有此公司50%以上股权", "公司全年盈利达港币 500 万元或以上(或等值外币）", "请选择您的公司所在地："]
     
     override func awakeFromNib() {
@@ -415,12 +415,12 @@ class YHCompanySelectFileCell: UITableViewCell {
                     
                     let agreeButton = {
                         let button = UIImageView()
-                        button.image = UIImage(named: "login_privacy_disagree_glay")
+                        button.image = UIImage(named: "service_privacy_disagree_glay")
                         button.tag = 10000 + i
                         if selectItem.contains(i) {
-                            button.image = UIImage(named: "login_privacy_agree")
+                            button.image = UIImage(named: "service_privacy_agree")
                         } else {
-                            button.image = UIImage(named: "login_privacy_disagree_glay")
+                            button.image = UIImage(named: "service_privacy_disagree_glay")
                         }
                         button.isUserInteractionEnabled = false
                         
@@ -479,12 +479,12 @@ class YHCompanySelectFileCell: UITableViewCell {
                         if selectItem.contains(i) {
                             bgviewButton.layer.borderWidth = 1
                             bgviewButton.backgroundColor = UIColor(hex: 0xebf0f9)
-                            agreeButton.image = UIImage(named: "login_privacy_agree")
+                            agreeButton.image = UIImage(named: "service_privacy_agree")
                             subTitleLabel.textColor = UIColor.mainTextColor
                         } else {
                             bgviewButton.layer.borderWidth = 0
                             bgviewButton.backgroundColor = UIColor.contentBkgColor
-                            agreeButton.image = UIImage(named: "login_privacy_disagree_glay")
+                            agreeButton.image = UIImage(named: "service_privacy_disagree_glay")
                             subTitleLabel.textColor = UIColor.mainTextColor
                         }
                     }

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

@@ -147,12 +147,12 @@ class YHWorkExperiencePositionReasonTableViewCell: UITableViewCell {
 
             let agreeButton = {
                 let button = UIImageView()
-                button.image = UIImage(named: "login_privacy_disagree_glay")
+                button.image = UIImage(named: "service_privacy_disagree_glay")
                 button.tag = 10000 + i
                 if selectItem.contains(i) {
-                    button.image = UIImage(named: "login_privacy_agree")
+                    button.image = UIImage(named: "service_privacy_agree")
                 } else {
-                    button.image = UIImage(named: "login_privacy_disagree_glay")
+                    button.image = UIImage(named: "service_privacy_disagree_glay")
                 }
                 button.isUserInteractionEnabled = false
 
@@ -208,13 +208,13 @@ class YHWorkExperiencePositionReasonTableViewCell: UITableViewCell {
                 view?.layer.borderWidth = 1
                 view?.backgroundColor = UIColor(hex: 0xebf0f9)
                 let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
-                subview.image = UIImage(named: "login_privacy_agree")
+                subview.image = UIImage(named: "service_privacy_agree")
             } else {
                 let view = mainItemView.viewWithTag(i + 20000)
                 view?.layer.borderWidth = 0
                 view?.backgroundColor = UIColor.contentBkgColor
                 let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
-                subview.image = UIImage(named: "login_privacy_disagree_glay")
+                subview.image = UIImage(named: "service_privacy_disagree_glay")
             }
         }
     

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

@@ -103,12 +103,12 @@ class YHWorkExperienceSelectView: UIView {
 
             let agreeButton = {
                 let button = UIImageView()
-                button.image = UIImage(named: "login_privacy_disagree_glay")
+                button.image = UIImage(named: "service_privacy_disagree_glay")
                 button.tag = 10000 + i
                 if selectItem.contains(i) {
-                    button.image = UIImage(named: "login_privacy_agree")
+                    button.image = UIImage(named: "service_privacy_agree")
                 } else {
-                    button.image = UIImage(named: "login_privacy_disagree_glay")
+                    button.image = UIImage(named: "service_privacy_disagree_glay")
                 }
                 button.isUserInteractionEnabled = false
 
@@ -161,13 +161,13 @@ class YHWorkExperienceSelectView: UIView {
                 view?.layer.borderWidth = 1
                 view?.backgroundColor = UIColor(hex: 0xebf0f9)
                 let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
-                subview.image = UIImage(named: "login_privacy_agree")
+                subview.image = UIImage(named: "service_privacy_agree")
             } else {
                 let view = mainItemView.viewWithTag(i + 20000)
                 view?.layer.borderWidth = 0
                 view?.backgroundColor = UIColor.contentBkgColor
                 let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
-                subview.image = UIImage(named: "login_privacy_disagree_glay")
+                subview.image = UIImage(named: "service_privacy_disagree_glay")
             }
         }
     

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_privacy_agree.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_privacy_agree@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_privacy_agree@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_privacy_disagree_glay.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_privacy_disagree_glay@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_privacy_disagree_glay@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}