工作经验添加时间重叠限制

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

@@ -82,7 +82,10 @@ class YHWorkExperienceListViewController: YHBaseViewController {
                         return
                     }
                 }
-                
+                if (self.viewModel?.mainModel.has_work_time_empty == 1 && self.viewModel?.mainModel.work_time_empty_remark.count == 0) || (self.viewModel?.mainModel.has_work_time_overlap == 1 && self.viewModel?.mainModel.work_time_overlap_remark.count == 0){
+                    YHHUD.flash(message: "您的工作经验未全部填写完成，请先填写完成再提交")
+                    return
+                }
                 viewModel?.requestWorkTimeRemarkWorkExperience("\(orderId)", 1, callBackBlock: {[weak self] success, error in
                     guard let self = self else { return }
                     if success ?? false {

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

@@ -184,6 +184,8 @@ class YHWorkExperienceListReasonTableViewCell: UITableViewCell {
                 promptsTwoLabel.isHidden = true
                 messageTwoNumberLabel.text = "\(messageTwoTextField.text.count)/1000"
             }
+            self.setNeedsLayout()
+            self.layoutIfNeeded()
         }
     }
     override func awakeFromNib() {

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

@@ -63,7 +63,7 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
                 let selectTimeInterval = selectDate.timeIntervalSince1970
                 let currentTimeInterval = Date().timeIntervalSince1970
                 if selectTimeInterval > currentTimeInterval {
-                    YHHUD.flash(message: "入职日期不能晚于当前日期")
+                    YHHUD.flash(message: "开始就职年月不能晚于当前日期")
                 } else {
                     guard let endDate = format.date(from: position.departure_time) else {
                         position.entry_time = item.message ?? ""
@@ -71,7 +71,7 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
                     }
                     let endTimeInterval = endDate.timeIntervalSince1970
                     if selectTimeInterval > endTimeInterval {
-                        YHHUD.flash(message: "入职日期不能晚于离职日期")
+                        YHHUD.flash(message: "开始就职年月不能晚于结束就职年月")
                     } else {
                         position.entry_time = item.message ?? ""
                     }
@@ -84,7 +84,7 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
                 let selectTimeInterval = selectDate.timeIntervalSince1970
                 let startTimeInterval = startDate.timeIntervalSince1970
                 if selectTimeInterval < startTimeInterval {
-                    YHHUD.flash(message: "离职日期不能早于入职日期")
+                    YHHUD.flash(message: "结束就职年月不能早于开始就职年月")
                 } else {
                     position.departure_time = item.message ?? ""
                 }