// 家庭成员

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -583,334 +583,27 @@ enum YHFamilyMemberType: Int {
     case brother = 5
 }
 
-//class YHFamilyMember: SmartCodable, YHFormItemProtocol {
-//    
-//    var id: Int = 0
-//    // 是否已故
-//    var deceased: Int = 0
-//    // 主申请人和现配偶是否拥有孩子抚养权
-//    var custody: Int = 0
-//    // 国籍
-//    var nationality: String?
-//    var orderId: Int = 0
-//    // 关系 1父亲  2母亲 3配偶 4子女 5兄弟姐妹
-//    var relation: String?
-//    // 是否拥有学位
-//    var hasDegree: String?
-//    // 学历数组
-//    var hasDegreeJson: [YHHasDegreeJson]?
-//    
-//    // 是否随行至香港
-//    var follow: Int = 0
-//    var statement: Int = 0
-//    // 姓名
-//    var subsetName: String?
-//    
-//    // mark any
-////    var subsetNamePinyin: YHSubsetNamePinyin?
-//    var subsetNamePinyin: SmartAny?
-//    // 曾用名
-//    var usedName: String?
-//    // 出生日期
-//    var birthday: String?
-//    // 出生国家地区 (国内/国外)
-//    var birthPlaceAboard: Int = 0
-//    
-//    // 出生地址信息
-//    var birthPlace: YHAddress?
-//    
-//    // 职业
-//    var occupation: String?
-//    // 职业名称
-//    var occupationName: String?
-//    
-//    // mark any
-//    var operatorAme: SmartAny?
-//    // 香港身份证号
-//    var hkIdentityCard: String?
-//    // 性别 男：1 女：2
-//    var sex: Int = 0
-//    // 婚姻状况
-//    var married: String?
-//    // 是否与主申请人同住
-//    var nows: Int = 0
-//    // 居住地址
-//    var address: YHAddress?
-//    
-//    // 香港身份证信息
-//    var childHasHkId: YHChildStepchildClass?
-//    // 是否前次婚姻子女
-//    var childStepchild: YHChildStepchildClass?
-//    // 在港信息
-//    var childInHk: YHChildStepchildClass?
-//    // 证件数组 (中国身份证、香港身份证、护照等)
-//    var certificates: YHCertificates?
-//
-//    // mark any
-//    var countryIdentity: SmartAny?
-//    
-//    // 在港身份
-//    var hkIdentity: String?
-//    var hkIdentityOther: String?
-//    // 现居住国家
-//    var liveCountry: String?
-//    // 是否要办理港澳通行证
-//    var isHandled: Int = 0
-//    var finishFollow: Int = 0
-//    var step: Int = 0
-//    // 未填写项数
-//    var notFillNum: Int = 0
-//    // 是否在海外居住满1年及以上
-//    var isLiveOverseaYear: Int = 0
-//    // 婚前姓氏
-//    var surname: String?
-//    
-//    enum CodingKeys: String, CodingKey {
-//        case id = "id"
-//        case deceased = "deceased"
-//        case custody = "custody"
-//        case nationality = "nationality"
-//        case orderId = "order_id"
-//        case relation = "relation"
-//        case hasDegree = "has_degree"
-//        case hasDegreeJson = "has_degree_json"
-//        case follow = "follow"
-//        case statement = "statement"
-//        case subsetName = "subset_name"
-//        case subsetNamePinyin = "subset_name_pinyin"
-//        case usedName = "used_name"
-//        case birthday = "birthday"
-//        case birthPlaceAboard = "birth_place_aboard"
-//        case birthPlace = "birth_place"
-//        case occupation = "occupation"
-//        case occupationName = "occupation_name"
-//        case operatorAme = "operator_ame"
-//        case childHasHkId = "child_has_hk_id"
-//        case hkIdentityCard = "hk_identity_card"
-//        case sex = "sex"
-//        case married = "married"
-//        case nows = "nows"
-//        case address = "address"
-//        case childStepchild = "child_stepchild"
-//        case childInHk = "child_in_hk"
-//        case countryIdentity = "country_identity"
-//        case hkIdentity = "hk_identity"
-//        case hkIdentityOther = "hk_identity_other"
-//        case liveCountry = "live_country"
-//        case isHandled = "is_handled"
-//        case finishFollow = "finish_follow"
-//        case step = "step"
-//        case notFillNum = "not_fill_num"
-//        case isLiveOverseaYear = "is_live_oversea_year"
-//        case surname = "surname"
-//        case certificates = "certificates"
-//    }
-//    
-//    required init() {
-//        
-//    }
-//    
-//    // 是否随行
-//    func isFollow() -> Bool {
-//        return follow == 1
-//    }
-//    
-//    func setFollow(_ value:Bool) {
-//        self.follow = (value ? 1 : 0)
-//    }
-//    
-//    // 是否要办理港澳通行证
-//    func isNeedHandleHKPassPort() -> Bool {
-//        return  self.isHandled == 1
-//    }
-//    
-//    func setNeedHandleHKPassPort(_ value:Bool) {
-//        self.isHandled = (value ? 1 : 0)
-//    }
-//    
-//    // 是否与主申请人同住
-//    func isLiveTother() -> Bool {
-//        return self.nows == 1
-//    }
-//    
-//    func setLiveTother(_ value:Bool) {
-//        self.nows = (value ? 1 : 0)
-//    }
-//    
-//    // 是否在海外居住满1年及以上
-//    func isOverSeasOver1Year() -> Bool {
-//        return self.isLiveOverseaYear == 1
-//    }
-//    
-//    func setOverSearsOver1Year(_ value:Bool) {
-//        self.isLiveOverseaYear = value ? 1 : 0
-//    }
-//    
-//    // 是否出生国外
-//    func isBirthOverSeas() -> Bool {
-//        return self.birthPlaceAboard == 1
-//    }
-//    
-//    func setBirthOverSeas(_ value:Bool) {
-//        return self.birthPlaceAboard = value ? 1 : 0
-//    }
-//    
-//    // 目前是否在港
-//    func isNowInHK() -> Bool {
-//        if let inHK = self.childInHk {
-//            if inHK.has == "Y" {
-//                return true
-//            } else if inHK.has == "N" {
-//                return false
-//            }
-//        }
-//        return false
-//    }
-//    
-//    func setNowIsInHK(_ value:Bool) {
-//        self.childInHk?.has = value ?  "Y" : "N"
-//    }
-//    
-//    // 是否办理过香港身份证
-//    func isHaveHKIdentityCard() -> Bool {
-//        if let hasHkId = self.childHasHkId {
-//            if hasHkId.has == "Y" {
-//                return true
-//            } else if hasHkId.has == "N" {
-//                return false
-//            }
-//        }
-//        return false
-//    }
-//    
-//    func setHaveHKIdentityCard(_ value:Bool) {
-//        self.childHasHkId?.has = value ?  "Y" : "N"
-//    }
-//    
-//    // 是否拥有学位
-//    func haveDegreeName() -> String? {
-//        if hasDegree == "1" {
-//            return "有学位"
-//        } else {
-//            return "无学位"
-//        }
-//    }
-//    
-//    func isHaveDegree() ->Bool {
-//        return self.hasDegree == "1"
-//    }
-//    
-//    func setHaveDegree(_ val:Bool) {
-//        self.hasDegree = val ? "1" : "0"
-//    }
-//    
-//    // 是否已故
-//    func isDead() -> Bool {
-//        return self.deceased == 1
-//    }
-//    
-//    func setIsDead(_ val:Bool) {
-//        self.deceased = (val ? 1 : 0)
-//    }
-//    
-//    // 是否在职
-//    func isNowHaveJob() -> Bool {
-//        return self.occupation == "在职"
-//    }
-//    
-//    // 主申请人和现配偶是否拥有孩子抚养权
-//    func isOwnCustody() -> Bool {
-//        return self.custody == 1
-//    }
-//    
-//    func setOwnCustody(_ val:Bool) {
-//        self.custody = val ? 1 : 0
-//    }
-//    
-//    // 是否是男性
-//    func isMale() -> Bool {
-//      return  self.sex == 1
-//    }
-//    
-//    func setMale(_ val: Bool) {
-//        self.sex = (val ? 1 : 2)
-//    }
-//    
-//    func sexName() -> String? {
-//        if self.sex == 1 {
-//            return "男".local
-//        } else if self.sex == 2 {
-//            return "女".local
-//        }
-//        return ""
-//    }
-//    
-//    // 是否前一次婚姻子女
-//    func isPreviousMarriageChild() -> Bool {
-//       return self.childStepchild?.has == "Y"
-//    }
-//    
-//    func setPreviousMarriageChild(_ val: Bool) {
-//        self.childStepchild?.has = (val ? "Y" : "N")
-//    }
-//    
-//    
-//    var relationType:YHFamilyMemberType {
-//        
-//        if relation == "1" {
-//            return .father
-//        } else if relation == "2" {
-//            return .mother
-//        } else if relation == "3" {
-//            return .spouse
-//        } else if relation == "4" {
-//            return .child
-//        } else if relation == "5" {
-//            return .brother
-//        }
-//        
-//        return .none
-//    }
-//    
-//    // YHFamilyMemberProtocol
-//    func getTitle() -> String {
-//        // 1父亲  2 母亲 3 配偶 4子女 5兄弟姐妹
-//        if let relation = relation {
-//            if relation == "1" {
-//                return "父亲".local
-//            } else if relation == "2" {
-//                return "母亲".local
-//            } else if relation == "3" {
-//                return "配偶".local
-//            } else if relation == "4" {
-//                return "子女".local
-//            } else if relation == "5" {
-//                return "兄弟姐妹".local
-//            }
-//        }
-//        return ""
-//    }
-//    
-//    func getSubTitle() -> String {
-//        return ""
-//    }
-//}
+
 
 class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
     var id: Int = 0
+    // 是否已故 1:是 0：否
     var deceased: Int = 0
+    // 主申请人和现配偶是否拥有孩子抚养权 1:是 0：否
     var custody: Int = 0
     var nationality: String = ""
     var orderId: Int = 0
     var relation: String = ""
     var hasDegree: String = ""
     var hasDegreeJson: [YHHasDegreeJson] = []
+    // 是否随行 1：是 2：否
     var follow: Int = 1
     var statement: Int = 0
     var subsetName: String = ""
     var subsetNamePinyin: YHSubsetNamePinyin = YHSubsetNamePinyin()
     var birthday: String = ""
+    // 是否出生国外 1:是 0：否
     var birthPlaceAboard: Int = 0
     var birthPlace: YHAddress = YHAddress()
     var occupation: String = ""
@@ -919,8 +612,10 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     // 是否办理过香港身份证
     var childHasHkId: YHChildStepchildClass = YHChildStepchildClass()
     var hkIdentityCard: String?
+    // 性别 1:男 2：女
     var sex: Int = 0
     var married: String = ""
+    // 是否与主申请人同住 1：是 0：否
     var nows: Int = 0
     var address: YHAddress = YHAddress()
     // 是否前一次婚姻子女
@@ -932,6 +627,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var liveCountry: String = ""
     var finishFollow: Int = 0
     var step: Int = 0
+    // 是否要办理港澳通行证 1：是 0：否
     var isHandled: Int = 0
     // notFillNumber = -1 表示还没开始填写任意数据项
     var notFillNumber: Int = -1
@@ -940,7 +636,8 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var hkIdentityOther: String = ""
     var isHkHandled: Int = 0
     var isInHk: Int = 0
-    var isLiveOverseaYear: Int = 0
+    // 是否在海外居住满1年及以上 1:是 2：否
+    var isLiveOverseaYear: Int = 2
     var surname: String = ""
     
     func checkDefaultValue() -> Self {
@@ -1017,7 +714,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     }
     
     func setFollow(_ value:Bool) {
-        self.follow = (value ? 1 : 0)
+        self.follow = (value ? 1 : 2)
     }
     
     // 是否要办理港澳通行证
@@ -1044,7 +741,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     }
     
     func setOverSearsOver1Year(_ value:Bool) {
-        self.isLiveOverseaYear = value ? 1 : 0
+        self.isLiveOverseaYear = value ? 1 : 2
     }
     
     // 是否出生国外