Commit 97b1cbbb authored by David黄金龙's avatar David黄金龙

满足 情况下的 逻辑修改

parent 08454c94
...@@ -172,7 +172,7 @@ extension YHOtherSelecteItemView { ...@@ -172,7 +172,7 @@ extension YHOtherSelecteItemView {
block?(true,"至今") block?(true,"至今")
textField.placeholder = "" textField.placeholder = ""
} else { } else {
block?(false,"")//for test hjl block?(false,"")
textField.placeholder = "请选择" textField.placeholder = "请选择"
} }
} }
......
...@@ -656,8 +656,23 @@ private extension YHPreviewViewModel { ...@@ -656,8 +656,23 @@ private extension YHPreviewViewModel {
//家庭背景 //家庭背景
if let model = basiceInfoPreviewModel?.background { if let model = basiceInfoPreviewModel?.background {
let answer0 = model.background_member?.has == "Y" ? "满足" : "不满足" let answer0 = model.background_member?.has == "Y" ? "满足" : "不满足"
let remark0 = answer0 == "满足" ? (model.background_member?.info ?? "") : nil
var msg = ""
if answer0.contains("满足") {
if let str = model.background_member?.info,str.isEmpty == false {
if model.subset.isEmpty == false {
for item in model.subset {
let ttt = String(item.id)
if ttt.contains(str) {
msg = item.subset_name
break
}
}
}
}
msg = msg.defaultStringIfEmpty()
}
let remark0 = answer0 == "满足" ? msg : nil
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、至少一名直系家庭成员(已婚配偶、父母、兄弟姐妹、子女)是现居于香港的香港永久性居民", answer:answer0,remark: remark0) //需要完善 for test hjl todo??? let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、至少一名直系家庭成员(已婚配偶、父母、兄弟姐妹、子女)是现居于香港的香港永久性居民", answer:answer0,remark: remark0) //需要完善 for test hjl todo???
let arr = [tmp0] let arr = [tmp0]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "家庭背景", cellData0: arr) let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "家庭背景", cellData0: arr)
......
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