Skip to content

G
galaxy-iOS
Commit efec0321 authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge commit '21c42c18' into davidhuang 

* commit '21c42c18':
  // 学位类型选择
  // 学历/专业资格填写
parents fbf2f726 21c42c18
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 35 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHFormPickerView.swift
View file @ efec0321
......@@ -228,6 +228,21 @@ class YHFormPickerView: UIView {
YHFormPickerViewItem(type: .professionCertificate(.CQF)),
YHFormPickerViewItem(type: .professionCertificate(.CIMA)),
YHFormPickerViewItem(type: .professionCertificate(.ACA))],
// 学位类型
.degreeCategory:
[YHFormPickerViewItem(type: .degreeCategory(.accountantOrFinance)),
YHFormPickerViewItem(type: .degreeCategory(.artOrLiterature)),
YHFormPickerViewItem(type: .degreeCategory(.businessManagement)),
YHFormPickerViewItem(type: .degreeCategory(.economics)),
YHFormPickerViewItem(type: .degreeCategory(.engineering)),
YHFormPickerViewItem(type: .degreeCategory(.electronicOrSoftwareEngineering)),
YHFormPickerViewItem(type: .degreeCategory(.laws)),
YHFormPickerViewItem(type: .degreeCategory(.lifeSciencesOrMedicine)),
YHFormPickerViewItem(type: .degreeCategory(.management)),
YHFormPickerViewItem(type: .degreeCategory(.NeoConfucianism)),
YHFormPickerViewItem(type: .degreeCategory(.socialScience)),
YHFormPickerViewItem(type: .degreeCategory(.others))],
]
}()
......@@ -386,6 +401,8 @@ class YHFormPickerView: UIView {
return "选择语言能力"
case .professionalSkill:
return "选择专业技能行业"
case .degreeCategory:
return "选择学位类型"
}
}
}
......@@ -623,6 +640,43 @@ extension YHFormPickerView {
} else if title.contains("英国皇家特许会计师") {
return .professionCertificate(.ACA)
}
case .degreeCategory:
if title == "会计/金融" {
return .degreeCategory(.accountantOrFinance)
} else if title == "艺术及人文/文学" {
return .degreeCategory(.artOrLiterature)
} else if title == "工商管理" {
return .degreeCategory(.businessManagement)
} else if title == "经济学" {
return .degreeCategory(.economics)
} else if title == "工程学" {
return .degreeCategory(.engineering)
} else if title == "咨询科技/电子及软件工程/数据科学" {
return .degreeCategory(.electronicOrSoftwareEngineering)
} else if title == "法律" {
return .degreeCategory(.laws)
} else if title == "生命科学及医学" {
return .degreeCategory(.lifeSciencesOrMedicine)
} else if title == "管理学" {
return .degreeCategory(.management)
} else if title == "理学" {
return .degreeCategory(.NeoConfucianism)
} else if title == "社会科学" {
return .degreeCategory(.socialScience)
} else if title == "其他" {
return .degreeCategory(.others)
}
case .language:
return .none
case .professionalSkill:
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHFormPickerViewType.swift
View file @ efec0321
......@@ -37,6 +37,8 @@ enum YHFormPickerViewType: Int {
case language
// 专业技能行业
case professionalSkill
// 学位类型
case degreeCategory
}
enum YHPickerViewMarriageType: Int {
......@@ -191,6 +193,34 @@ enum YHPickerViewProfessionalCertificateType:Int {
case ACA
}
enum YHPickerViewDegreedegreeCategoryType:Int {
// 会计/金融
case accountantOrFinance
// 艺术及人文/文学
case artOrLiterature
// 工商管理
case businessManagement
// 经济学
case economics
// 工程学
case engineering
// 咨询科技/电子及软件工程/数据科学
case electronicOrSoftwareEngineering
// 法律
case laws
// 生命科学及医学
case lifeSciencesOrMedicine
// 管理学
case management
// 理学
case NeoConfucianism
// 社会科学
case socialScience
// 其他
case others
}
enum YHFormPickerViewSubType {
case none
......@@ -205,6 +235,7 @@ enum YHFormPickerViewSubType {
case degreeLocation(YHPickerViewDegreeLocationType)
case profession(YHPicerViewProfessionType)
case professionCertificate(YHPickerViewProfessionalCertificateType)
case degreeCategory(YHPickerViewDegreedegreeCategoryType)
var title:String {
switch self {
......@@ -315,31 +346,57 @@ enum YHFormPickerViewSubType {
return "其他".local
case .professionCertificate(.CFA):
return "CFA(注册金融分析师)"
return "CFA(注册金融分析师)".local
case .professionCertificate(.CFP):
return "CFP(CFP证书是目前世界上权威的权威理财顾问认证项目之一)"
return "CFP(CFP证书是目前世界上权威的权威理财顾问认证项目之一)".local
case .professionCertificate(.FRM):
return "FRM(金融风险管理师)"
return "FRM(金融风险管理师)".local
case .professionCertificate(.FIA):
return "FIA(保险精算师)"
return "FIA(保险精算师)".local
case .professionCertificate(.CPA):
return "CPA(注册会计师)"
return "CPA(注册会计师)".local
case .professionCertificate(.CIIA):
return "CIIA(注册国际投资分析师)"
return "CIIA(注册国际投资分析师)".local
case .professionCertificate(.RFC):
return "RFC(财务顾问师)"
return "RFC(财务顾问师)".local
case .professionCertificate(.ACCA):
return "ACCA(特许公认会计师)"
return "ACCA(特许公认会计师)".local
case .professionCertificate(.CIA):
return "CIA(国际注册内部审计师)"
return "CIA(国际注册内部审计师)".local
case .professionCertificate(.CMA):
return "CMA(美国管理会计师)"
return "CMA(美国管理会计师)".local
case .professionCertificate(.CQF):
return "CQF(国际数量金融工程认证)"
return "CQF(国际数量金融工程认证)".local
case .professionCertificate(.CIMA):
return "CIMA(管理会计师考试)"
return "CIMA(管理会计师考试)".local
case .professionCertificate(.ACA):
return "The Associate Chartered Accountant(英国皇家特许会计师)"
return "The Associate Chartered Accountant(英国皇家特许会计师)".local
case .degreeCategory(.accountantOrFinance):
return "会计/金融".local
case .degreeCategory(.artOrLiterature):
return "艺术及人文/文学".local
case .degreeCategory(.businessManagement):
return "工商管理".local
case .degreeCategory(.economics):
return "经济学".local
case .degreeCategory(.engineering):
return "工程学".local
case .degreeCategory(.electronicOrSoftwareEngineering):
return "咨询科技/电子及软件工程/数据科学".local
case .degreeCategory(.laws):
return "法律".local
case .degreeCategory(.lifeSciencesOrMedicine):
return "生命科学及医学".local
case .degreeCategory(.management):
return "管理学".local
case .degreeCategory(.NeoConfucianism):
return "理学".local
case .degreeCategory(.socialScience):
return "社会科学".local
case .degreeCategory(.others):
return "其他".local
}
}
......@@ -479,6 +536,31 @@ enum YHFormPickerViewSubType {
case .professionCertificate(.ACA):
return 13
case .degreeCategory(.accountantOrFinance):
return 0
case .degreeCategory(.artOrLiterature):
return 1
case .degreeCategory(.businessManagement):
return 2
case .degreeCategory(.economics):
return 3
case .degreeCategory(.engineering):
return 4
case .degreeCategory(.electronicOrSoftwareEngineering):
return 5
case .degreeCategory(.laws):
return 6
case .degreeCategory(.lifeSciencesOrMedicine):
return 7
case .degreeCategory(.management):
return 8
case .degreeCategory(.NeoConfucianism):
return 9
case .degreeCategory(.socialScience):
return 10
case .degreeCategory(.others):
return 11
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemEnterDetailCell.swift
View file @ efec0321
......@@ -115,25 +115,27 @@ class YHFormItemEnterDetailCell: UITableViewCell {
titleLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(16)
make.left.equalToSuperview().offset(horizonalGap)
make.right.equalTo(detailLabel.snp.left).offset(-8)
make.centerY.equalToSuperview()
make.bottom.equalTo(bottomLine.snp.top).offset(-16)
}
detailLabel.snp.makeConstraints { make in
make.right.equalTo(arrowImgView.snp.left)
make.centerY.equalToSuperview()
make.width.equalTo(110.0)
make.top.equalTo(titleLabel)
}
arrowImgView.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(20, 20))
make.right.equalToSuperview().offset(-horizonalGap)
make.centerY.equalToSuperview()
make.centerY.equalTo(detailLabel)
}
deleteButton.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(64, 40))
make.centerY.equalToSuperview()
make.centerY.equalTo(detailLabel)
make.right.equalToSuperview()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/C/YHEducationInfoListVC.swift
View file @ efec0321
......@@ -309,6 +309,7 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
if eduInfo.vacantNum > 0 { // 有未填项
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
cell.isShowBottomLine = (indexPath.row != eduList.count)
if let college = eduInfo.college, !college.isEmpty {
cell.title = eduInfo.college
} else {
......@@ -353,6 +354,7 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
// 第一行是标题
let quaInfo:YHQualificationInfo = quaList[indexPath.row-1]
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
cell.isShowBottomLine = (indexPath.row != quaList.count)
cell.title = "证书标题"
if let qualification = quaInfo.qualification, !qualification.isEmpty {
cell.title = qualification
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/C/YHQualificationDetailVC.swift
View file @ efec0321
......@@ -101,7 +101,7 @@ class YHQualificationDetailVC: YHBaseViewController {
items.removeAll()
let title0 = YHFormTitleItem(type: .mainApplicantEducation)
let title0 = YHFormTitleItem(type: .mainApplicantProfessionalQualification)
let item00 = YHFormDetailItem(type: .qualificationCertificateName)
item00.placeHolder = "请选择资格证书名称".local
item00.tips = "请选择资格证书名称".local
......@@ -396,7 +396,7 @@ extension YHQualificationDetailVC {
}
}
// 保存数据 isNeedPop：保存成功后是否需要
// 保存数据 isNeedPop：保存成功后是否需要退出该页面
func saveDetailInfo(isNeedPop:Bool) {
var dict:[String : Any] = [:]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/M/YHEducationInfo.swift
View file @ efec0321
......@@ -82,25 +82,25 @@ class YHEducationDetailInfo: SmartCodable {
var id: Int = 0
var orderId: Int = 0
var college: String?
var college: String = ""
var isTop: Int = 0
var type: String?
var admissionTime: String?
var graduateTime: String?
var background: String?
var professional: String?
var degreeType: String?
var remark: String?
var average: String?
var schoolAddress: YHCollegeAddress?
var type: String = ""
var admissionTime: String = ""
var graduateTime: String = ""
var background: String = ""
var professional: String = ""
var degreeType: String = ""
var remark: String = ""
var average: String = ""
var schoolAddress: YHCollegeAddress = YHCollegeAddress()
var schoolAddressAboard: Int = 0
var oldId: Int = 0
var createdAt: String?
var updatedAt: String?
var deletedAt: SmartAny?
var createdAt: String = ""
var updatedAt: String = ""
var deletedAt: String = ""
var isShow: Int = 0
var operatorName: SmartAny?
var operatorEnglishName: SmartAny?
var operatorName: String = ""
var operatorEnglishName: String = ""
var operatorId: Int = 0
var matchListing: Int = 0
var createFromAppid: Int = 0
......@@ -141,7 +141,6 @@ class YHEducationDetailInfo: SmartCodable {
}
// 学校是否在国外 默认是在国内
func isSchoolInAboard() -> Bool {
guard let schoolAddress = schoolAddress else { return false }
if schoolAddress.country.isEmpty { return false }
if schoolAddress.country.contains("中国") {
return false
......
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