Commit 6b2e7dd5 authored by Steven杜宇's avatar Steven杜宇

// 修改字段

parent 8493e7a2
...@@ -667,7 +667,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -667,7 +667,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
// 是否与主申请人同住 1:是 0:否 // 是否与主申请人同住 1:是 0:否
var nows: Int = 0 var nows: Int = 0
// 是否拥有现时定居国家/地区的永久居留身份 0:否 1:是 2没有选择 // 是否拥有现时定居国家/地区的永久居留身份 0:否 1:是 2没有选择
var isCurrentlyOverseas: Int = 2 var havePermanentResidency: Int = 2
// 海外居留开始时间 // 海外居留开始时间
var residenceTime: String = "" var residenceTime: String = ""
// 是否办理过港澳通行证 1:是 0:否 // 是否办理过港澳通行证 1:是 0:否
...@@ -755,7 +755,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -755,7 +755,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
case isHkHandled = "is_hk_handled" case isHkHandled = "is_hk_handled"
case isInHk = "is_in_hk" case isInHk = "is_in_hk"
case isLiveOverseaYear = "is_live_oversea_year" case isLiveOverseaYear = "is_live_oversea_year"
case isCurrentlyOverseas = "is_currently_overseas" case havePermanentResidency = "have_permanent_residency"
case residenceTime = "residence_time" case residenceTime = "residence_time"
case surname = "surname" case surname = "surname"
} }
...@@ -798,17 +798,17 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -798,17 +798,17 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
// 是否拥有现时定居国家/地区的永久居留身份 nil表示未选 // 是否拥有现时定居国家/地区的永久居留身份 nil表示未选
func isHavePermanentResidenceStatus() -> Bool? { func isHavePermanentResidenceStatus() -> Bool? {
if self.isCurrentlyOverseas == 1 { if self.havePermanentResidency == 1 {
return true return true
} else if self.isCurrentlyOverseas == 0 { } else if self.havePermanentResidency == 0 {
return false return false
} }
return nil return nil
} }
func setHavePermanentResidenceStatus(_ value: Bool) { func setHavePermanentResidenceStatus(_ value: Bool) {
return self.isCurrentlyOverseas = value ? 1 : 0 return self.havePermanentResidency = value ? 1 : 0
} }
// 是否在海外居住满1年及以上 // 是否在海外居住满1年及以上
......
...@@ -75,7 +75,7 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -75,7 +75,7 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
// 居住信息 // 居住信息
let title2 = YHFormTitleItem(type: .liveInfo) let title2 = YHFormTitleItem(type: .liveInfo)
let item20 = YHFormDetailItem(type: .isLiveTother, value:String(child.isLiveTother())) let item20 = YHFormDetailItem(type: .isLiveTother, value:String(child.isLiveTother()))
let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(child.isCurrentlyOverseas)) let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(child.havePermanentResidency))
item21.tips = "请选择" item21.tips = "请选择"
var arr2: [YHFormItemProtocol] = [title2, item20, item21] var arr2: [YHFormItemProtocol] = [title2, item20, item21]
......
...@@ -81,7 +81,7 @@ class YHGCSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -81,7 +81,7 @@ class YHGCSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
let item20 = YHFormDetailItem(type:.isLiveTother, value:String(spouse.isLiveTother())) let item20 = YHFormDetailItem(type:.isLiveTother, value:String(spouse.isLiveTother()))
arr2.append(item20) arr2.append(item20)
let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(spouse.isCurrentlyOverseas)) let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(spouse.havePermanentResidency))
item21.tips = "请选择" item21.tips = "请选择"
arr2.append(item21) arr2.append(item21)
......
...@@ -251,7 +251,7 @@ extension YHGCFamilyMemberInfoListVC { ...@@ -251,7 +251,7 @@ extension YHGCFamilyMemberInfoListVC {
"next":false, "next":false,
"info":["subset_name":"", "info":["subset_name":"",
"not_fill_number":-1, "not_fill_number":-1,
"is_currently_overseas":2, "have_permanent_residency":2,
"follow":0]] "follow":0]]
self.familyRequest.addOrSaveFamilyMember(params: dict) { [weak self] success, error in self.familyRequest.addOrSaveFamilyMember(params: dict) { [weak self] success, error in
......
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