基本资料bug修复

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/VM/YHGCBasicInfoFillViewModel.swift

@@ -66,10 +66,10 @@ extension YHGCBasicInfoFillViewModel {
         do {
             // 主申请人
             if let model = dataModelForBasicInfo.applicant {
-                let answer1 = model.deny == 0 ? "N" : "Y"
+                let answer1 = getAnswerString(model.deny) //model.deny == 0 ? "N" : "Y"
                 let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝签发签证或入境香港，或被遣返、遣送和要求离开香港？", answer: answer1, info: model.denyContent)
 
-                let answer2 = model.crime == 0 ? "N" : "Y"
+                let answer2 = getAnswerString(model.crime) //model.crime == 0 ? "N" : "Y"
                 let model2 = YHBasicInfoCellModel(question: "2、是否曾因任何罪行或违法行为在香港或其他地方被定罪？", answer: answer2, info: model.crimeContent)
                 let arr = [model1, model2]
                 let sessionModel = YHBasicInfoSessionModel(sessionTitle: "主申请人", arrQuestionItem: arr)
@@ -80,10 +80,10 @@ extension YHGCBasicInfoFillViewModel {
         do {
             // 配偶
             if let spouse = dataModelForBasicInfo.spouse {
-                let answer1 = spouse.deny == 0 ? "N" : "Y"
+                let answer1 = getAnswerString(spouse.deny) //spouse.deny == 0 ? "N" : "Y"
                 let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝签发签证或入境香港，或被遣返、遣送和要求离开香港？", answer: answer1, info: spouse.denyContent)
 
-                let answer2 = spouse.crime == 0 ? "N" : "Y"
+                let answer2 = getAnswerString(spouse.crime) //spouse.crime == 0 ? "N" : "Y"
                 let model2 = YHBasicInfoCellModel(question: "2、是否曾因任何罪行或违法行为在香港或其他地方被定罪？", answer: answer2, info: spouse.crimeContent)
                 let arr = [model1, model2]
 
@@ -96,10 +96,10 @@ extension YHGCBasicInfoFillViewModel {
             // 子女 - xxx
             if let arrChild = dataModelForBasicInfo.child {
                 for item in arrChild {
-                    let answer1 = item.deny == 0 ? "N" : "Y"
+                    let answer1 = getAnswerString(item.deny) //item.deny == 0 ? "N" : "Y"
                     let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝签发签证或入境香港，或被遣返、遣送和要求离开香港？", answer: answer1, info: item.denyContent)
                     
-                    let answer2 = item.crime == 0 ? "N" : "Y"
+                    let answer2 = getAnswerString(item.crime) //item.crime == 0 ? "N" : "Y"
                     let model2 = YHBasicInfoCellModel(question: "2、是否曾因任何罪行或违法行为在香港或其他地方被定罪？", answer: answer2, info: item.crimeContent)
                     let arr = [model1, model2]
 
@@ -112,6 +112,19 @@ extension YHGCBasicInfoFillViewModel {
         }
         arrBasicInfoSessionDataForEdit = arrData
     }
+    
+    private func getAnswerString(_ answer: Int) -> String {
+        switch answer {
+        case 0:
+            return "N"
+        case 1:
+            return "Y"
+        case 2:
+            return ""
+        default:
+            return ""
+        }
+    }
 }
 
 extension YHGCBasicInfoFillViewModel {