工作经验bug修复

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() {

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

@@ -379,7 +379,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 +402,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)

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(工作经验)/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