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
6b2e7dd5
Commit
6b2e7dd5
authored
Dec 25, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 修改字段
parent
8493e7a2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
YHFamilyInitialInfo.swift
...我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift
+5
-5
YHGCChildPrimaryInfoVC.swift
...milyMember(家庭成员)/C/Child(子女)/YHGCChildPrimaryInfoVC.swift
+1
-1
YHGCSpousePrimaryInfoVC.swift
...lyMember(家庭成员)/C/Spouse(配偶)/YHGCSpousePrimaryInfoVC.swift
+1
-1
YHGCFamilyMemberInfoListVC.swift
...流程)/FamilyMember(家庭成员)/C/YHGCFamilyMemberInfoListVC.swift
+1
-1
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift
View file @
6b2e7dd5
...
@@ -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年及以上
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Child(子女)/YHGCChildPrimaryInfoVC.swift
View file @
6b2e7dd5
...
@@ -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
]
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Spouse(配偶)/YHGCSpousePrimaryInfoVC.swift
View file @
6b2e7dd5
...
@@ -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
)
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/YHGCFamilyMemberInfoListVC.swift
View file @
6b2e7dd5
...
@@ -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
...
...
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