// 覆盖优才文件夹

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

@@ -20,8 +20,8 @@ enum HKFormItemCellType: Int {
     case degreeDetailInfo = 7
     case onlyTwoChoice = 8
     case question = 9
-    case educationCerUpload = 10
-    case cerConfirm = 11
+    
+    case cerConfirm = 10 
     
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -70,8 +70,6 @@ enum YHFormTitleItemType:Int, CaseIterable {
     case mainApplicantProfessionalQualification
     // 学历证书姓名及出生日期正确性
     case edutionalCertificateNameAndBirthday
-    // 学历证件(选填)
-    case educationCertificate
 
 
     
@@ -194,6 +192,7 @@ enum YHFormDetailItemType:Int {
     case educationCity
     // 证件提供确认
     case cerConfirm
+    
     // 证书信息
     case certificateInfo
     // 资格证书名称
@@ -297,8 +296,7 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "主申请人专业资格及会员资格".local
         case .edutionalCertificateNameAndBirthday:
             return "学历证书姓名及出生日期正确性".local
-        case .educationCertificate:
-            return "学历证件(选填)".local
+            
         }
     }
     
@@ -318,8 +316,6 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "(如有，非必填）".local
         case .edutionalCertificateNameAndBirthday:
             return "".local
-        case .educationCertificate:
-            return "".local
         case .isPreviousMarriageChild:
             return "".local
         case .accompany:
@@ -532,6 +528,8 @@ class YHFormDetailItem : YHFormItemProtocol {
         case .cerConfirm:
             return "证件提供确认".local
         }
+    
+
     }
     
     func getSubTitle() -> String {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemDoubleChoiceCell.swift

@@ -203,34 +203,12 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
             make.top.equalTo(titleLabel.snp.bottom)
             make.bottom.equalToSuperview().offset(-16).priority(.medium)
         }
-        
         setTips("", isShow: false)
-
-        
     }
     
     func setTips(_ tips:String?, isShow:Bool) {
         tipsLabel.text = tips
         tipsLabel.isHidden = !isShow
-        
-        if isShow {
-            tipsLabel.snp.remakeConstraints { make in
-                make.left.equalToSuperview().offset(horizonalGap)
-                make.right.equalToSuperview().offset(-horizonalGap)
-                make.top.equalTo(titleLabel.snp.bottom)
-                make.bottom.equalToSuperview().offset(-16)
-            }
-        } else {
-            tipsLabel.snp.remakeConstraints { make in
-                make.left.equalToSuperview().offset(horizonalGap)
-                make.right.equalToSuperview().offset(-horizonalGap)
-                make.top.equalTo(titleLabel.snp.bottom)
-                make.height.equalTo(0)
-                make.bottom.equalToSuperview().offset(-16)
-            }
-        }
-        self.setNeedsLayout()
-        self.layoutIfNeeded()
     }
     
     // 更新答案按钮选中状态

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift

@@ -214,6 +214,7 @@ class YHOtherInfoFillViewModel: YHBaseViewModel {
          ]
         ],
     ]
+    
 }
 
 extension YHOtherInfoFillViewModel {
@@ -231,7 +232,7 @@ extension YHOtherInfoFillViewModel {
                     callBackBlock(false,nil)
                     return
                 }
-            
+                
 //                if resultModel.residences.isEmpty {
 //                    resultModel.residences.append(Residence())
 //                }
@@ -240,6 +241,7 @@ extension YHOtherInfoFillViewModel {
                 
                 //根据返回值 组装 真实的数据
                 handleData()
+                
                 callBackBlock(true,nil)
                 
             } else {
@@ -277,7 +279,6 @@ extension YHOtherInfoFillViewModel {
 
 extension YHOtherInfoFillViewModel {
     func handleData() {
-
 //        if let language = self.otherInfoFillData?.language_detail {
 //            if language.level > 0 {
 //                let target = String(language.level)
@@ -319,6 +320,7 @@ extension YHOtherInfoFillViewModel {
             self.otherInfoFillData?.language_detail_new_data = []
         }
         
+        
         if let profession = self.otherInfoFillData?.profession {
             if profession.option > 0 {
                 let target = String(profession.option)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemView.swift

@@ -42,7 +42,6 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
     private func setupUI() {
         addSubview(nameLable)
         nameLable.snp.makeConstraints { make in
-
 //            make.top.equalToSuperview().offset(18)
             make.top.equalToSuperview()
             make.left.equalToSuperview()
@@ -50,7 +49,8 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
 //            make.height.equalTo(20)
             make.bottom.lessThanOrEqualToSuperview()
         }
-            
+        
+        
         addSubview(subtitleLable)
         subtitleLable.snp.makeConstraints { make in
             make.top.equalTo(nameLable.snp.top)
@@ -68,6 +68,7 @@ extension YHPreviewInfoNameAndSubNameItemView {
     func update(title : String,subtitle : String) {
         nameLable.text = title
         subtitleLable.text = subtitle
+        
         nameLable.snp.removeConstraints()
         subtitleLable.snp.removeConstraints()
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoWorkExpView.swift

@@ -18,7 +18,6 @@ class YHPreviewInfoWorkExpView: UIView {
 
 private extension  YHPreviewInfoWorkExpView {
     func updateUI() {
-
         guard let model = dataModel,let mmodel = model.cellData4,!mmodel.isEmpty else { return }
         if model.cellType == .workExp {
             removeSubviews()
@@ -35,7 +34,6 @@ private extension  YHPreviewInfoWorkExpView {
             }
             
             var lastTagView : UIView = sessionView
-            
             for(_,item) in mmodel.enumerated() {
                 if !item.title.isEmpty,!item.title.contains("简历/工作总结") {
                     let label = UILabel()

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

@@ -9,7 +9,6 @@
 import UIKit
 
 class YHWorkExperienceListViewController: YHBaseViewController {
-
     var bottomView: YHBottomNextView!
     var tableView: UITableView!
     var dataSource: [YHWorkItemListModel]?
@@ -17,7 +16,7 @@ class YHWorkExperienceListViewController: YHBaseViewController {
     var isMore: Bool = false
     var orderId: Int = 0
     var showPrompt: Bool = false
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         viewModel = YHWorkItemListViewModel()
@@ -70,7 +69,6 @@ class YHWorkExperienceListViewController: YHBaseViewController {
         }
         
         bottomView = {
-
             let bottom = YHBottomNextView()
             bottom.nextButton.setTitle("提交", for: .normal)
             bottom.nextblock = { [weak self] in
@@ -218,7 +216,6 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
             for item in data {
                 if item.company_name == "" {
                     height = height + 76
-                    
                 } else {
                     let text = item.company_name // 要显示的文本内容
                     let font = UIFont.PFSC_B(ofSize: 14) // 字体大小

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

@@ -10,7 +10,6 @@ import Foundation
 import SmartCodable
 
 class YHWorkExperienceDetailModel: SmartCodable {
-
     var work_id: Int  = 0
     var order_id: Int  = 0
     var company_name: String  = ""
@@ -19,6 +18,7 @@ class YHWorkExperienceDetailModel: SmartCodable {
     var has_finish_basic_question: Int = 0
     var work_duty: String = ""
     var work_highlights: String = ""
+    
     var file: [YHWorkExperienceFileModel] = []
     
     required init() {
@@ -40,3 +40,4 @@ class YHWorkExperienceStepModel: SmartCodable {
     required init() {
     }
 }
+

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

@@ -10,19 +10,6 @@ import UIKit
 import SmartCodable
 
 class YHWorkExperienceProjectModel: SmartCodable {
-    var id: Int?
-    var order_id: Int?
-    var work_id: Int?
-    var project_name: String?
-    var project_start_time: String?
-    var project_end_time: String?
-    var project_highlights: String?
-    var update_from_appid: Int?
-    var create_from_appid: Int?
-    var customer_center_id: Int?
-    var created_at: String?
-    var updated_at: String?
-    var deleted_at: String?
     var list: [YHWorkExperienceFileModel] = []
     required init() {
     }

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

@@ -34,6 +34,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     func updateModel(_ item: YHWorkExperienceModel) {
         guard let type = item.id else { return }
         switch type {
+            
         case .id1: // 用人单位
             mainModel.company_name = item.message ?? ""
         case .id2: // 用人单位性质
@@ -131,7 +132,6 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                            "uploadedAt": item.uploadedAt]
             file.append(fileDic)
         }
-
         let params: [String : Any] = ["next_step": 0,
                                       "work_id": workId,
                                       "file_list": file
@@ -144,6 +144,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                     callBackBlock(false,nil)
                     return
                 }
+//                self.mainModel.id = result.id
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
@@ -178,7 +179,6 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         }
     }
     
-
     func requestDeleteWorkPosition(_ model: YHWorkExperiencePositionModel, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
         let params: [String : Any] = ["position_id": model.position_id, "work_id": model.work_id]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.deleteWorkPosition

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

-//
-//  YHWorkIntroductionViewModel.swift
-//  galaxy
-//
-//  Created by EDY on 2024/2/21.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-import Alamofire
-
-class YHWorkIntroductionViewModel: YHBaseViewModel {
-    var introducetionExampleModels: [YHWorkExampleModel]?
-
-    override init() {
-        super.init()
-    }
-    
-    func requestIntroducetionExample(callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.projectExample
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
-            //1. json字符串 转 对象
-            guard let self = self else { return }
-            if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHWorkExampleModel].deserialize(from: dic) else {
-                    callBackBlock(false,nil)
-                    return
-                }
-                self.introducetionExampleModels = result as? [YHWorkExampleModel]
-                callBackBlock(true, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(false, error)
-            }
-        } failBlock: { err in
-            callBackBlock(false,err)
-        }
-    }
-    
-    // 0保存 1下一步
-    func saveWorkProjectDetail(_ workModel: YHWorkExperienceDetailModel, projectModel: YHWorkExperienceProjectModel, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
-        let params: [String : Any] = ["id": projectModel.id ?? 0,
-                                      "order_id": workModel.order_id,
-                                      "work_id": workModel.work_id,
-                                      "project_name": projectModel.project_name ?? "",
-                                      "project_start_time": projectModel.project_start_time ?? "",
-                                      "project_end_time": projectModel.project_end_time ?? "",
-                                      "project_highlights": projectModel.project_highlights ?? 0,
-                                      "create_from_appid": projectModel.create_from_appid ?? 2,
-                                      "update_from_appid": projectModel.create_from_appid ?? 2
-                                    ]
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.saveProject
-        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
-            guard let self = self else { return }
-            if json.code == 200 {
-                callBackBlock(true, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(false, error)
-            }
-        } failBlock: { err in
-            callBackBlock(false, err)
-        }
-    }
-    
-    func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
-//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
-        
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.normal
-        let param: [String: Any] = ["url": url]
-        let _ = YHNetRequest.postRequest(url: strUrl,params:param) { [weak self] json, code in
-            //1. json字符串 转 对象
-            guard let self = self else { return }
-            if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHFileContent.deserialize(from: dic) else {
-                    callBackBlock(false, nil, nil)
-                    return
-                }
-                callBackBlock(true, result, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(false, nil,error)
-            }
-        } failBlock: { err in
-            callBackBlock(false, nil, err)
-        }
-    }
-}
-