Skip to content

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

其他信息 预览

parent 40479e41
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 43 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift
View file @ 9740701d
......@@ -305,7 +305,7 @@ extension YHOtherInfoFillViewModel {
let arrTTT = item.second_select.split(separator: ",")
if arrTTT.count > 0 {
let tmpId : Int = Int(arrTTT[0]) ?? 0
for (iii,ttt) in tt.options.enumerated() {
for (_,ttt) in tt.options.enumerated() {
if tmpId == ttt.id {
ttt.select = true
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewMainViewController.swift
View file @ 9740701d
......@@ -124,9 +124,9 @@ extension YHPreviewMainViewController {
}
self.nameLable.text = title
self.phoneLable.text = self.previewVM.mainApplicationInfoPreviewModel?.mobile ?? "-"
self.handleHeaderIcon()
// self.phoneLable.text = self.previewVM.mainApplicationInfoPreviewModel?.mobile ?? "-"
self.phoneLable.text = "优才计划"
// self.handleHeaderIcon()
} else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/M/YHPreviewForOtherInfoModel.swift
View file @ 9740701d
......@@ -14,4 +14,12 @@ struct YHPreviewForOtherInfoModel: SmartCodable {
var language: LanguageDetail?
var profession: Profession?
var question: Question?
var language_detail_new : [LanguageDetailNew] = []
var language_detail_new_local : [YHPreviewQuestionModel] = [] //本地使用
}
struct YHPreviewQuestionModel: SmartCodable {
var question : String = ""
var answer : String = ""
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 9740701d
......@@ -677,42 +677,56 @@ private extension YHPreviewViewModel {
handleDataForOtherInfo()
do {
if let arr1 = model.list,arr1.isEmpty == false {
var arr : [YHPersonInfoCellModel1] = []
for (index,item) in arr1.enumerated() {
//居住信息
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "开始时间：", answer: item.start_time)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "结束时间：", answer: item.end_time)
let addationIndex = arr1.count > 1 ? String(index + 1) : ""
let title = "国家" + addationIndex + ":" + item.country
let model0 = YHPersonInfoCellModel1(cellTitle: title, cellData: [tmp0,tmp1])
arr.append(model0)
}
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "居住信息", cellData1: arr)
arrDataForOtherInfo.append(model3)
}
}
// do {
//
// if let arr1 = model.list,arr1.isEmpty == false {
// var arr : [YHPersonInfoCellModel1] = []
// for (index,item) in arr1.enumerated() {
//
// //居住信息
// let tmp0 = YHPreviewQuestionAndAnswerModel(question: "开始时间：", answer: item.start_time)
// let tmp1 = YHPreviewQuestionAndAnswerModel(question: "结束时间：", answer: item.end_time)
//
//
// let addationIndex = arr1.count > 1 ? String(index + 1) : ""
// let title = "国家" + addationIndex + ":" + item.country
// let model0 = YHPersonInfoCellModel1(cellTitle: title, cellData: [tmp0,tmp1])
//
// arr.append(model0)
// }
//
// let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "居住信息", cellData1: arr)
// arrDataForOtherInfo.append(model3)
// }
// }
do {
//语言能力
if let model = otherInfoPreviewModel?.language {
var title = ""
if model.level == 4 {
title = model.name.defaultStringIfEmpty() + "\n" + model.remark.defaultStringIfEmpty()
// if let model = otherInfoPreviewModel?.language {
// var title = ""
// if model.level == 4 {
// title = model.name.defaultStringIfEmpty() + "\n" + model.remark.defaultStringIfEmpty()
// }
// let tmp0 = YHPreviewQuestionAndAnswerModel(question: model.levelDes, answer: model.localRemark,remark: title)
// let arr = [tmp0]
// let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "语言能力", cellData0: arr)
// arrDataForOtherInfo.append(model1)
//
// }
//语言能力
if let arr = otherInfoPreviewModel?.language_detail_new_local,arr.count > 0 {
var arrT : [YHPreviewQuestionAndAnswerModel] = []
for (index,item) in arr.enumerated() {
let tmp0 = YHPreviewQuestionAndAnswerModel(question: item.question, answer: item.answer,remark: "")
arrT.append(tmp0)
}
let tmp0 = YHPreviewQuestionAndAnswerModel(question: model.levelDes, answer: model.localRemark,remark: title)
let arr = [tmp0]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "语言能力", cellData0: arr)
arrDataForOtherInfo.append(model1)
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "语言能力", cellData0: arrT)
arrDataForOtherInfo.append(model1)
}
}
......@@ -748,18 +762,84 @@ private extension YHPreviewViewModel {
private extension YHPreviewViewModel {
//特殊处理 其他信息预览 需要的数据
func handleDataForOtherInfo() {
if let language = otherInfoPreviewModel?.language {
if language.level > 0 {
let target = String(language.level)
for(_,item) in YHConstantArrayData.arrLanguage.enumerated() {
if target == item["id"] {
language.levelDes = item["title"] ?? "--"
language.localRemark = item["dec"] ?? "--"
break
// if let language = otherInfoPreviewModel?.language {
// if language.level > 0 {
// let target = String(language.level)
// for(_,item) in YHConstantArrayData.arrLanguage.enumerated() {
//
// if target == item["id"] {
// language.levelDes = item["title"] ?? "--"
// language.localRemark = item["dec"] ?? "--"
// break
// }
// }
// }
// }
if let language = otherInfoPreviewModel?.language_detail_new {
if language.count > 0 {
if let arrCompare = [LanguageDetailModel].deserialize(from: YHOtherInfoFillViewModel.languageJsonData),arrCompare.count > 0 {
var arrO : [YHPreviewQuestionModel] = []
for(index,item) in language.enumerated() {
let firstID : Int = item.first_select
var secondID : Int = 0
var firstName : String = ""
var secondName : String = ""
if !item.second_select.isEmpty {
let arrTTT = item.second_select.split(separator: ",")
if arrTTT.count > 0 {
secondID = Int(arrTTT[0]) ?? 0
} else {
secondID = 0
}
} else {
secondID = 0
}
var findFirstFlag : Bool = false
for(i,t) in arrCompare.enumerated() {
if t.id == firstID {
firstName = t.name + (t.other_instructions.isEmpty ? "" : ("=" + t.other_instructions))
findFirstFlag = true
var findSecondFlag : Bool = false
for(ii,tt) in t.options.enumerated() {
if tt.id == secondID {
secondName = tt.name
findSecondFlag = true
}
}
if !findSecondFlag {
secondName = "--"
}
}
}
if !findFirstFlag {
firstName = "--"
}
var question : YHPreviewQuestionModel = YHPreviewQuestionModel()
question.question = firstName
question.answer = secondName
arrO.append(question)
}
otherInfoPreviewModel?.language_detail_new_local = arrO
} else {
otherInfoPreviewModel?.language_detail_new_local = []
}
} else {
otherInfoPreviewModel?.language_detail_new_local = []
}
} else {
otherInfoPreviewModel?.language_detail_new_local = []
}
......
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