Skip to content

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

Merge commit '974dae47' into davidhuang 

* commit '974dae47':
  // 家庭成员Model字段调整
parents 2ad35594 974dae47
Show whitespace changes
Inline Side-by-side
Showing with 365 additions and 150 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift
View file @ 9668452c
......@@ -144,7 +144,7 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
let item31 = YHFormDetailItem(type: .stayHKDate)
item31.placeHolder = "请选择".local
item31.tips = "请选择获准逗留期限".local
item31.value = child.childInHk?.info
item31.value = child.childInHk.info
let item32 = YHFormDetailItem(type: .roleInHK)
item32.placeHolder = "请选择".local
......@@ -435,7 +435,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
if detailItem.type == .birthday {
self.child?.birthday = date
} else if detailItem.type == .stayHKDate {
self.child?.childInHk?.info = date
self.child?.childInHk.info = date
}
self.loadBasicInfo()
if let delegate = delegate {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift
View file @ 9668452c
......@@ -175,7 +175,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
if spouse.isNowInHK() { // 目前在港才显示 逗留期限和在港身份
let item31 = YHFormDetailItem(type: .stayHKDate)
item31.placeHolder = "请选择".local
item31.value = spouse.childInHk?.info
item31.value = spouse.childInHk.info
item31.tips = "请选择".local
let item32 = YHFormDetailItem(type: .roleInHK)
......@@ -596,7 +596,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
if detailItem.type == .birthday {
self.spouse?.birthday = date
} else if detailItem.type == .stayHKDate {
self.spouse?.childInHk?.info = date
self.spouse?.childInHk.info = date
}
self.loadBasicInfo()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoVC.swift
View file @ 9668452c
......@@ -129,21 +129,21 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
// 检查填写信息完整性
func checkIntegrity() -> Bool {
if let sponse = familyMemberInfo?.spouse, sponse.notFillNum > 0 {
if let sponse = familyMemberInfo?.spouse, sponse.notFillNumber > 0 {
return false
}
if let father = familyMemberInfo?.father, father.notFillNum > 0 {
if let father = familyMemberInfo?.father, father.notFillNumber > 0 {
return false
}
if let mother = familyMemberInfo?.mother, mother.notFillNum > 0 {
if let mother = familyMemberInfo?.mother, mother.notFillNumber > 0 {
return false
}
if let childs = familyMemberInfo?.child, !childs.isEmpty {
for child in childs {
if child.notFillNum > 0 {
if child.notFillNumber > 0 {
return false
}
}
......@@ -151,7 +151,7 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
if let brothers = familyMemberInfo?.brother, !brothers.isEmpty {
for brother in brothers {
if brother.notFillNum > 0 {
if brother.notFillNumber > 0 {
return false
}
}
......@@ -233,7 +233,7 @@ extension YHFamilyMemberInfoVC {
// 请求家庭成员信息
func requestFamilyInfo() {
self.familyRequest.getFamilyInfo(params: ["orderId": self.orderId]) { [weak self] success, error in
self.familyRequest.getFamilyInfo(params: ["order_id": self.orderId]) { [weak self] success, error in
guard let self = self else { return }
if success {
familyMemberInfo = self.familyRequest.familyInfo
......@@ -337,10 +337,10 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
let detailItem = item as! YHFamilyMember
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
cell.title = detailItem.getTitle()
cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNum > 0 ? .failColor : .labelTextColor2)
cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNumber > 0 ? .failColor : .labelTextColor2)
if detailItem.notFillNum > 0 {
cell.detailLabel.text = String(format: "有%d项未填写".local, detailItem.notFillNum)
if detailItem.notFillNumber > 0 {
cell.detailLabel.text = String(format: "有%d项未填写".local, detailItem.notFillNumber)
} else {
cell.detailLabel.text = "已填完".local
}
......@@ -464,12 +464,7 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
let arr = items[indexPath.section]
let item:YHFormItemProtocol = arr[indexPath.row]
if item is YHFormTitleItem { // 是标题
return 52.0
} else if item is YHFormAddItem { // 新增子女兄妹
return 70.0
}
return 50.0
return UITableView.automaticDimension
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift
View file @ 9668452c
......@@ -530,23 +530,6 @@ class YHFormDetailItem : YHFormItemProtocol {
}
/* ***** ***** ***** ***** ***** ***** ***** ***** */
// MARK: - YHWelcome
class YHWelcome: SmartCodable {
var code: Int = 0
var msg: String = ""
var data: YHFamilyMemberGroupInfo?
enum CodingKeys: String, CodingKey {
case code = "code"
case msg = "msg"
case data = "data"
}
required init() {
}
}
// MARK: - 家庭成员 YHData
class YHFamilyMemberGroupInfo: SmartCodable {
......@@ -581,86 +564,360 @@ 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
// 是否已故
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 subsetNamePinyin: YHSubsetNamePinyin?
var birthday: String?
// 出生国家地区 (国内/国外)
var birthPlaceAboard: Int = 0
// 出生地址信息
var birthPlace: YHAddress?
// 职业
var occupation: String?
// 职业名称
var occupationName: String?
// mark any
var operatorAme: SmartAny?
// 香港身份证号
var operatorName: String?
var childHasHkId: YHChildStepchildClass = YHChildStepchildClass()
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 childStepchild: YHChildStepchildClass = YHChildStepchildClass()
var childInHk: YHChildStepchildClass = YHChildStepchildClass()
var countryIdentity: YHChildStepchildClass?
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 isHandled: Int = 0
var notFillNumber: Int = 0
var certificates: YHCertificates?
var usedName: String?
var hkIdentityOther: String?
var isHkHandled: Int = 0
var isInHk: Int = 0
var isLiveOverseaYear: Int = 0
// 婚前姓氏
var surname: String?
enum CodingKeys: String, CodingKey {
......@@ -676,14 +933,13 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
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 operatorName = "operator_name"
case childHasHkId = "child_has_Hk_id"
case hkIdentityCard = "hk_identity_card"
case sex = "sex"
case married = "married"
......@@ -693,15 +949,18 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
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 isHandled = "is_handled"
case notFillNumber = "not_fill_number"
case certificates = "certificates"
case usedName = "used_name"
case hkIdentityOther = "hk_identity_other"
case isHkHandled = "is_hk_handled"
case isInHk = "is_in_hk"
case isLiveOverseaYear = "is_live_oversea_year"
case surname = "surname"
case certificates = "certificates"
}
required init() {
......@@ -755,34 +1014,30 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
// 目前是否在港
func isNowInHK() -> Bool {
if let inHK = self.childInHk {
if inHK.has == "Y" {
if self.childInHk.has == "Y" {
return true
} else if inHK.has == "N" {
} else if self.childInHk.has == "N" {
return false
}
}
return false
}
func setNowIsInHK(_ value:Bool) {
self.childInHk?.has = value ? "Y" : "N"
self.childInHk.has = value ? "Y" : "N"
}
// 是否办理过香港身份证
func isHaveHKIdentityCard() -> Bool {
if let hasHkId = self.childHasHkId {
if hasHkId.has == "Y" {
if self.childHasHkId.has == "Y" {
return true
} else if hasHkId.has == "N" {
} else if self.childHasHkId.has == "N" {
return false
}
}
return false
}
func setHaveHKIdentityCard(_ value:Bool) {
self.childHasHkId?.has = value ? "Y" : "N"
self.childHasHkId.has = value ? "Y" : "N"
}
// 是否拥有学位
......@@ -845,14 +1100,13 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
// 是否前一次婚姻子女
func isPreviousMarriageChild() -> Bool {
return self.childStepchild?.has == "Y"
return self.childStepchild.has == "Y"
}
func setPreviousMarriageChild(_ val: Bool) {
self.childStepchild?.has = (val ? "Y" : "N")
self.childStepchild.has = (val ? "Y" : "N")
}
var relationType:YHFamilyMemberType {
if relation == "1" {
......@@ -873,7 +1127,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
// YHFamilyMemberProtocol
func getTitle() -> String {
// 1父亲 2 母亲 3 配偶 4子女 5兄弟姐妹
if let relation = relation {
if relation == "1" {
return "父亲".local
} else if relation == "2" {
......@@ -885,7 +1138,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
} else if relation == "5" {
return "兄弟姐妹".local
}
}
return ""
}
......@@ -916,8 +1169,8 @@ class YHAddress: SmartCodable {
// MARK: - YHChildStepchildClass
class YHChildStepchildClass: SmartCodable {
var has: String?
var info: String?
var has: String = ""
var info: String = ""
enum CodingKeys: String, CodingKey {
case has = "has"
......@@ -931,8 +1184,8 @@ class YHChildStepchildClass: SmartCodable {
// MARK: - YHSubsetNamePinyin
class YHSubsetNamePinyin: SmartCodable {
var familyName: String?
var givenName: String?
var familyName: String = ""
var givenName: String = ""
enum CodingKeys: String, CodingKey {
case familyName = "family_name"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift
View file @ 9668452c
......@@ -26,41 +26,7 @@ class YHFamilyRequestViewModel {
printLog("model 是 ==> \(json)")
let dic = json.data as? [AnyHashable : Any]
guard var dic = dic else { return }
#if DEBUG
if let child = dic["child"], child is [[String: Any]] {
var child = child as! [[String: Any]]
for (index, dic) in child.enumerated() {
var d = dic
d["certificates"] = [String: Any]()
child[index] = d
}
dic["child"] = child
}
if let brother = dic["brother"], brother is [[String: Any]] {
var brother = brother as! [[String: Any]]
for (index, dic) in brother.enumerated() {
var d = dic
d["certificates"] = [String: Any]()
// ["cnIdentityCard":"",
// "passport":"",
// "hkMacaoPass":""]
brother[index] = d
}
dic["brother"] = brother
}
#endif
guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
......
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 9668452c
......@@ -49,7 +49,8 @@ class YHAllApiName {
struct Family {
// 获取家庭成员信息 添加家庭成员也用这个
static let familyInfoApi = "frontend/order/information/family"
// static let familyInfoApi = "frontend/order/information/family"
static let familyInfoApi = "infoflow/information/family"
// 删除家庭成员信息
static let familyMemberDeleteApi = "frontend/order/information/family/delete"
......
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