Merge branch 'qmas-1130' into AI-1212

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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6717,7 +6717,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -6862,7 +6862,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -7070,7 +7070,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -7120,7 +7120,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -17,7 +17,7 @@ class YHCollegeNameCell: UITableViewCell {
         label.textColor = .mainTextColor
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSC_B(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     

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

@@ -25,7 +25,6 @@ class YHCollegeSearchBar: UIView, UITextFieldDelegate {
     private lazy var contentView = {
         let view = UIView()
         view.backgroundColor = .contentBkgColor
-        view.layer.cornerRadius = Self.height/2.0
         view.clipsToBounds = true
         return view
     }()
@@ -47,7 +46,6 @@ class YHCollegeSearchBar: UIView, UITextFieldDelegate {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = Self.confirmBtnHeight/2.0
         btn.addTarget(self, action: #selector(confirmBtnClicked), for: .touchUpInside)
         return btn
     }()

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

@@ -17,7 +17,7 @@ class YHMajorNameCell: UITableViewCell {
         label.textColor = .mainTextColor
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSC_B(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordWorkExperienceViewController.swift

@@ -388,6 +388,9 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
                     var text = textField.text ?? ""
                     text = text.replacingOccurrences(of: "¥", with: "")
                     text = text.replacingOccurrences(of: ",", with: "")
+                    if text == "0" {
+                        text = ""
+                    }
                     textField.text = text
                 }
                 cell.didEndEditing = { [weak self] textField in
@@ -497,32 +500,36 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
 
 extension YHIncomeRecordWorkExperienceViewController {
     private func checkInput() -> Bool {
+        var retValue = true
+        var updateRows: [IndexPath] = []
         if companyModel.has_all_file == YHIncomeRecordHasAllFile.unknown.rawValue {
             isHasAllFileOK = false
             if let hasAllFileIndexPath = hasAllFileIndexPath, tableView.numberOfSections > hasAllFileIndexPath.section, tableView.numberOfRows(inSection: hasAllFileIndexPath.section) > hasAllFileIndexPath.row {
-                tableView.reloadRows(at: [hasAllFileIndexPath], with: .none)
+                updateRows.append(hasAllFileIndexPath)
             }
-            return false
+            retValue = false
         }
-        isHasAllFileOK = true
         if companyModel.income_type.count == 0 {
             isIncomeTypeOK = false
             if let incomeTypeIndexPath = incomeTypeIndexPath, tableView.numberOfSections > incomeTypeIndexPath.section, tableView.numberOfRows(inSection: incomeTypeIndexPath.section) > incomeTypeIndexPath.row {
-                tableView.reloadRows(at: [incomeTypeIndexPath], with: .none)
+                updateRows.append(incomeTypeIndexPath)
             }
-            return false
+            retValue = false
         }
-        isIncomeTypeOK = true
-        
         if companyModel.income_money == 0 {
             isIncomeMoneyOK = false
             if let incomMoneyIndexPath = incomMoneyIndexPath, tableView.numberOfSections > incomMoneyIndexPath.section, tableView.numberOfRows(inSection: incomMoneyIndexPath.section) > incomMoneyIndexPath.row {
-                tableView.reloadRows(at: [incomMoneyIndexPath], with: .none)
+                updateRows.append(incomMoneyIndexPath)
             }
-            return false
+            retValue = false
+        }
+        if updateRows.count > 0 {
+            tableView.reloadRows(at: updateRows, with: .none)
+            isHasAllFileOK = true
+            isIncomeTypeOK = true
+            isIncomeMoneyOK = true
         }
-        isIncomeMoneyOK = true
-        return true
+        return retValue
     }
 
     private func requestData(isNeedLoading: Bool = false) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeInputMoneyCell.swift

@@ -57,7 +57,7 @@ class YHIncomeInputMoneyCell: YHResignDocumentCell {
         let label = UILabel()
         label.font = .PFSC_R(ofSize: 12)
         label.textColor = .failColor
-        label.text = "请选择"
+        label.text = "请输入"
         return label
     }()
     
@@ -110,11 +110,11 @@ class YHIncomeInputMoneyCell: YHResignDocumentCell {
         infoFailLabel.isHidden = !needShowFailButton
         infoFailLabel.snp.remakeConstraints { make in
             if needShowFailButton {
-                make.top.equalTo(infoDetailLabel.snp.bottom).offset(6)
+                make.top.equalTo(infoTitleLabel.snp.bottom).offset(6)
             }
             make.left.equalToSuperview().offset(18)
             make.right.lessThanOrEqualToSuperview().offset(-18)
-            make.bottom.equalToSuperview().offset(-16)
+            make.bottom.lessThanOrEqualToSuperview().offset(-16)
         }
         
     }

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

@@ -187,7 +187,7 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable
                 guard let self = self else { return }
                 self.viewModel.updateModel(model)
                 let id = model.id
-                if id != .id32 && id != .id4 && id != .id8 && id != .id9 && id != .id12 && id != .id13 && id != .id17 && id != .id18 && id != .id21 && id != .id22 && id != .id23 && id != .id34 && id != .id29 && id != .id30 && id != .id35 {
+                if id != .id32 && id != .id4 && id != .id8 && id != .id9 && id != .id12 && id != .id13 && id != .id17 && id != .id18 && id != .id21 && id != .id22 && id != .id23 && id != .id26 && id != .id34 && id != .id29 && id != .id30 && id != .id35 {
                     self.updateDataSource()
                 }
             }

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

@@ -112,9 +112,9 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let section2 = YHSectionItemModel(title: section3String, models: [item5, item6, item7, item8])
         
         let addressCountry = mainModel.address.country
-        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) {
             return [section, section1]
-        } 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]
@@ -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("中国-China") && addressCountry.contains("中国-China")) || (nationality.contains("中国-China") && is_live_oversea_year == 0) {
+        if (nationality.contains("中国") && addressCountry.contains("中国")) || (nationality.contains("中国") && is_live_oversea_year == 0) {
             if mainModel.is_handled == 1 {
                 return [section, section1]
             } else {
                 return [section]
             }
-        } else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
+        } else if nationality.contains("中国") && is_live_oversea_year == 1 {
             return [section, section2]
         } else {
             return [section2]

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

@@ -32,6 +32,7 @@ class YHWorkExpInfoPreviewDetail_NewModel : SmartCodable {
     var professional_level : String = ""
     var work_duty : String = ""
     var work_highlights : String = ""
+    var company_location : String = ""
     var attachment_list : [WorkExpFilePreviewModel] = []
     var position_list : [YHWorkExpPosition_NewModel] = []
     

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

@@ -22,6 +22,8 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor.labelTextColor2
         lable0.font = UIFont.PFSC_R(ofSize: 14)
+        lable0.numberOfLines = 0
+        lable0.lineBreakMode = .byWordWrapping
         return lable0
     }()
     
@@ -40,12 +42,14 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
     private func setupUI() {
         addSubview(nameLable)
         nameLable.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(18)
+//            make.top.equalToSuperview().offset(18)
+            make.top.equalToSuperview()
             make.left.equalToSuperview()
-            make.width.lessThanOrEqualTo(154)
-            make.height.equalTo(20)
+            make.width.lessThanOrEqualTo(160.fix)
+//            make.height.equalTo(20)
+            make.bottom.lessThanOrEqualToSuperview()
         }
-        nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
+        
         
         addSubview(subtitleLable)
         subtitleLable.snp.makeConstraints { make in
@@ -54,8 +58,16 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
             make.left.equalTo(nameLable.snp.right).offset(10)
             make.height.greaterThanOrEqualTo(20)
             
-            make.bottom.equalToSuperview()
+//            make.bottom.equalToSuperview()
+            
+            make.bottom.lessThanOrEqualToSuperview()
         }
+        nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
+        subtitleLable.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        
+//        nameLable.backgroundColor = .red //for test hjl
+//        subtitleLable.backgroundColor = .yellow //for test hjl
+        
     }
 }
 
@@ -64,23 +76,48 @@ extension YHPreviewInfoNameAndSubNameItemView {
         nameLable.text = title
         subtitleLable.text = subtitle
         
-        //处理特长的字符
-        if title.contains("相关工作是否属国际工作经验：") || title.contains("公司营业额/港元(近一年)：") || title.contains("是否在海外居住满1年及以上：")   {
-            nameLable.snp.remakeConstraints { make in
-                make.top.equalToSuperview().offset(18)
-                make.left.equalToSuperview()
-                make.width.lessThanOrEqualTo(240)
-                make.height.equalTo(20)
-            }
-            nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
-        } else if title.contains("主申请人或现配偶是否拥有孩子护养权：") {
-            nameLable.snp.remakeConstraints { make in
-                make.top.equalToSuperview().offset(18)
-                make.left.equalToSuperview()
-                make.width.lessThanOrEqualTo(260)
-                make.height.equalTo(20)
-            }
+        nameLable.snp.removeConstraints()
+        subtitleLable.snp.removeConstraints()
+        
+        
+        nameLable.snp.remakeConstraints() { make in
+            make.top.equalToSuperview().offset(kMargin)
+            make.left.equalToSuperview()
+            make.width.lessThanOrEqualTo(160.fix)
+//            make.height.equalTo(20)
+            make.bottom.lessThanOrEqualToSuperview()
         }
+        
+        
+        addSubview(subtitleLable)
+        subtitleLable.snp.remakeConstraints { make in
+            make.top.equalTo(nameLable.snp.top)
+            make.right.equalToSuperview()
+            make.left.equalTo(nameLable.snp.right).offset(10)
+            make.height.greaterThanOrEqualTo(20)
+            
+//            make.bottom.equalToSuperview()
+            
+            make.bottom.lessThanOrEqualToSuperview()
+        }
+        
+        //处理特长的字符
+//        if title.contains("相关工作是否属国际工作经验：") || title.contains("公司营业额/港元(近一年)：") || title.contains("是否在海外居住满1年及以上：")   {
+//            nameLable.snp.remakeConstraints { make in
+//                make.top.equalToSuperview().offset(18)
+//                make.left.equalToSuperview()
+//                make.width.lessThanOrEqualTo(240)
+//                make.height.equalTo(20)
+//            }
+//            nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
+//        } else if title.contains("主申请人或现配偶是否拥有孩子护养权：") {
+//            nameLable.snp.remakeConstraints { make in
+//                make.top.equalToSuperview().offset(18)
+//                make.left.equalToSuperview()
+//                make.width.lessThanOrEqualTo(260)
+//                make.height.equalTo(20)
+//            }
+//        }
     }
 }
 

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

@@ -28,8 +28,8 @@ extension YHPreviewInfoNameAndSubNameItemsView {
             addSubview(sessionView)
             sessionView.snp.makeConstraints { make in
                 make.top.equalToSuperview()
-                make.right.equalToSuperview().offset(-18)
-                make.left.equalToSuperview().offset(18)
+                make.right.equalToSuperview().offset(-kMargin)
+                make.left.equalToSuperview().offset(kMargin)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
             lastTagView = sessionView
@@ -45,16 +45,16 @@ extension YHPreviewInfoNameAndSubNameItemsView {
             if lastTagView == nil {
                 cellView.snp.makeConstraints { make in
                     make.top.equalToSuperview()
-                    make.right.equalToSuperview().offset(-18)
-                    make.left.equalToSuperview().offset(18)
+                    make.right.equalToSuperview().offset(-kMargin)
+                    make.left.equalToSuperview().offset(kMargin)
                     make.bottom.equalToSuperview().offset(-21)
                 }
                 
             } else {
                 cellView.snp.makeConstraints { make in
-                    make.top.equalTo(lastTagView!.snp.bottom)
-                    make.right.equalToSuperview().offset(-18)
-                    make.left.equalToSuperview().offset(18)
+                    make.top.equalTo(lastTagView!.snp.bottom).offset(kMargin)
+                    make.right.equalToSuperview().offset(-kMargin)
+                    make.left.equalToSuperview().offset(kMargin)
                     make.bottom.equalToSuperview().offset(-21)
                 }
             }
@@ -70,13 +70,15 @@ extension YHPreviewInfoNameAndSubNameItemsView {
                     cellView.snp.makeConstraints { make in
                         if tmp == nil {
                             make.top.equalToSuperview()
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                             make.bottom.equalToSuperview().offset(-21)
+                            
+//                            cellView.backgroundColor = UIColor.purple//for test hjl
                         } else {
                             make.top.equalTo(tmp!.snp.bottom)
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                             make.bottom.equalToSuperview().offset(-21)
                         }
                     }
@@ -85,13 +87,15 @@ extension YHPreviewInfoNameAndSubNameItemsView {
                     cellView.snp.makeConstraints { make in
                         if tmp == nil {
                             make.top.equalToSuperview()
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
+                            
+//                            cellView.backgroundColor = UIColor.purple//for test hjl
                             
                         } else {
                             make.top.equalTo(tmp!.snp.bottom)
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                         }
                     }
                 }

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

@@ -149,10 +149,6 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
                 let vc = YHWorkExperienceViewController()
                 vc.workId = model.id ?? 0
                 vc.orderID = self.orderId
-                vc.isShowMessageSelect = true
-                if firstModel?.id == model.id {
-                    vc.isShowMessageSelect = false
-                }
                 self.navigationController?.pushViewController(vc, animated: true)
             }
             cell.deleteBlock = {[weak self] model in
@@ -170,11 +166,12 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
                 } else {
                     self.viewModel?.requestCreateNewWork(self.orderId, callBackBlock: {[weak self] success, error in
                         guard let self = self else { return }
-                        let vc = YHWorkExperienceViewController()
-                        vc.isShowMessageSelect = true
-                        vc.orderID = self.orderId
-                        vc.workId = self.viewModel?.workId ?? 0
-                        self.navigationController?.pushViewController(vc, animated: true)
+                        if success != 0 {
+                            let vc = YHWorkExperienceViewController()
+                            vc.orderID = self.orderId
+                            vc.workId = success
+                            self.navigationController?.pushViewController(vc, animated: true)
+                        }
                     })
                 }
             }
@@ -187,9 +184,9 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
             cell.clickBlock = { [weak self] value, index in
                 guard let self = self else { return }
                 if index == 0 {
-                    self.viewModel?.mainModel.work_time_empty_remark = value
-                } else {
                     self.viewModel?.mainModel.work_time_overlap_remark = value
+                } else {
+                    self.viewModel?.mainModel.work_time_empty_remark = value
                 }
             }
             cell.backgroundColor = .clear

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

@@ -24,7 +24,7 @@ class YHWorkExperiencePositionViewViewController: YHBaseViewController {
     var isShowPrompt: Bool = false
     var isShowMessageSelect: Bool = true
     var isKeyboardShow: Bool = false
-    var selectReasonIndex: Int = 5
+    var selectReasonIndex: Int = 0
     var selectEditItem = YHWorkExperienceFileModel()
     
     override func viewDidLoad() {
@@ -170,7 +170,11 @@ class YHWorkExperiencePositionViewViewController: YHBaseViewController {
 
 extension YHWorkExperiencePositionViewViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 2
+        if self.viewModel.position.is_international_work_experience == 1 {
+            return 2
+        } else {
+            return 1
+        }
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {

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

@@ -21,7 +21,6 @@ class YHWorkExperienceViewController: YHBaseViewController {
     var orderID: Int = 0
     var isMore: Bool = false
     var isShowPrompt: Bool = false
-    var isShowMessageSelect: Bool = true
     var isKeyboardShow: Bool = false
     var selectEditItem = YHWorkExperienceFileModel()
     var fileMessageArray: [String] = ["签字盖章的推荐信", "盖章的工作证明+签字的推荐信", "其他证明(退工单或合同+社保等证明)", "以上均不能提供"]
@@ -379,7 +378,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
     }
     
     @objc func keyboardWillShow(_ notification: Notification) {
-        if stepView.currentIndex != 0 {
+        if stepView.currentIndex != 0 &&  stepView.currentIndex != 3 {
             // 当键盘将要显示时调用此函数
             stepView.snp.remakeConstraints { make in
                 make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
@@ -402,7 +401,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
     }
      
     @objc func keyboardWillHide(_ notification: Notification) {
-        if stepView.currentIndex != 0 {
+        if stepView.currentIndex != 0 && stepView.currentIndex != 3 {
             // 当键盘将要隐藏时调用此函数
             stepView.snp.remakeConstraints { make in
                 make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
@@ -837,8 +836,8 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                 }
                 cell.newWorkBlock = {[weak self] in
                     guard let self = self else { return }
-                    if self.viewModel.positionList.count == 5 {
-                        YHHUD.flash(message: "新增职位不能超过5条")
+                    if self.viewModel.positionList.count == 10 {
+                        YHHUD.flash(message: "新增职位不能超过10条")
                     } else {
                         let vc = YHWorkExperiencePositionViewViewController()
                         vc.workID = workId
@@ -878,7 +877,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                 var height = 23 + 154
                 for item in viewModel.positionList {
                     if item.position_name == "" {
-                        height = height + 76
+                        height = height + 52
                     } else {
                         let text = item.position_name // 要显示的文本内容
                         let font = UIFont.PFSC_B(ofSize: 14) // 字体大小
@@ -891,13 +890,15 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                         // 根据指定的最大宽度和字体大小计算文本的高度
                         let size = (text as NSString).boundingRect(with: CGSize(width: maxWidth, height: .greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size
                         if size.height > 20 {
-                            height = height + 96
+                            height = height + 72
                         } else {
-                            height = height + 76
+                            height = height + 52
                         }
                     }
+                    if isShowPrompt && item.missing_item_num != 0 {
+                        height = height + 20
+                    }
                 }
-                
                 return CGFloat(height)
             }
         }

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

@@ -10,7 +10,7 @@ import Foundation
 import SmartCodable
 
 class YHWorkExperienceDetailModel: SmartCodable {
-    var word_id: Int  = 0
+    var work_id: Int  = 0
     var order_id: Int  = 0
     var company_name: String  = ""
     var professional_level: Int  = 0

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

@@ -46,6 +46,8 @@ enum YHWorkExperienceID: Int {
     case id20 = 19 // 高管证明文件
     case id21 = 20 // 高管在职开始时间
     case id22 = 21 // 高管在职结束时间
+    case id23 = 22 // 入职年月
+    case id24 = 23 // 离职年月
 }
 
 

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

@@ -181,7 +181,7 @@ class YHSelectFileSheetView: UIView {
     }
     
     @objc func sure() {
-        var array:[YHWorkExperienceFileModel] = []
+        var array: [YHWorkExperienceFileModel] = []
         for item in dataSource {
             if item.isSelect {
                 array.append(item)
@@ -211,13 +211,17 @@ extension YHSelectFileSheetView: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHSelectFileCell.self)
         cell.updateModel(dataSource[indexPath.row])
+        cell.index = indexPath.row
         cell.editBlock = { [weak self] model in
             guard let self = self else { return }
+            var i = 0
             for item in dataSource {
-                if item.fileUrl == model.fileUrl {
+                if i == model {
                     item.isSelect = !item.isSelect
                 }
+                i = i + 1
             }
+            self.tableView.reloadData()
         }
         return cell
     }
@@ -248,8 +252,8 @@ class YHSelectFileCell: UITableViewCell {
     
     static let cellReuseIdentifier = "YHSelectFileCell"
     
-    var editBlock:((YHWorkExperienceFileModel)->())?
-    
+    var editBlock:((Int)->())?
+    var index: Int = 0
     var whiteView: UIView!
     var iconImgV: UIImageView!
     var nameLabel: UILabel!
@@ -306,7 +310,7 @@ class YHSelectFileCell: UITableViewCell {
     @objc func didEditBtnClicked() {
         editBtn.isSelected = !editBtn.isSelected
         if let editBlock = editBlock {
-            editBlock(contentItem)
+            editBlock(index)
         }
     }
     

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

@@ -809,7 +809,7 @@ class YHCompanyReasonFileCell: UITableViewCell {
     var titleLabel: UILabel!
     var subTitleLabel: UILabel!
     var mainItemView: UIView!
-    
+    var alertLabel: UILabel!
     var dataSource: [String] = ["验资报告", "审计报告", "绝对实益拥有人声明书", "企业所得税月(季)度预缴纳税申报表(A类)（前4个季度/前12个月）", "企业所得税完税证明(表格式)", "企业所得税年度纳税申报表(A类) (近一年度)", "工作证明"]
     var model: YHWorkExperienceCompanyModel? {
         didSet {
@@ -892,6 +892,21 @@ class YHCompanyReasonFileCell: UITableViewCell {
             make.top.equalTo(52)
         }
         
+        alertLabel = {
+            let label = UILabel()
+            label.numberOfLines = 0
+            let b: ASAttributedString = .init("若不能提供以上证明材料，将导致您的该收入", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor(hex: 0x8993a2)))
+            let c: ASAttributedString = .init("不被认可不予加分", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.failColor))
+            let d: ASAttributedString = .init("，请尽可能准备以上材料并修改此选项)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor(hex: 0x8993a2)))
+            label.attributed.text = b + c + d
+            return label
+        }()
+        centerView.addSubview(alertLabel)
+        alertLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.bottom.equalTo(-16)
+        }
     }
     
     func updateAllViews() {
@@ -999,12 +1014,14 @@ class YHCompanyReasonFileCell: UITableViewCell {
                 rightButton.isSelected = false
                 leftButton.layer.borderWidth = 1
                 rightButton.layer.borderWidth = 0
+                alertLabel.isHidden = true
             }
             if model?.has_provide_certificate == 2 {
                 rightButton.isSelected = true
                 leftButton.isSelected = false
                 leftButton.layer.borderWidth = 0
                 rightButton.layer.borderWidth = 1
+                alertLabel.isHidden = false
             }
             for i in 0..<dataSource.count {
                 let agreeButton = {
@@ -1062,6 +1079,13 @@ class YHCompanyReasonFileCell: UITableViewCell {
         if let block = selectBlock {
             block(model ?? YHWorkExperienceCompanyModel())
         }
+        mainItemView.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(-16)
+            make.top.equalTo(52)
+        }
+        alertLabel.isHidden = true
+
     }
     
     @objc func rightClick(sender: UIButton) {
@@ -1069,6 +1093,12 @@ class YHCompanyReasonFileCell: UITableViewCell {
         if let block = selectBlock {
             block(model ?? YHWorkExperienceCompanyModel())
         }
+        mainItemView.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(-72)
+            make.top.equalTo(52)
+        }
+        alertLabel.isHidden = false
     }
     
 }

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

@@ -308,7 +308,7 @@ class YHWorkExperienceItemView: UIView {
             showPromptLabel.isHidden = true
         }
         
-        if dataSource.id == .id10 || dataSource.id == .id22{
+        if dataSource.id == .id10 || dataSource.id == .id22 || dataSource.id == .id24 {
             longTimeButton.isHidden = false
             nextStepImageView.isHidden = true
             if dataSource.message == "至今" {
@@ -439,6 +439,14 @@ class YHWorkExperienceItemView: UIView {
                 title = "选择高管在职结束时间"
                 lastIsTaday = true
             }
+            if dataSource?.id == .id23 {
+                title = "选择开始就职年月"
+                lastIsTaday = true
+            }
+            if dataSource?.id == .id24 {
+                title = "选择结束就职年月"
+                lastIsTaday = true
+            }
             YHDatePickView.show(type: .yyyymm, title: title, lastIsTaday: lastIsTaday, currentDay: dataSource?.message ?? "") { date in
                 self.dataSource?.message = date
                 self.updateAllViews()

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

@@ -174,12 +174,12 @@ class YHWorkExperienceListReasonTableViewCell: UITableViewCell {
                     make.bottom.equalTo(-28)
                 }
             }
-            messageTextField.text = model?.work_time_empty_remark
+            messageTextField.text = model?.work_time_overlap_remark
             if messageTextField.text.count != 0 {
                 promptsLabel.isHidden = true
                 messageNumberLabel.text = "\(messageTextField.text.count)/1000"
             }
-            messageTwoTextField.text = model?.work_time_overlap_remark
+            messageTwoTextField.text = model?.work_time_empty_remark
             if messageTwoTextField.text.count != 0 {
                 promptsTwoLabel.isHidden = true
                 messageTwoNumberLabel.text = "\(messageTwoTextField.text.count)/1000"

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

@@ -229,11 +229,14 @@ class YHWorkExperiencePositionTableViewCell: UITableViewCell {
                 // 根据指定的最大宽度和字体大小计算文本的高度
                 let size = (text as NSString).boundingRect(with: CGSize(width: maxWidth, height: .greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size
                 if size.height > 20 {
-                    h = 95
+                    h = 71
                 } else {
-                    h = 75
+                    h = 51
                 }
             }
+            if showPrompt && model.missing_item_num != 0 {
+                h = h + 20
+            }
             mainItemView.addSubview(itemView)
             itemView.snp.makeConstraints { make in
                 make.left.equalTo(18)

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: 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 item2 = YHWorkExperienceModel(id: .id23, isNeed: true, title: "开始就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.entry_time, type: .time)
+        let item3 = YHWorkExperienceModel(id: .id24, 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: "否")
@@ -56,7 +56,7 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
             position.position_name = item.message ?? ""
         case .id2: // 用人单位性质
             position.wduty = item.message ?? ""
-        case .id3: // 入职年月
+        case .id23: // 入职年月
             let format = DateFormatter()
             format.dateFormat = "yyyy-MM"
             if let selectDate = format.date(from:item.message ?? "") {
@@ -77,7 +77,7 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
                     }
                 }
             }
-        case .id10: // 离职年月
+        case .id24: // 离职年月
             let format = DateFormatter()
             format.dateFormat = "yyyy-MM"
             if let selectDate = format.date(from:item.message ?? ""), let startDate = format.date(from:position.entry_time) {

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

@@ -304,7 +304,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                     callBackBlock(false,nil)
                     return
                 }
-                self.mainModel.word_id = result.word_id
+                self.mainModel.work_id = result.work_id
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
@@ -352,7 +352,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                     callBackBlock(false,nil)
                     return
                 }
-                self.mainModel.word_id = result.word_id
+                self.mainModel.work_id = result.work_id
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
@@ -400,7 +400,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                     callBackBlock(false,nil)
                     return
                 }
-                self.mainModel.word_id = result.word_id
+                self.mainModel.work_id = result.work_id
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)

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

@@ -60,8 +60,8 @@ class YHWorkItemListViewModel: YHBaseViewModel {
     
     func requestWorkTimeRemarkWorkExperience(_ orderId: String, _ isSaveAll: Int = 0, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
         let params: [String : Any] = ["order_id": orderId,
-                                      "work_time_overlap_remark": self.mainModel.work_time_overlap_remark,
-                                      "work_time_empty_remark": self.mainModel.work_time_empty_remark,
+                                      "work_time_empty_remark": self.mainModel.work_time_overlap_remark,
+                                      "work_time_overlap_remark": self.mainModel.work_time_empty_remark,
                                       "is_save_all": isSaveAll]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.saveWorkTimeRemark
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
@@ -78,7 +78,7 @@ class YHWorkItemListViewModel: YHBaseViewModel {
         }
     }
     
-    func requestCreateNewWork(_ orderId: Int, callBackBlock:@escaping (_ success: [YHWorkItemListModel]?, _ error:YHErrorModel?)->()) {
+    func requestCreateNewWork(_ orderId: Int, callBackBlock:@escaping (_ success: Int, _ error:YHErrorModel?)->()) {
 //        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.list + "?order_id=\(orderId)"
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.createNewWork
         let params: [String : Any] = ["order_id": orderId]
@@ -88,17 +88,17 @@ class YHWorkItemListViewModel: YHBaseViewModel {
             guard let self = self else { return }
             if json.code == 200 {
                 guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceDetailModel.deserialize(from: dic) else {
-                    callBackBlock([],nil)
+                    callBackBlock(0,nil)
                     return
                 }
-                self.workId = result.word_id
-                callBackBlock(self.listModel, nil)
+                self.workId = result.work_id
+                callBackBlock(result.work_id, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock([], error)
+                callBackBlock(0, error)
             }
         } failBlock: { err in
-            callBackBlock([],err)
+            callBackBlock(0,err)
         }
     }
 }