Skip to content

G
galaxy-iOS
Commit 1fba8749 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 高才

parent aebd7808
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 82 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHGCPreviewViewModel.swift
View file @ 1fba8749
...@@ -40,7 +40,7 @@ class YHGCPreviewViewModel: YHBaseViewModel { ...@@ -40,7 +40,7 @@ class YHGCPreviewViewModel: YHBaseViewModel {
var arrDataForOtherInfo : [YHPreviewInfoSessionModel] = [] var arrDataForOtherInfo : [YHPreviewInfoSessionModel] = []
//基本资料 预览 //基本资料 预览
private var basiceInfoPreviewModel : YHBasicInfoFillModel? private var basiceInfoPreviewModel : YHGCBasicInfoFillModel?
var arrDataForBasicInfo : [YHPreviewInfoSessionModel] = [] var arrDataForBasicInfo : [YHPreviewInfoSessionModel] = []
} }
...@@ -181,30 +181,30 @@ extension YHGCPreviewViewModel { ...@@ -181,30 +181,30 @@ extension YHGCPreviewViewModel {
//获取基本资料预览 数据 //获取基本资料预览 数据
func getPreviewForBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) { func getPreviewForBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Preview.previewBasicInfoApi
let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.GCBasics.basicInfoApi
//1. json字符串 转 对象
_ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, _ in
// 1. json字符串 转 对象
guard let self = self else { return } guard let self = self else { return }
printLog("model 是 ==> \(json)") printLog("model 是 ==> \(json)")
if json.code == 200 { if json.code == 200 {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHBasicInfoFillModel.deserialize(from: dic) else { guard let dic = json.data?.peel as? [String: Any], let resultModel = YHGCBasicInfoFillModel.deserialize(from: dic) else {
callBackBlock(false,nil) callBackBlock(false, nil)
return return
} }
self.basiceInfoPreviewModel = resultModel self.basiceInfoPreviewModel = resultModel
//根据返回值 组装 真实的数据 // 根据返回值 组装 真实的数据
installDataForBasicInfo() callBackBlock(true, nil)
callBackBlock(true,nil)
} else { } else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg) let error: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
callBackBlock(false,error) callBackBlock(false, error)
} }
} failBlock: { err in } failBlock: { err in
callBackBlock(false,err) callBackBlock(false, err)
} }
} }
...@@ -756,30 +756,16 @@ private extension YHGCPreviewViewModel { ...@@ -756,30 +756,16 @@ private extension YHGCPreviewViewModel {
do { do {
//主申请人 //主申请人
if let model = basiceInfoPreviewModel?.applicant { if let model = basiceInfoPreviewModel?.applicant {
let answer0 = model.has_conviction?.has == "Y" ? "是" : "否" let answer0 = model.deny == 1 ? "是" : "否"
let remark0 = answer0 == "是" ? (model.has_conviction?.info ?? "") : nil let remark0 = answer0 == "是" ? (model.denyContent) : nil
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、是否曾在香港或其他地方因任何罪行或违法行为被被定罪：", answer: answer0,remark: remark0) let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、是否曾被拒绝签发签证或入境香港，或被遣返、遣送和要求离开香港？", answer: answer0, remark: remark0)
let answer1 = model.has_departure?.has == "Y" ? "是" : "否"
let remark1 = answer1 == "是" ? (model.has_departure?.info ?? "") : nil
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、是否曾在香港或其他地方被拒入境/递解/遣送或要求离境？", answer: answer1,remark: remark1)
let answer1 = model.crime == 1 ? "是" : "否"
let remark1 = answer1 == "是" ? model.crimeContent : nil
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、是否曾因任何罪行或违法行为在香港或其他地方被定罪？", answer: answer1, remark: remark1)
let answer2 = model.has_deny?.has == "Y" ? "是" : "否" let arr = [tmp0, tmp1]
let remark2 = answer2 == "是" ? (model.has_deny?.info ?? "") : nil
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "3、是否曾被拒绝签发香港或其他地方的签证/进入许可？", answer: answer2,remark: remark2)
let answer3 = model.has_breaking_law?.has == "Y" ? "是" : "否"
let remark3 = answer3 == "是" ? (model.has_breaking_law?.info ?? "") : nil
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "4、是否曾触犯香港或任何地方的入境法例？", answer: answer3,remark:remark3)
let answer4 = model.has_other_id?.has == "Y" ? "是" : "否"
let remark4 = answer4 == "是" ? (model.has_other_id?.info ?? "") : nil
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "5、是否曾经使用另一个姓名或身份申请香港入境签证/进入许可或进入香港？", answer: answer4,remark: remark4)
let arr = [tmp0,tmp1,tmp2,tmp3,tmp4]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "主申请人", cellData0: arr) let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "主申请人", cellData0: arr)
arrDataForBasicInfo.append(model1) arrDataForBasicInfo.append(model1)
} }
...@@ -789,14 +775,16 @@ private extension YHGCPreviewViewModel { ...@@ -789,14 +775,16 @@ private extension YHGCPreviewViewModel {
do { do {
//配偶 //配偶
if let model = basiceInfoPreviewModel?.spouse { if let model = basiceInfoPreviewModel?.spouse {
let answer0 = model.child_departure?.has == "Y" ? "是" : "否" let answer0 = model.deny == 1 ? "是" : "否"
let remark0 = answer0 == "是" ? (model.child_departure?.info ?? "") : nil let remark0 = answer0 == "是" ? (model.denyContent) : nil
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港？", answer: answer0,remark:remark0) let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、是否曾被拒绝签发签证或入境香港，或被遣返、遣送和要求离开香港？", answer: answer0, remark: remark0)
let answer1 = model.child_deny?.has == "Y" ? "是" : "否"
let remark1 = answer1 == "是" ? (model.child_deny?.info ?? "") : nil let answer1 = model.crime == 1 ? "是" : "否"
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、是否曾被拒绝签发签证/进入许可以入境香港？", answer: answer1,remark: remark1) let remark1 = answer1 == "是" ? model.crimeContent : nil
let arr = [tmp0,tmp1] let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、是否曾因任何罪行或违法行为在香港或其他地方被定罪？", answer: answer1, remark: remark1)
let arr = [tmp0, tmp1]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "配偶", cellData0: arr) let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "配偶", cellData0: arr)
arrDataForBasicInfo.append(model1) arrDataForBasicInfo.append(model1)
} }
...@@ -806,52 +794,49 @@ private extension YHGCPreviewViewModel { ...@@ -806,52 +794,49 @@ private extension YHGCPreviewViewModel {
//子女 - xxx //子女 - xxx
if let arrChild = basiceInfoPreviewModel?.child { if let arrChild = basiceInfoPreviewModel?.child {
for (_,model) in arrChild.enumerated() { for (_,model) in arrChild.enumerated() {
let answer0 = model.child_departure?.has == "Y" ? "是" : "否" let answer0 = model.deny == 1 ? "是" : "否"
let remark0 = answer0 == "是" ? (model.child_departure?.info ?? "") : nil let remark0 = answer0 == "是" ? (model.denyContent) : nil
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、是否曾被拒绝签发签证或入境香港，或被遣返、遣送和要求离开香港？", answer: answer0, remark: remark0)
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港？", answer: answer0,remark:remark0)
let answer1 = model.child_deny?.has == "Y" ? "是" : "否" let answer1 = model.crime == 1 ? "是" : "否"
let remark1 = answer1 == "是" ? (model.child_deny?.info ?? "") : nil let remark1 = answer1 == "是" ? model.crimeContent : nil
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、是否曾被拒绝签发签证/进入许可以入境香港？", answer: answer1,remark: remark1) let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、是否曾因任何罪行或违法行为在香港或其他地方被定罪？", answer: answer1, remark: remark1)
let arr = [tmp0,tmp1]
let arr = [tmp0, tmp1]
let title = "子女" + "-" + model.subset_name let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "子女(\(model.name)", cellData0: arr)
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: title, cellData0: arr)
arrDataForBasicInfo.append(model1) arrDataForBasicInfo.append(model1)
} }
} }
} }
do { // do {
//家庭背景 // //家庭背景
if let model = basiceInfoPreviewModel?.background { // if let model = basiceInfoPreviewModel?.background {
let answer0 = model.background_member?.has == "Y" ? "满足" : "不满足" // let answer0 = model.background_member?.has == "Y" ? "满足" : "不满足"
//
var msg = "" // var msg = ""
if answer0.contains("满足") { // if answer0.contains("满足") {
if let str = model.background_member?.info,str.isEmpty == false { // if let str = model.background_member?.info,str.isEmpty == false {
if model.subset.isEmpty == false { // if model.subset.isEmpty == false {
for item in model.subset { // for item in model.subset {
let ttt = String(item.id) // let ttt = String(item.id)
if ttt.contains(str) { // if ttt.contains(str) {
msg = item.subset_name // msg = item.subset_name
break // break
} // }
} // }
} // }
} // }
msg = msg.defaultStringIfEmpty() // msg = msg.defaultStringIfEmpty()
} // }
let remark0 = answer0 == "满足" ? msg : nil // let remark0 = answer0 == "满足" ? msg : nil
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、至少一名直系家庭成员（已婚配偶、父母、兄弟姐妹、子女）是现居于香港的香港永久性居民", answer:answer0,remark: remark0) // let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、至少一名直系家庭成员（已婚配偶、父母、兄弟姐妹、子女）是现居于香港的香港永久性居民", answer:answer0,remark: remark0)
let arr = [tmp0] // let arr = [tmp0]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "家庭背景", cellData0: arr) // let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "家庭背景", cellData0: arr)
arrDataForBasicInfo.append(model1) // arrDataForBasicInfo.append(model1)
} // }
} // }
} }
//组装 其他信息预览 数据 //组装 其他信息预览 数据
......
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