Skip to content

G
galaxy-iOS
Commit 08dc0d65 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

工作经验主申请人bug修复

parent 142185a6
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 75 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 08dc0d65
......@@ -6709,7 +6709,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -6854,7 +6854,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -7062,7 +7062,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -7112,7 +7112,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift
View file @ 08dc0d65
......@@ -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("中国") && addressCountry.contains("中国")) || (nationality.contains("中国") && is_live_oversea_year == 0) {
if (nationality.contains("中国-China") && addressCountry.contains("中国-China")) || (nationality.contains("中国-China") && is_live_oversea_year == 0) {
if mainModel.is_handled == 1 {
return [section, section1]
} else {
return [section]
}
} 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]
......@@ -620,24 +620,22 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
let nationality = mainModel.nationality
let is_live_oversea_year = mainModel.is_live_oversea_year
let addressCountry = mainModel.address.country
if (nationality.contains("中国") && addressCountry.contains("中国")) || (nationality.contains("中国") && is_live_oversea_year == 0) {
if nationality.contains("中国-China") {
guard cn_identity_card_number.count == 18 else { return false }
guard cn_identity_card_issue_at.count > 0 else { return false }
guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
}
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 if nationality.contains("中国") && is_live_oversea_year == 1 {
if nationality.contains("中国-China") {
guard cn_identity_card_number.count == 18 else { return false }
guard cn_identity_card_issue_at.count > 0 else { return false }
guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
if (nationality.contains("中国-China") && addressCountry.contains("中国-China")) || (nationality.contains("中国-China") && is_live_oversea_year == 0) {
guard cn_identity_card_number.count == 18 else { return false }
guard cn_identity_card_issue_at.count > 0 else { return false }
guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
guard cn_identity_card_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 if nationality.contains("中国-China") && is_live_oversea_year == 1 {
guard cn_identity_card_number.count == 18 else { return false }
guard cn_identity_card_issue_at.count > 0 else { return false }
guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
guard cn_identity_card_issue_date_end_at.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_date_start_at.count > 0 else { return false }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift
View file @ 08dc0d65
......@@ -147,7 +147,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
guard let self = self else { return }
let firstModel = self.dataSource?.first
let vc = YHWorkExperienceViewController()
vc.workExperienceID = "\(model.id ?? 0)"
vc.workId = model.id ?? 0
vc.orderID = self.orderId
vc.isShowMessageSelect = true
if firstModel?.id == model.id {
......@@ -173,7 +173,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
let vc = YHWorkExperienceViewController()
vc.isShowMessageSelect = true
vc.orderID = self.orderId
vc.workExperienceID = "\(self.viewModel?.workId ?? 0)"
vc.workId = self.viewModel?.workId ?? 0
self.navigationController?.pushViewController(vc, animated: true)
})
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift
View file @ 08dc0d65
......@@ -17,7 +17,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
var viewModel: YHWorkExperienceViewModel!
var baseDataSource: [YHSectionWorkExperienceModel]?
var fileDataSource: [YHWorkExperienceFileModel]?
var workExperienceID: String?
var workId: Int = 0
var orderID: Int = 0
var isMore: Bool = false
var isShowPrompt: Bool = false
......@@ -69,7 +69,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
}
}
self.viewModel.mainModel.file = self.fileDataSource ?? []
self.viewModel.saveWorkDetail(workId: workExperienceID?.intValue() ?? 0, callBackBlock: {flag, error in
self.viewModel.saveWorkDetail(workId: workId, callBackBlock: {flag, error in
})
self.tableView.reloadData()
}
......@@ -78,10 +78,10 @@ class YHWorkExperienceViewController: YHBaseViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if workExperienceID == "0" {
if workId == 0 {
return
}
viewModel.requestWorkPositionList("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
viewModel.requestWorkPositionList("\(orderID)", "\(workId)") {[weak self] success, error in
guard let self = self else { return }
self.updateDataSource()
}
......@@ -114,13 +114,13 @@ class YHWorkExperienceViewController: YHBaseViewController {
viewModel.requestWorkExample { success, error in
}
if workExperienceID == "0" {
if workId == 0 {
self.stepView.currentIndex = 0
self.stepView.maxIndex = 0
self.updateDataSource()
return
}
viewModel.requestWorkStep("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
viewModel.requestWorkStep("\(orderID)", "\(workId)") {[weak self] success, error in
guard let self = self else { return }
if self.viewModel.stepModel.step < 3 {
self.stepView.currentIndex = self.viewModel.stepModel.step
......@@ -130,23 +130,23 @@ class YHWorkExperienceViewController: YHBaseViewController {
self.stepView.maxIndex = 3
}
self.stepView.dataSource = ["基本信息", "工作职责", "工作亮点", "简历/工作总结"]
viewModel.requestWorkPositionList("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
viewModel.requestWorkPositionList("\(orderID)", "\(workId)") {[weak self] success, error in
guard let self = self else { return }
self.updateDataSource()
}
viewModel.requestworkDutyDetail(workExperienceID ?? "") {[weak self] success, error in
viewModel.requestworkDutyDetail("\(workId)") {[weak self] success, error in
guard let self = self else { return }
self.updateDataSource()
}
viewModel.requestWorkHighlightsDetail(workExperienceID ?? "") {[weak self] success, error in
viewModel.requestWorkHighlightsDetail("\(workId)") {[weak self] success, error in
guard let self = self else { return }
self.updateDataSource()
}
viewModel.requestWorkDetail("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
viewModel.requestWorkDetail("\(orderID)", "\(workId)") {[weak self] success, error in
guard let self = self else { return }
self.updateDataSource()
}
self.viewModel.requestWorkInfoProject(workExperienceID ?? "") {[weak self] success, error in
self.viewModel.requestWorkInfoProject("\(workId)") {[weak self] success, error in
guard let self = self else { return }
self.fileDataSource = self.viewModel.mainModel.file
self.updateDataSource()
......@@ -260,19 +260,18 @@ class YHWorkExperienceViewController: YHBaseViewController {
return
}
}
self.viewModel.saveWorkData(orderID, workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
self.viewModel.saveWorkData(orderID, workId: workId) {[weak self] success, error in
guard let self = self else { return }
bottom.nextButton.isEnabled = true
if let error = error {
YHHUD.flash(message: error.errorMsg )
} else {
self.workExperienceID = "\(self.viewModel.mainModel.word_id)"
self.stepView.currentIndex = self.stepView.currentIndex + 1
self.updateDataSource()
}
}
} else if self.stepView.currentIndex == 1 {
self.viewModel.saveWorkDuty(workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
self.viewModel.saveWorkDuty(workId: workId) {[weak self] success, error in
guard let self = self else { return }
bottom.nextButton.isEnabled = true
if let error = error {
......@@ -283,7 +282,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
}
}
} else if self.stepView.currentIndex == 2 {
self.viewModel.saveWorkHighlights(workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
self.viewModel.saveWorkHighlights(workId: workId) {[weak self] success, error in
guard let self = self else { return }
bottom.nextButton.isEnabled = true
if let error = error {
......@@ -294,7 +293,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
}
}
} else {
self.viewModel.saveWorkDetail(workId: workExperienceID?.intValue() ?? 0, callBackBlock: {[weak self] flag, error in
self.viewModel.saveWorkDetail(workId: workId, callBackBlock: {[weak self] flag, error in
guard let self = self else { return }
bottom.nextButton.isEnabled = true
if let error = error {
......@@ -320,18 +319,17 @@ class YHWorkExperienceViewController: YHBaseViewController {
bottom.saveBlock = { [weak self] in
guard let self = self else { return }
if self.stepView.currentIndex == 0 {
self.viewModel.saveWorkData(orderID, workId: workExperienceID?.intValue() ?? 0, 0) {[weak self] success, error in
self.viewModel.saveWorkData(orderID, workId: workId, 0) {[weak self] success, error in
guard let self = self else { return }
bottom.nextButton.isEnabled = true
if let error = error {
YHHUD.flash(message: error.errorMsg )
} else {
self.workExperienceID = "\(self.viewModel.mainModel.word_id)"
YHHUD.flash(message: "保存成功")
}
}
} else if self.stepView.currentIndex == 1 {
self.viewModel.saveWorkDuty(workId: workExperienceID?.intValue() ?? 0, 0) {[weak self] success, error in
self.viewModel.saveWorkDuty(workId: workId, 0) {[weak self] success, error in
guard let self = self else { return }
bottom.nextButton.isEnabled = true
if let error = error {
......@@ -341,7 +339,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
}
}
} else if self.stepView.currentIndex == 2 {
self.viewModel.saveWorkHighlights(workId: workExperienceID?.intValue() ?? 0, 0) {[weak self] success, error in
self.viewModel.saveWorkHighlights(workId: workId, 0) {[weak self] success, error in
guard let self = self else { return }
bottom.nextButton.isEnabled = true
if let error = error {
......@@ -352,7 +350,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
}
}
} else {
self.viewModel.saveWorkDetail(workId: workExperienceID?.intValue() ?? 0, callBackBlock: {[weak self] flag, error in
self.viewModel.saveWorkDetail(workId: workId, callBackBlock: {[weak self] flag, error in
guard let self = self else { return }
if let error = error {
YHHUD.flash(message: error.errorMsg )
......@@ -426,7 +424,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
self.view.endEditing(true)
if self.viewModel.isCanNext(self.stepView.currentIndex) {
if self.stepView.currentIndex == 1 {
self.viewModel.saveWorkDuty(workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
self.viewModel.saveWorkDuty(workId: workId) {[weak self] success, error in
guard let self = self else { return }
if let error = error {
YHHUD.flash(message: error.errorMsg )
......@@ -436,7 +434,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
}
}
} else if self.stepView.currentIndex == 2 {
self.viewModel.saveWorkHighlights(workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
self.viewModel.saveWorkHighlights(workId: workId) {[weak self] success, error in
guard let self = self else { return }
if let error = error {
YHHUD.flash(message: error.errorMsg )
......@@ -458,7 +456,10 @@ class YHWorkExperienceViewController: YHBaseViewController {
guard let self = self else { return }
self.viewModel?.requestDeleteWorkPosition(model, callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.getData()
self.viewModel.requestWorkPositionList("\(orderID)", "\(workId)") {[weak self] success, error in
guard let self = self else { return }
self.updateDataSource()
}
})
}
}
......@@ -792,7 +793,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
if indexPath.row == 0 {
let cell = tableView.dequeueReusableCell(withClass: YHWorkExperienceTableViewCell.self)
cell.orderId = orderID
cell.workId = workExperienceID?.intValue() ?? 0
cell.workId = workId
cell.selectDataSource = getTipsWithType()
cell.selectItem = getSelectCompany()
cell.dataSource = baseDataSource?[indexPath.row]
......@@ -840,7 +841,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
YHHUD.flash(message: "新增职位不能超过5条")
} else {
let vc = YHWorkExperiencePositionViewViewController()
vc.workID = workExperienceID?.intValue() ?? 0
vc.workID = workId
vc.orderID = orderID
self.navigationController?.pushViewController(vc, animated: true)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceCompanySelectView.swift
View file @ 08dc0d65
......@@ -263,7 +263,11 @@ class YHCompanySelectFileCell: UITableViewCell {
typealias SelectBlock = (_ select: YHWorkExperienceCompanyModel) -> ()
var selectBlock: SelectBlock?
var selectItem: [Int] = []
var selectItem: [Int] = [] {
didSet {
updateAllViews()
}
}
var centerView: UIView!
var titleLabel: UILabel!
var subTitleLabel: UILabel!
......@@ -271,22 +275,18 @@ class YHCompanySelectFileCell: UITableViewCell {
var model: YHWorkExperienceCompanyModel = YHWorkExperienceCompanyModel() {
didSet {
var i = 0
var temp = 5
for item in dataSource {
if item == model.company_location {
selectData = [i]
return
temp = i
}
i += 1
}
selectData = []
selectItem = [temp]
}
}
var dataSource: [String] = ["内地", "香港", "澳门", "境外"]
var selectData: [Int]? {
didSet {
updateAllViews()
}
}
var messageDataSource: [String] = ["公司是否为上市公司", "您目前是否拥有此公司10%以上股权", "您目前是否拥有此公司50%以上股权", "公司全年盈利达港币 500 万元或以上(或等值外币）", "请选择您的公司所在地："]
override func awakeFromNib() {
......@@ -415,12 +415,12 @@ class YHCompanySelectFileCell: UITableViewCell {
let agreeButton = {
let button = UIImageView()
button.image = UIImage(named: "login_privacy_disagree_glay")
button.image = UIImage(named: "service_privacy_disagree_glay")
button.tag = 10000 + i
if selectItem.contains(i) {
button.image = UIImage(named: "login_privacy_agree")
button.image = UIImage(named: "service_privacy_agree")
} else {
button.image = UIImage(named: "login_privacy_disagree_glay")
button.image = UIImage(named: "service_privacy_disagree_glay")
}
button.isUserInteractionEnabled = false
......@@ -479,12 +479,12 @@ class YHCompanySelectFileCell: UITableViewCell {
if selectItem.contains(i) {
bgviewButton.layer.borderWidth = 1
bgviewButton.backgroundColor = UIColor(hex: 0xebf0f9)
agreeButton.image = UIImage(named: "login_privacy_agree")
agreeButton.image = UIImage(named: "service_privacy_agree")
subTitleLabel.textColor = UIColor.mainTextColor
} else {
bgviewButton.layer.borderWidth = 0
bgviewButton.backgroundColor = UIColor.contentBkgColor
agreeButton.image = UIImage(named: "login_privacy_disagree_glay")
agreeButton.image = UIImage(named: "service_privacy_disagree_glay")
subTitleLabel.textColor = UIColor.mainTextColor
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperiencePositionReasonTableViewCell.swift
View file @ 08dc0d65
......@@ -147,12 +147,12 @@ class YHWorkExperiencePositionReasonTableViewCell: UITableViewCell {
let agreeButton = {
let button = UIImageView()
button.image = UIImage(named: "login_privacy_disagree_glay")
button.image = UIImage(named: "service_privacy_disagree_glay")
button.tag = 10000 + i
if selectItem.contains(i) {
button.image = UIImage(named: "login_privacy_agree")
button.image = UIImage(named: "service_privacy_agree")
} else {
button.image = UIImage(named: "login_privacy_disagree_glay")
button.image = UIImage(named: "service_privacy_disagree_glay")
}
button.isUserInteractionEnabled = false
......@@ -208,13 +208,13 @@ class YHWorkExperiencePositionReasonTableViewCell: UITableViewCell {
view?.layer.borderWidth = 1
view?.backgroundColor = UIColor(hex: 0xebf0f9)
let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
subview.image = UIImage(named: "login_privacy_agree")
subview.image = UIImage(named: "service_privacy_agree")
} else {
let view = mainItemView.viewWithTag(i + 20000)
view?.layer.borderWidth = 0
view?.backgroundColor = UIColor.contentBkgColor
let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
subview.image = UIImage(named: "login_privacy_disagree_glay")
subview.image = UIImage(named: "service_privacy_disagree_glay")
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceSelectView.swift
View file @ 08dc0d65
......@@ -103,12 +103,12 @@ class YHWorkExperienceSelectView: UIView {
let agreeButton = {
let button = UIImageView()
button.image = UIImage(named: "login_privacy_disagree_glay")
button.image = UIImage(named: "service_privacy_disagree_glay")
button.tag = 10000 + i
if selectItem.contains(i) {
button.image = UIImage(named: "login_privacy_agree")
button.image = UIImage(named: "service_privacy_agree")
} else {
button.image = UIImage(named: "login_privacy_disagree_glay")
button.image = UIImage(named: "service_privacy_disagree_glay")
}
button.isUserInteractionEnabled = false
......@@ -161,13 +161,13 @@ class YHWorkExperienceSelectView: UIView {
view?.layer.borderWidth = 1
view?.backgroundColor = UIColor(hex: 0xebf0f9)
let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
subview.image = UIImage(named: "login_privacy_agree")
subview.image = UIImage(named: "service_privacy_agree")
} else {
let view = mainItemView.viewWithTag(i + 20000)
view?.layer.borderWidth = 0
view?.backgroundColor = UIColor.contentBkgColor
let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
subview.image = UIImage(named: "login_privacy_disagree_glay")
subview.image = UIImage(named: "service_privacy_disagree_glay")
}
}
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_privacy_agree.imageset/Contents.json 0 → 100644
View file @ 08dc0d65
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "service_privacy_agree@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "service_privacy_agree@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_privacy_disagree_glay.imageset/Contents.json 0 → 100644
View file @ 08dc0d65
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "service_privacy_disagree_glay@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "service_privacy_disagree_glay@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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