Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
d79c1264
Commit
d79c1264
authored
Jan 30, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 家庭成员信息model 更新
parent
6b0bd7e5
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
153 additions
and
386 deletions
+153
-386
YHBrotherInfoVC.swift
...)/ServiceProcess(流程)/FamilyMember/C/YHBrotherInfoVC.swift
+1
-1
YHCertificateViewController.swift
...cess(流程)/FamilyMember/C/YHCertificateViewController.swift
+1
-1
YHChildBasicInfoVC.swift
...erviceProcess(流程)/FamilyMember/C/YHChildBasicInfoVC.swift
+1
-1
YHChildInitialInfoVC.swift
...viceProcess(流程)/FamilyMember/C/YHChildInitialInfoVC.swift
+1
-1
YHFamilyMemberFormVC.swift
...viceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift
+55
-48
YHParentInfoVC.swift
...心)/ServiceProcess(流程)/FamilyMember/C/YHParentInfoVC.swift
+2
-2
YHSpouseBasicInfoVC.swift
...rviceProcess(流程)/FamilyMember/C/YHSpouseBasicInfoVC.swift
+1
-1
YHSpouseInitialInfoVC.swift
...iceProcess(流程)/FamilyMember/C/YHSpouseInitialInfoVC.swift
+1
-1
YHFamilyInitialInfo.swift
...rviceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift
+90
-330
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHBrotherInfoVC.swift
View file @
d79c1264
...
@@ -10,7 +10,7 @@ import UIKit
...
@@ -10,7 +10,7 @@ import UIKit
class
YHBrotherInfoVC
:
YHBaseViewController
{
class
YHBrotherInfoVC
:
YHBaseViewController
{
var
brotherInfo
:
YH
Broth
er
?
var
brotherInfo
:
YH
FamilyMemb
er
?
var
items
:[[
YHFormItemProtocol
]]
=
[[
YHFormItemProtocol
]]()
var
items
:[[
YHFormItemProtocol
]]
=
[[
YHFormItemProtocol
]]()
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHCertificateViewController.swift
View file @
d79c1264
...
@@ -10,7 +10,7 @@ import UIKit
...
@@ -10,7 +10,7 @@ import UIKit
class
YHCertificateViewController
:
YHBaseViewController
{
class
YHCertificateViewController
:
YHBaseViewController
{
var
spouse
:
YH
Spouse
?
var
spouse
:
YH
FamilyMember
?
var
cardInfo
:
YHCNIdentityCard
?
var
cardInfo
:
YHCNIdentityCard
?
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHChildBasicInfoVC.swift
View file @
d79c1264
...
@@ -10,7 +10,7 @@ import UIKit
...
@@ -10,7 +10,7 @@ import UIKit
class
YHChildBasicInfoVC
:
YHBaseViewController
{
class
YHChildBasicInfoVC
:
YHBaseViewController
{
var
child
:
YH
Child
?
var
child
:
YH
FamilyMember
?
var
cardInfo
:
YHCNIdentityCard
?
var
cardInfo
:
YHCNIdentityCard
?
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHChildInitialInfoVC.swift
View file @
d79c1264
...
@@ -10,7 +10,7 @@ import UIKit
...
@@ -10,7 +10,7 @@ import UIKit
class
YHChildInitialInfoVC
:
YHBaseViewController
{
class
YHChildInitialInfoVC
:
YHBaseViewController
{
var
child
:
YH
Child
?
var
child
:
YH
FamilyMember
?
lazy
var
items
:[[
YHFormItemProtocol
]]
=
[[
YHFormItemProtocol
]]()
lazy
var
items
:[[
YHFormItemProtocol
]]
=
[[
YHFormItemProtocol
]]()
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift
View file @
d79c1264
...
@@ -17,7 +17,7 @@ enum YHFormTitleItemEditType:Int {
...
@@ -17,7 +17,7 @@ enum YHFormTitleItemEditType:Int {
class
YHFamilyMemberFormVC
:
YHBaseViewController
{
class
YHFamilyMemberFormVC
:
YHBaseViewController
{
var
familyMemberInfo
:
YHFamilyMemberInfo
?
var
familyMemberInfo
:
YHFamilyMember
Group
Info
?
var
isChildsEditMode
:
YHFormTitleItemEditType
=
.
none
var
isChildsEditMode
:
YHFormTitleItemEditType
=
.
none
var
isBrothersEditMode
:
YHFormTitleItemEditType
=
.
none
var
isBrothersEditMode
:
YHFormTitleItemEditType
=
.
none
...
@@ -269,7 +269,7 @@ class YHFamilyMemberFormVC: YHBaseViewController {
...
@@ -269,7 +269,7 @@ class YHFamilyMemberFormVC: YHBaseViewController {
]
]
]
as
[
String
:
Any
]
]
as
[
String
:
Any
]
familyMemberInfo
=
YHFamilyMemberInfo
.
deserialize
(
dict
:
dic
)
familyMemberInfo
=
YHFamilyMember
Group
Info
.
deserialize
(
dict
:
dic
)
loadFamilyMember
()
loadFamilyMember
()
}
}
...
@@ -280,6 +280,8 @@ class YHFamilyMemberFormVC: YHBaseViewController {
...
@@ -280,6 +280,8 @@ class YHFamilyMemberFormVC: YHBaseViewController {
// 配偶section
// 配偶section
if
let
sponse
=
familyMemberInfo
?
.
spouse
{
if
let
sponse
=
familyMemberInfo
?
.
spouse
{
// 信息未填写时服务器返回的relation=0
sponse
.
relation
=
String
(
format
:
"%d"
,
YHFamilyMemberType
.
spouse
.
rawValue
)
let
sponseArray
:[
YHFormItemProtocol
]
=
[
YHFormTitleItem
(
type
:
.
sponse
),
sponse
]
let
sponseArray
:[
YHFormItemProtocol
]
=
[
YHFormTitleItem
(
type
:
.
sponse
),
sponse
]
items
.
append
(
sponseArray
)
items
.
append
(
sponseArray
)
}
}
...
@@ -287,9 +289,13 @@ class YHFamilyMemberFormVC: YHBaseViewController {
...
@@ -287,9 +289,13 @@ class YHFamilyMemberFormVC: YHBaseViewController {
// 父母section
// 父母section
var
parents
=
[
YHFormItemProtocol
]()
var
parents
=
[
YHFormItemProtocol
]()
if
let
father
=
familyMemberInfo
?
.
father
{
if
let
father
=
familyMemberInfo
?
.
father
{
// 信息未填写时服务器返回的relation=0
father
.
relation
=
String
(
format
:
"%d"
,
YHFamilyMemberType
.
father
.
rawValue
)
parents
.
append
(
father
)
parents
.
append
(
father
)
}
}
if
let
mother
=
familyMemberInfo
?
.
mother
{
if
let
mother
=
familyMemberInfo
?
.
mother
{
// 信息未填写时服务器返回的relation=0
mother
.
relation
=
String
(
format
:
"%d"
,
YHFamilyMemberType
.
mother
.
rawValue
)
parents
.
append
(
mother
)
parents
.
append
(
mother
)
}
}
if
!
parents
.
isEmpty
{
if
!
parents
.
isEmpty
{
...
@@ -308,6 +314,10 @@ class YHFamilyMemberFormVC: YHBaseViewController {
...
@@ -308,6 +314,10 @@ class YHFamilyMemberFormVC: YHBaseViewController {
// 兄妹section
// 兄妹section
var
brotherArr
:[
YHFormItemProtocol
]
=
[
YHFormTitleItem
(
type
:
.
brother
),
YHFormAddItem
(
type
:
.
addBrother
)]
var
brotherArr
:[
YHFormItemProtocol
]
=
[
YHFormTitleItem
(
type
:
.
brother
),
YHFormAddItem
(
type
:
.
addBrother
)]
if
let
brothers
=
familyMemberInfo
?
.
brother
,
!
brothers
.
isEmpty
{
if
let
brothers
=
familyMemberInfo
?
.
brother
,
!
brothers
.
isEmpty
{
for
brother
in
brothers
{
// 信息未填写时服务器返回的relation=0
brother
.
relation
=
String
(
format
:
"%d"
,
YHFamilyMemberType
.
brother
.
rawValue
)
}
brotherArr
.
insert
(
contentsOf
:
brothers
,
at
:
1
)
brotherArr
.
insert
(
contentsOf
:
brothers
,
at
:
1
)
}
}
items
.
append
(
brotherArr
)
items
.
append
(
brotherArr
)
...
@@ -391,7 +401,7 @@ extension YHFamilyMemberFormVC {
...
@@ -391,7 +401,7 @@ extension YHFamilyMemberFormVC {
"certificates"
:
[]
"certificates"
:
[]
]
as
[
String
:
Any
]
]
as
[
String
:
Any
]
let
brother
:
YH
Brother
=
YHBroth
er
.
deserialize
(
dict
:
dict
)
!
let
brother
:
YH
FamilyMember
=
YHFamilyMemb
er
.
deserialize
(
dict
:
dict
)
!
if
var
brothers
=
familyMemberInfo
?
.
brother
{
if
var
brothers
=
familyMemberInfo
?
.
brother
{
brothers
.
append
(
brother
)
brothers
.
append
(
brother
)
...
@@ -466,7 +476,7 @@ extension YHFamilyMemberFormVC {
...
@@ -466,7 +476,7 @@ extension YHFamilyMemberFormVC {
"certificates"
:[]
"certificates"
:[]
]
as
[
String
:
Any
]
]
as
[
String
:
Any
]
let
child
=
YH
Child
.
deserialize
(
dict
:
dict
)
!
let
child
=
YH
FamilyMember
.
deserialize
(
dict
:
dict
)
!
if
var
childs
=
familyMemberInfo
?
.
child
{
if
var
childs
=
familyMemberInfo
?
.
child
{
childs
.
append
(
child
)
childs
.
append
(
child
)
familyMemberInfo
!.
child
=
childs
familyMemberInfo
!.
child
=
childs
...
@@ -534,22 +544,24 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
...
@@ -534,22 +544,24 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
}
}
// 配偶父母子女兄妹具体条目
// 配偶父母子女兄妹具体条目
if
item
is
YH
Parent
||
item
is
YHChild
||
item
is
YHSpouse
||
item
is
YHBroth
er
{
if
item
is
YH
FamilyMemb
er
{
let
detailItem
=
item
as!
YHFamilyMember
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemEnterDetailCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormItemEnterDetailCell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
YHFormItemEnterDetailCell
.
cellReuseIdentifier
,
for
:
indexPath
)
as!
YHFormItemEnterDetailCell
cell
.
isShowDeleteBtn
=
false
cell
.
isShowDeleteBtn
=
false
cell
.
deleteBlock
=
nil
cell
.
deleteBlock
=
nil
if
item
is
YHChild
||
item
is
YHB
rother
{
if
detailItem
.
relationType
==
.
child
||
detailItem
.
relationType
==
.
b
rother
{
if
item
is
YHC
hild
{
if
detailItem
.
relationType
==
.
c
hild
{
cell
.
isShowDeleteBtn
=
(
isChildsEditMode
==
.
canCancel
)
cell
.
isShowDeleteBtn
=
(
isChildsEditMode
==
.
canCancel
)
}
else
if
item
is
YHBrother
{
}
else
if
detailItem
.
relationType
==
.
brother
{
cell
.
isShowDeleteBtn
=
(
isBrothersEditMode
==
.
canCancel
)
cell
.
isShowDeleteBtn
=
(
isBrothersEditMode
==
.
canCancel
)
}
}
// 删除子女兄妹处理
// 删除子女兄妹处理
cell
.
deleteBlock
=
{
[
weak
self
]
in
cell
.
deleteBlock
=
{
[
weak
self
]
in
if
item
is
YHC
hild
{
if
detailItem
.
relationType
==
.
c
hild
{
let
childCount
=
self
?
.
familyMemberInfo
?
.
child
?
.
count
??
0
let
childCount
=
self
?
.
familyMemberInfo
?
.
child
?
.
count
??
0
// 因为子女兄妹section第一行都是标题所以row-1
// 因为子女兄妹section第一行都是标题所以row-1
if
(
indexPath
.
row
-
1
<
childCount
)
{
if
(
indexPath
.
row
-
1
<
childCount
)
{
...
@@ -557,7 +569,7 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
...
@@ -557,7 +569,7 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
self
?
.
isChildsEditMode
=
.
none
self
?
.
isChildsEditMode
=
.
none
self
?
.
isBrothersEditMode
=
.
none
self
?
.
isBrothersEditMode
=
.
none
}
}
}
else
if
item
is
YHB
rother
{
}
else
if
detailItem
.
relationType
==
.
b
rother
{
let
brotherCount
=
self
?
.
familyMemberInfo
?
.
brother
?
.
count
??
0
let
brotherCount
=
self
?
.
familyMemberInfo
?
.
brother
?
.
count
??
0
// 因为子女兄妹section第一行都是标题所以row-1
// 因为子女兄妹section第一行都是标题所以row-1
...
@@ -629,11 +641,6 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
...
@@ -629,11 +641,6 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
IQKeyboardManager
.
shared
.
enable
=
true
let
caseList
=
YHFormTitleItemType
.
allCases
.
map
({
"
\(
$0
)
"
})
.
joined
(
separator
:
", "
)
print
(
caseList
)
let
arr
=
items
[
indexPath
.
section
]
let
arr
=
items
[
indexPath
.
section
]
let
item
:
YHFormItemProtocol
=
arr
[
indexPath
.
row
]
let
item
:
YHFormItemProtocol
=
arr
[
indexPath
.
row
]
...
@@ -652,40 +659,40 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
...
@@ -652,40 +659,40 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
}
}
return
return
}
}
// 父母
if
item
is
YHParent
{
let
parent
=
item
as!
YHParent
let
vc
=
YHParentInfoVC
()
vc
.
parentInfo
=
parent
self
.
navigationController
?
.
pushViewController
(
vc
)
return
}
// 配偶
if
item
is
YHFamilyMember
{
if
item
is
YHSpouse
{
let
detailItem
=
item
as!
YHFamilyMember
let
spouse
=
item
as!
YHSpouse
// 父母
let
vc
=
YHSpouseInitialInfoVC
()
if
detailItem
.
relationType
==
.
father
||
detailItem
.
relationType
==
.
mother
{
vc
.
spouse
=
spouse
let
vc
=
YHParentInfoVC
()
self
.
navigationController
?
.
pushViewController
(
vc
)
vc
.
parentInfo
=
detailItem
return
self
.
navigationController
?
.
pushViewController
(
vc
)
}
return
}
// 子女
if
item
is
YHChild
{
// 配偶
let
child
=
item
as!
YHChild
if
detailItem
.
relationType
==
.
spouse
{
let
vc
=
YHChildInitialInfoVC
()
let
vc
=
YHSpouseInitialInfoVC
()
vc
.
child
=
child
vc
.
spouse
=
detailItem
self
.
navigationController
?
.
pushViewController
(
vc
)
self
.
navigationController
?
.
pushViewController
(
vc
)
return
return
}
}
// 兄弟姐妹
// 子女
if
item
is
YHBrother
{
if
detailItem
.
relationType
==
.
child
{
let
brother
=
item
as!
YHBrother
let
vc
=
YHChildInitialInfoVC
()
let
vc
=
YHBrotherInfoVC
()
vc
.
child
=
detailItem
vc
.
brotherInfo
=
brother
self
.
navigationController
?
.
pushViewController
(
vc
)
self
.
navigationController
?
.
pushViewController
(
vc
)
return
return
}
// 兄弟姐妹
if
detailItem
.
relationType
==
.
brother
{
let
vc
=
YHBrotherInfoVC
()
vc
.
brotherInfo
=
detailItem
self
.
navigationController
?
.
pushViewController
(
vc
)
return
}
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHParentInfoVC.swift
View file @
d79c1264
...
@@ -10,7 +10,7 @@ import UIKit
...
@@ -10,7 +10,7 @@ import UIKit
class
YHParentInfoVC
:
YHBaseViewController
{
class
YHParentInfoVC
:
YHBaseViewController
{
var
parentInfo
:
YH
Parent
?
var
parentInfo
:
YH
FamilyMember
?
var
items
:[[
YHFormItemProtocol
]]
=
[[
YHFormItemProtocol
]]()
var
items
:[[
YHFormItemProtocol
]]
=
[[
YHFormItemProtocol
]]()
...
@@ -72,7 +72,7 @@ class YHParentInfoVC: YHBaseViewController {
...
@@ -72,7 +72,7 @@ class YHParentInfoVC: YHBaseViewController {
// 父母亲信息
// 父母亲信息
var
arr1
=
[
YHFormItemProtocol
]()
var
arr1
=
[
YHFormItemProtocol
]()
if
parentInfo
.
sex
==
-
1
{
// 父亲
if
parentInfo
.
relationType
==
.
father
{
// 父亲
let
title1
:
YHFormItemProtocol
=
YHFormTitleItem
(
type
:
.
fatherInfo
)
let
title1
:
YHFormItemProtocol
=
YHFormTitleItem
(
type
:
.
fatherInfo
)
let
item10
:
YHFormItemProtocol
=
YHFormDetailItem
(
type
:
.
fatherName
)
let
item10
:
YHFormItemProtocol
=
YHFormDetailItem
(
type
:
.
fatherName
)
arr1
.
append
(
contentsOf
:
[
title1
,
item10
])
arr1
.
append
(
contentsOf
:
[
title1
,
item10
])
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseBasicInfoVC.swift
View file @
d79c1264
...
@@ -24,7 +24,7 @@ enum HKFormItemCellType: Int {
...
@@ -24,7 +24,7 @@ enum HKFormItemCellType: Int {
class
YHSpouseBasicInfoVC
:
YHBaseViewController
{
class
YHSpouseBasicInfoVC
:
YHBaseViewController
{
var
spouse
:
YH
Spouse
?
var
spouse
:
YH
FamilyMember
?
var
cardInfo
:
YHCNIdentityCard
?
var
cardInfo
:
YHCNIdentityCard
?
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInitialInfoVC.swift
View file @
d79c1264
...
@@ -10,7 +10,7 @@ import UIKit
...
@@ -10,7 +10,7 @@ import UIKit
class
YHSpouseInitialInfoVC
:
YHBaseViewController
{
class
YHSpouseInitialInfoVC
:
YHBaseViewController
{
var
spouse
:
YH
Spouse
?
var
spouse
:
YH
FamilyMember
?
lazy
var
items
:[[
YHFormItemProtocol
]]
=
[[
YHFormItemProtocol
]]()
lazy
var
items
:[[
YHFormItemProtocol
]]
=
[[
YHFormItemProtocol
]]()
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift
View file @
d79c1264
...
@@ -429,7 +429,7 @@ class YHWelcome: SmartCodable {
...
@@ -429,7 +429,7 @@ class YHWelcome: SmartCodable {
var
code
:
Int
=
-
1
var
code
:
Int
=
-
1
var
msg
:
String
=
""
var
msg
:
String
=
""
var
data
:
YHFamilyMemberInfo
?
var
data
:
YHFamilyMember
Group
Info
?
enum
CodingKeys
:
String
,
CodingKey
{
enum
CodingKeys
:
String
,
CodingKey
{
case
code
=
"code"
case
code
=
"code"
...
@@ -443,30 +443,39 @@ class YHWelcome: SmartCodable {
...
@@ -443,30 +443,39 @@ class YHWelcome: SmartCodable {
}
}
// MARK: - 家庭成员 YHData
// MARK: - 家庭成员 YHData
class
YHFamilyMemberInfo
:
SmartCodable
{
class
YHFamilyMember
Group
Info
:
SmartCodable
{
var
father
:
YH
Parent
?
var
father
:
YH
FamilyMember
?
var
mother
:
YH
Parent
?
var
mother
:
YH
FamilyMember
?
var
spouse
:
YH
Spouse
?
var
spouse
:
YH
FamilyMember
?
var
child
:
[
YH
Child
]?
var
child
:
[
YH
FamilyMember
]?
var
brother
:
[
YH
Broth
er
]?
var
brother
:
[
YH
FamilyMemb
er
]?
enum
CodingKeys
:
String
,
CodingKey
{
enum
CodingKeys
:
String
,
CodingKey
{
case
father
=
"father"
case
father
=
"father"
case
mother
=
"mother"
case
mother
=
"mother"
case
spouse
=
"spouse"
case
spouse
=
"spouse"
case
brother
=
"brother"
case
brother
=
"brother"
case
child
=
"child"
case
child
=
"child"
}
}
required
init
()
{
required
init
()
{
}
}
}
}
// MARK: - 子女初始信息 YHChild
enum
YHFamilyMemberType
:
Int
{
class
YHChild
:
SmartCodable
,
YHFormItemProtocol
{
// 与后台relation字段一致
// 1父亲 2母亲 3配偶 4子女 5兄弟姐妹
case
none
=
0
case
father
=
1
case
mother
=
2
case
spouse
=
3
case
child
=
4
case
brother
=
5
}
class
YHFamilyMember
:
SmartCodable
,
YHFormItemProtocol
{
var
id
:
Int
=
-
1
var
id
:
Int
=
-
1
var
deceased
:
Int
=
-
1
var
deceased
:
Int
=
-
1
var
custody
:
Int
=
-
1
var
custody
:
Int
=
-
1
...
@@ -474,27 +483,57 @@ class YHChild: SmartCodable, YHFormItemProtocol {
...
@@ -474,27 +483,57 @@ class YHChild: SmartCodable, YHFormItemProtocol {
var
orderId
:
Int
=
-
1
var
orderId
:
Int
=
-
1
var
relation
:
String
?
var
relation
:
String
?
var
hasDegree
:
String
?
var
hasDegree
:
String
?
var
hasDegreeJson
:
[
SmartAny
]?
// mark any
// var hasDegreeJson: [YHHasDegreeJson]?
var
hasDegreeJson
:
SmartAny
?
var
follow
:
Int
=
-
1
var
follow
:
Int
=
-
1
var
statement
:
Int
=
-
1
var
statement
:
Int
=
-
1
var
subsetName
:
String
?
var
subsetName
:
String
?
var
subsetNamePinyin
:
YHSubsetNamePinyin
?
// mark any
// var subsetNamePinyin: YHSubsetNamePinyin?
var
subsetNamePinyin
:
SmartAny
?
var
usedName
:
String
?
var
usedName
:
String
?
var
birthday
:
String
?
var
birthday
:
String
?
var
birthPlaceAboard
:
Int
=
-
1
var
birthPlaceAboard
:
Int
=
-
1
var
birthPlace
:
YHAddress
?
// mark any
// var birthPlace: YHAddress?
var
birthPlace
:
SmartAny
?
var
occupation
:
String
?
var
occupation
:
String
?
var
occupationName
:
String
?
var
occupationName
:
String
?
// mark any
var
operatorAme
:
SmartAny
?
var
operatorAme
:
SmartAny
?
var
childHasHkId
:
YHChildStepchildClass
?
// mark any
// var childHasHkId: YHChildStepchildClass?
var
childHasHkId
:
SmartAny
?
var
hkIdentityCard
:
String
?
var
hkIdentityCard
:
String
?
var
sex
:
Int
=
-
1
var
sex
:
Int
=
-
1
var
married
:
String
?
var
married
:
String
?
var
nows
:
Int
=
-
1
var
nows
:
Int
=
-
1
var
address
:
YHAddress
?
var
childStepchild
:
YHChildStepchildClass
?
// mark any
var
childInHk
:
YHChildStepchildClass
?
// var address: YHAddress?
var
countryIdentity
:
[
SmartAny
]?
var
address
:
SmartAny
?
// mark any
// var childStepchild: YHChildStepchildClass?
var
childStepchild
:
SmartAny
?
// mark any
// var childInHk: YHChildStepchildClass?
var
childInHk
:
SmartAny
?
// mark any
var
countryIdentity
:
SmartAny
?
var
hkIdentity
:
String
?
var
hkIdentity
:
String
?
var
hkIdentityOther
:
String
?
var
hkIdentityOther
:
String
?
var
liveCountry
:
String
?
var
liveCountry
:
String
?
...
@@ -504,8 +543,11 @@ class YHChild: SmartCodable, YHFormItemProtocol {
...
@@ -504,8 +543,11 @@ class YHChild: SmartCodable, YHFormItemProtocol {
var
notFillNum
:
Int
=
-
1
var
notFillNum
:
Int
=
-
1
var
isLiveOverseaYear
:
Int
=
-
1
var
isLiveOverseaYear
:
Int
=
-
1
var
surname
:
String
?
var
surname
:
String
?
var
certificates
:
[
SmartAny
]?
// mark any
// var certificates: YHCertificates?
var
certificates
:
SmartAny
?
enum
CodingKeys
:
String
,
CodingKey
{
enum
CodingKeys
:
String
,
CodingKey
{
case
id
=
"id"
case
id
=
"id"
case
deceased
=
"deceased"
case
deceased
=
"deceased"
...
@@ -551,105 +593,30 @@ class YHChild: SmartCodable, YHFormItemProtocol {
...
@@ -551,105 +593,30 @@ class YHChild: SmartCodable, YHFormItemProtocol {
}
}
// YHFamilyMemberProtocol
var
relationType
:
YHFamilyMemberType
{
func
getTitle
()
->
String
{
return
"配偶"
.
local
if
relation
==
"1"
{
}
return
.
father
}
else
if
relation
==
"2"
{
func
getSubTitle
()
->
String
{
return
.
mother
return
""
}
else
if
relation
==
"3"
{
}
return
.
spouse
}
}
else
if
relation
==
"4"
{
return
.
child
// MARK: - YHBrother
}
else
if
relation
==
"5"
{
class
YHBrother
:
SmartCodable
,
YHFormItemProtocol
{
return
.
brother
var
id
:
Int
?
=
-
1
}
var
deceased
:
Int
?
=
-
1
var
custody
:
Int
?
=
-
1
var
nationality
:
String
?
var
orderId
:
Int
?
=
-
1
var
relation
:
String
?
var
hasDegree
:
String
?
var
hasDegreeJson
:
[
SmartAny
]?
var
follow
:
Int
?
=
-
1
var
statement
:
Int
?
=
-
1
var
subsetName
:
String
?
var
subsetNamePinyin
:
YHSubsetNamePinyin
?
var
usedName
:
String
?
var
birthday
:
String
?
var
birthPlaceAboard
:
Int
?
=
-
1
var
birthPlace
:
YHAddress
?
var
occupation
:
String
?
var
occupationName
:
String
?
var
operatorAme
:
SmartAny
?
var
childHasHkId
:
YHChildStepchildClass
?
var
hkIdentityCard
:
String
?
var
sex
:
Int
?
=
-
1
var
married
:
String
?
var
nows
:
Int
?
=
-
1
var
address
:
YHAddress
?
var
childStepchild
:
YHChildStepchildClass
?
var
childInHk
:
YHChildStepchildClass
?
var
countryIdentity
:
[
SmartAny
]?
var
hkIdentity
:
String
?
var
hkIdentityOther
:
String
?
var
liveCountry
:
String
?
var
isHandled
:
Int
?
=
-
1
var
finishFollow
:
Int
?
=
-
1
var
step
:
Int
?
=
-
1
var
notFillNum
:
Int
?
=
-
1
var
isLiveOverseaYear
:
Int
?
=
-
1
var
surname
:
String
?
var
certificates
:
[
SmartAny
]?
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
()
{
return
.
none
}
}
// YHFamilyMemberProtocol
// YHFamilyMemberProtocol
func
getTitle
()
->
String
{
func
getTitle
()
->
String
{
return
"兄弟姐妹"
.
local
// 1父亲 2 母亲 3 配偶 4子女 5兄弟姐妹
if
let
relation
=
relation
{
return
relation
.
local
}
return
""
}
}
func
getSubTitle
()
->
String
{
func
getSubTitle
()
->
String
{
...
@@ -706,199 +673,6 @@ class YHSubsetNamePinyin: SmartCodable {
...
@@ -706,199 +673,6 @@ class YHSubsetNamePinyin: SmartCodable {
}
}
}
}
// MARK: - 父母信息 YHParent
class
YHParent
:
SmartCodable
,
YHFormItemProtocol
{
var
id
:
Int
=
-
1
var
deceased
:
Int
=
-
1
var
custody
:
Int
=
-
1
var
nationality
:
String
?
var
orderId
:
Int
=
-
1
var
relation
:
Int
=
-
1
var
hasDegree
:
Int
=
-
1
var
hasDegreeJson
:
[
SmartAny
]?
var
follow
:
Int
=
-
1
var
statement
:
Int
=
-
1
var
subsetName
:
String
?
var
subsetNamePinyin
:
String
?
var
usedName
:
String
?
var
birthday
:
String
?
var
birthPlaceAboard
:
Int
=
-
1
var
birthPlace
:
[
SmartAny
]?
var
occupation
:
String
?
var
occupationName
:
String
?
var
operatorAme
:
String
?
var
childHasHkId
:
[
SmartAny
]?
var
hkIdentityCard
:
String
?
var
sex
:
Int
=
-
1
var
married
:
Int
=
-
1
var
nows
:
Int
=
-
1
var
address
:
[
SmartAny
]?
var
childStepchild
:
[
SmartAny
]?
var
childInHk
:
[
SmartAny
]?
var
countryIdentity
:
[
SmartAny
]?
var
hkIdentity
:
String
?
var
hkIdentityOther
:
String
?
var
liveCountry
:
String
?
var
isHandled
:
Int
=
-
1
var
finishFollow
:
Int
=
-
1
var
step
:
Int
=
-
1
var
notFillNum
:
Int
=
-
1
var
certificates
:
[
SmartAny
]?
var
isLiveOverseaYear
:
Int
=
-
1
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
certificates
=
"certificates"
case
isLiveOverseaYear
=
"is_live_oversea_year"
}
required
init
()
{
}
// YHFamilyMemberProtocol
func
getTitle
()
->
String
{
if
sex
==
0
{
return
"父亲"
.
local
}
return
"母亲"
.
local
}
func
getSubTitle
()
->
String
{
return
""
}
}
// MARK: - 配偶 YHSpouse
class
YHSpouse
:
SmartCodable
,
YHFormItemProtocol
{
var
id
:
Int
=
-
1
var
deceased
:
Int
=
-
1
var
custody
:
Int
=
-
1
var
nationality
:
String
?
var
orderId
:
Int
=
-
1
var
relation
:
String
?
var
hasDegree
:
String
?
var
hasDegreeJson
:
[
YHHasDegreeJson
]?
var
follow
:
Int
=
-
1
var
statement
:
Int
=
-
1
var
subsetName
:
String
?
var
subsetNamePinyin
:
YHSubsetNamePinyin
?
var
usedName
:
String
?
var
birthday
:
String
?
var
birthPlaceAboard
:
Int
=
-
1
var
birthPlace
:
YHAddress
?
var
occupation
:
String
?
var
occupationName
:
String
?
var
operatorAme
:
SmartAny
?
var
childHasHkId
:
YHPurpleChild
?
var
hkIdentityCard
:
String
?
var
sex
:
Int
=
-
1
var
married
:
String
?
var
nows
:
Int
=
-
1
var
address
:
YHAddress
?
var
childStepchild
:
YHChildStepchildClass
?
var
childInHk
:
YHPurpleChild
?
var
countryIdentity
:
[
SmartAny
]?
var
hkIdentity
:
String
?
var
hkIdentityOther
:
String
?
var
liveCountry
:
String
?
var
isHandled
:
Int
=
-
1
var
finishFollow
:
Int
=
-
1
var
step
:
Int
=
-
1
var
notFillNum
:
Int
=
-
1
var
isLiveOverseaYear
:
Int
=
-
1
var
surname
:
String
?
var
certificates
:
YHCertificates
?
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
()
{
}
// YHFamilyMemberProtocol
func
getTitle
()
->
String
{
return
"配偶"
.
local
}
func
getSubTitle
()
->
String
{
return
""
}
}
// MARK: - YHCertificates
// MARK: - YHCertificates
class
YHCertificates
:
SmartCodable
{
class
YHCertificates
:
SmartCodable
{
...
@@ -942,20 +716,6 @@ class YHCNIdentityCard: SmartCodable {
...
@@ -942,20 +716,6 @@ class YHCNIdentityCard: SmartCodable {
}
}
}
}
// MARK: - YHPurpleChild
class
YHPurpleChild
:
SmartCodable
{
required
init
()
{
}
var
has
:
String
?
enum
CodingKeys
:
String
,
CodingKey
{
case
has
=
"has"
}
}
// MARK: - YHHasDegreeJson
// MARK: - YHHasDegreeJson
class
YHHasDegreeJson
:
SmartCodable
{
class
YHHasDegreeJson
:
SmartCodable
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment