工作经验细节修改

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHDocumentPromptTableViewCell.swift

@@ -14,6 +14,7 @@ class YHDocumentPromptTableViewCell: UITableViewCell {
     var promptImageView: UIImageView!
     var titleLabel: UILabel!
     var subTitleLabel: UILabel!
+    var link: String = ""
     var type: Int = 0 {
         didSet {
             updatePrompt()
@@ -135,7 +136,7 @@ class YHDocumentPromptTableViewCell: UITableViewCell {
         let aa: ASAttributedString = .init("查看示例模板", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor), .underline(.single), .action {
             
             let viewModel = YHBaseViewModel()
-            viewModel.getPublicImageUrl("https://test-cdn.galaxy-immi.com/4001014/4804205858403988036120241104135639.jpg") { success, error in
+            viewModel.getPublicImageUrl(self.link) { success, error in
                 if let success = success {
                     self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"")
                 }

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

@@ -130,6 +130,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
         if indexPath.row == 0 {
             let cell = tableView.dequeueReusableCell(withClass: YHDocumentPromptTableViewCell.self)
             cell.workList = 0
+            cell.link = self.viewModel?.mainModel.agree_work_doc_url ?? ""
             cell.backgroundColor = .clear
             cell.contentView.backgroundColor = .clear
             return cell

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

@@ -743,24 +743,22 @@ class YHCompanySelectFileCell: UITableViewCell {
         var tempModel = YHWorkExperienceCompanyModel()
         if number == 0 {
             tempModel.is_ipo_company = 1
-        }
-        if number == 1 && model.is_ipo_company == 1 {
+        } else if number == 1 && model.is_ipo_company == 1 {
             tempModel.has_ipo_company_equity = 1
             tempModel.is_ipo_company = 1
-        }
-        if number == 2 && model.is_ipo_company == 2 {
+        } else if number == 2 && model.is_ipo_company == 2 {
             tempModel.has_company_equity = 1
             tempModel.is_ipo_company = 2
-        }
-        if number == 3 && (model.is_ipo_company == 1 && model.has_ipo_company_equity == 1) {
+        } else if number == 3 && (model.is_ipo_company == 1 && model.has_ipo_company_equity == 1) {
             tempModel.has_ipo_sales_reached = 1
             tempModel.is_ipo_company = 1
             tempModel.has_ipo_company_equity = 1
-        }
-        if number == 3 && (model.is_ipo_company == 2 && model.has_company_equity == 1) {
+        } else if number == 3 && (model.is_ipo_company == 2 && model.has_company_equity == 1) {
             tempModel.has_sales_reached = 1
             tempModel.is_ipo_company = 2
             tempModel.has_company_equity = 1
+        } else {
+            return
         }
         tempModel.company_location = ""
         tempModel.has_provide_certificate = 0
@@ -775,23 +773,22 @@ class YHCompanySelectFileCell: UITableViewCell {
         var tempModel = YHWorkExperienceCompanyModel()
         if number == 0 {
             tempModel.is_ipo_company = 2
-        }
-        if number == 1 && model.is_ipo_company == 1 {
+        } else if number == 1 && model.is_ipo_company == 1 {
             tempModel.has_ipo_company_equity = 2
-            tempModel.is_ipo_company = 1        }
-        if number == 2 && model.is_ipo_company == 2 {
+            tempModel.is_ipo_company = 1
+        } else if number == 2 && model.is_ipo_company == 2 {
             tempModel.has_company_equity = 2
             tempModel.is_ipo_company = 2
-        }
-        if number == 3 && (model.is_ipo_company == 1 && model.has_ipo_company_equity == 1) {
+        } else if number == 3 && (model.is_ipo_company == 1 && model.has_ipo_company_equity == 1) {
             tempModel.has_ipo_sales_reached = 2
             tempModel.is_ipo_company = 1
             tempModel.has_ipo_company_equity = 1
-        }
-        if number == 3 && (model.is_ipo_company == 2 && model.has_company_equity == 1) {
+        } else if number == 3 && (model.is_ipo_company == 2 && model.has_company_equity == 1) {
             tempModel.has_sales_reached = 2
             tempModel.is_ipo_company = 2
             tempModel.has_company_equity = 1
+        } else {
+            return
         }
         tempModel.company_location = ""
         tempModel.has_provide_certificate = 0

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

@@ -18,8 +18,8 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
     func getBaseDataSource(_ isShowPrompt: Bool) -> [YHSectionWorkExperienceModel] {
         let item = YHWorkExperienceModel(id: .id1, isNeed: true, title: "职位名称", isUserKeyBoard: true, prompts: "请输入", message: position.position_name, isShowPrompts: isShowPrompt, alertMessage:"请输入")
         let item1 = YHWorkExperienceModel(id: .id2, isNeed: true, title: "职责性质", isUserKeyBoard: true, prompts: "请输入", message: position.wduty, isShowPrompts: isShowPrompt, alertMessage:"请输入")
-        let item2 = YHWorkExperienceModel(id: .id3, isNeed: false, title: "开始就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.entry_time, type: .time)
-        let item3 = YHWorkExperienceModel(id: .id10, isNeed: false, title: "结束就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.departure_time, type: .time)
+        let item2 = YHWorkExperienceModel(id: .id3, isNeed: true, title: "开始就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.entry_time, type: .time)
+        let item3 = YHWorkExperienceModel(id: .id10, isNeed: true, title: "结束就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.departure_time, type: .time)
         let item6 = YHWorkExperienceModel(id: .id5, isNeed: true, title: "经验领域", isUserKeyBoard: false, prompts: "请选择", message: position.experience_scope, type: .field, isShowPrompts: isShowPrompt, alertMessage:"请选择")
         let item66 = YHWorkExperienceModel(id: .id6, isNeed: true, title: "具体经验领域", isUserKeyBoard: true, prompts: "请输入", message: position.experience_sub_scope, type: .country, isShowPrompts: isShowPrompt, alertMessage:"请输入")
         let item11 = YHWorkExperienceModel(id: .id7, isNeed: true, title: "相关工作经验是否属于国际工作经验", isUserKeyBoard: false, prompts: "", message: "\(position.is_international_work_experience)", leftButtonString: "是", rightButtonString: "否")
@@ -118,15 +118,16 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
         let is_international_work_experience = position.is_international_work_experience
         let work_country = position.work_country
         let work_city = position.work_city
+        let provide_certificate_type = position.provide_certificate_type
         
         guard position_name.count > 0 else { return false }
         guard wduty.count > 0 else { return false }
         guard entry_time.count > 0 else { return false }
         guard departure_time.count > 0 else { return false }
         guard experience_scope.count > 0 else { return false }
-        guard is_international_work_experience > 0 else { return false }
         guard work_country.count > 0 else { return false }
         guard work_city.count > 0 else { return false }
+        guard provide_certificate_type != 5 else { return false }
         if experience_scope == "其他" {
             guard experience_sub_scope.count > 0 else { return false }
         }