Commit 7c8d9042 authored by pete谢兆麟's avatar pete谢兆麟

主申请人信息逻辑修改

parent 19d23336
...@@ -116,6 +116,15 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -116,6 +116,15 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
return [section, section1] return [section, section1]
} else if nationality.contains("中国-China") && is_live_oversea_year == 1 { } else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
return [section, section2] return [section, section2]
} else if nationality.contains("中国") {
if is_live_oversea_year == 1 {
if mainModel.is_handled == 1 {
return [section1, section2]
}
return [section2]
} else {
return [section1]
}
} else { } else {
return [section2] return [section2]
} }
...@@ -340,6 +349,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -340,6 +349,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
mainModel.address.foreign = item.message ?? "" mainModel.address.foreign = item.message ?? ""
case .id33: case .id33:
mainModel.is_live_oversea_year = item.value?.first?.int ?? 0 mainModel.is_live_oversea_year = item.value?.first?.int ?? 0
mainModel.is_handled = 0
case .id34: case .id34:
mainModel.birth_place.foreign = item.message ?? "" mainModel.birth_place.foreign = item.message ?? ""
case .id35: case .id35:
...@@ -640,6 +650,19 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -640,6 +650,19 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
guard passport_issue_at.count > 0 else { return false } guard passport_issue_at.count > 0 else { return false }
guard passport_issue_date_start_at.count > 0 else { return false } guard passport_issue_date_start_at.count > 0 else { return false }
guard passport_issue_date_end_at.count > 0 else { return false } guard passport_issue_date_end_at.count > 0 else { return false }
} else if nationality.contains("中国") {
if is_live_oversea_year == 1 {
guard passport_number.count > 0 else { return false }
guard passport_issue_at.count > 0 else { return false }
guard passport_issue_date_start_at.count > 0 else { return false }
guard passport_issue_date_end_at.count > 0 else { return false }
}
if mainModel.is_handled == 1 {
guard hk_macao_pass_number.count > 0 else { return false }
guard hk_macao_pass_issue_at.count > 0 else { return false }
guard hk_macao_pass_issue_date_start_at.count > 0 else { return false }
guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
}
} else { } else {
guard passport_number.count > 0 else { return false } guard passport_number.count > 0 else { return false }
guard passport_issue_at.count > 0 else { return false } guard passport_issue_at.count > 0 else { return false }
......
...@@ -186,7 +186,7 @@ extension YHWorkExperiencePositionViewViewController: UITableViewDelegate, UITab ...@@ -186,7 +186,7 @@ extension YHWorkExperiencePositionViewViewController: UITableViewDelegate, UITab
guard let self = self else { return } guard let self = self else { return }
self.viewModel.updateModel(model) self.viewModel.updateModel(model)
let id = model.id let id = model.id
if id != .id1 && id != .id2 && id != .id6 && id != .id10 { if id != .id1 && id != .id2 && id != .id6 && id != .id10 && id != .id11 {
self.updateDataSource() self.updateDataSource()
} }
} }
......
...@@ -86,13 +86,13 @@ class YHWorkExperienceListTableViewCell: UITableViewCell { ...@@ -86,13 +86,13 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
label.font = UIFont.PFSC_R(ofSize: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "从获得有效学位(学士学位或以上)后第一份工作开始,直至最近一份工作" label.text = "从获得有效学位(学士学位或以上)后第一份工作开始,直至最近一份工作"
label.textColor = UIColor.labelTextColor2 label.textColor = UIColor.labelTextColor2
label.numberOfLines = 0
return label return label
}() }()
centerView.addSubview(subTitleLabel) centerView.addSubview(subTitleLabel)
subTitleLabel.snp.makeConstraints { make in subTitleLabel.snp.makeConstraints { make in
make.left.equalTo(20) make.left.equalTo(20)
make.top.equalTo(50) make.top.equalTo(50)
make.height.equalTo(20)
make.right.equalTo(-20) make.right.equalTo(-20)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment