添加其他信息的 文件

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -78,6 +78,9 @@
 		04E86E0D2B70D51D00A35F4B /* YHWebViewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */; };
 		04E86E0F2B70DE9400A35F4B /* YHSpouseInfoContainerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0E2B70DE9400A35F4B /* YHSpouseInfoContainerVC.swift */; };
 		6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
+		A50AB89B2B81E96E00C227DE /* YHOtherInfoFillModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50AB89A2B81E96E00C227DE /* YHOtherInfoFillModel.swift */; };
+		A50AB89D2B81F1FB00C227DE /* YHOtherInfoFillViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50AB89C2B81F1FB00C227DE /* YHOtherInfoFillViewModel.swift */; };
+		A50AB89F2B82067200C227DE /* YHOtherInfoFillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50AB89E2B82067200C227DE /* YHOtherInfoFillCell.swift */; };
 		A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
 		A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
 		A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */; };
@@ -309,6 +312,9 @@
 		04E86E0E2B70DE9400A35F4B /* YHSpouseInfoContainerVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSpouseInfoContainerVC.swift; sourceTree = "<group>"; };
 		58C2405158A4A6632D0E7460 /* Pods-galaxy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.debug.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.debug.xcconfig"; sourceTree = "<group>"; };
 		987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_galaxy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A50AB89A2B81E96E00C227DE /* YHOtherInfoFillModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherInfoFillModel.swift; sourceTree = "<group>"; };
+		A50AB89C2B81F1FB00C227DE /* YHOtherInfoFillViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherInfoFillViewModel.swift; sourceTree = "<group>"; };
+		A50AB89E2B82067200C227DE /* YHOtherInfoFillCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherInfoFillCell.swift; sourceTree = "<group>"; };
 		A51044172B493675006B60BB /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		A51044192B495DD0006B60BB /* UIView+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
 		A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterSecondViewController.swift; sourceTree = "<group>"; };
@@ -813,6 +819,7 @@
 		A5234E392B72348C00A33433 /* M */ = {
 			isa = PBXGroup;
 			children = (
+				A50AB89A2B81E96E00C227DE /* YHOtherInfoFillModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -820,6 +827,7 @@
 		A5234E3A2B72349300A33433 /* V */ = {
 			isa = PBXGroup;
 			children = (
+				A50AB89E2B82067200C227DE /* YHOtherInfoFillCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -835,6 +843,7 @@
 		A5234E3C2B72349F00A33433 /* VM */ = {
 			isa = PBXGroup;
 			children = (
+				A50AB89C2B81F1FB00C227DE /* YHOtherInfoFillViewModel.swift */,
 			);
 			path = VM;
 			sourceTree = "<group>";
@@ -1504,6 +1513,7 @@
 				0468D4512B67721700CFB916 /* YHMainInformationCardTableViewCell.swift in Sources */,
 				0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */,
 				A5ACE9512B4564F7002C94D2 /* YhConstant.swift in Sources */,
+				A50AB89F2B82067200C227DE /* YHOtherInfoFillCell.swift in Sources */,
 				A5FD63FC2B68DA6600D1D9DA /* YHPersonInfoCellModel2.swift in Sources */,
 				A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
 				A5FD63E42B678AC000D1D9DA /* YHPersonInformMainViewController.swift in Sources */,
@@ -1549,6 +1559,7 @@
 				0468D4432B61F76800CFB916 /* YHMainApplicantInformationViewController.swift in Sources */,
 				0468D4262B495A5400CFB916 /* YHPickPhoneAddressViewController.swift in Sources */,
 				A5C5B32D2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift in Sources */,
+				A50AB89D2B81F1FB00C227DE /* YHOtherInfoFillViewModel.swift in Sources */,
 				0468D47C2B68A08600CFB916 /* YHAddressPickView.swift in Sources */,
 				A5FD63D82B6603A500D1D9DA /* YHScoreResultView.swift in Sources */,
 				A5ACE9342B4564F7002C94D2 /* YHAllApiName.swift in Sources */,
@@ -1584,6 +1595,7 @@
 				A5167B332B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift in Sources */,
 				A5C5B3122B57B47D00A7C5D1 /* YHDavidCell0.swift in Sources */,
 				A5FD63FA2B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift in Sources */,
+				A50AB89B2B81E96E00C227DE /* YHOtherInfoFillModel.swift in Sources */,
 				A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */,
 				0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
 				A5234E282B6E2EED00A33433 /* YHBasicInfoFillViewController.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift

@@ -177,7 +177,7 @@ extension YHBasicInfoFillViewModel {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.updateBasicInfoApi
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
-            guard let self = self else { return }
+            guard self != nil else { return }
             guard let model = NetBaseModel.deserialize(dict: json) else {
                 let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
                 callBackBlock(false,error)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/M/YHOtherInfoFillModel.swift

+//
+//  YHOtherInfoFillModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/2/18.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHOtherInfoFillModel: SmartCodable {
+    var orderID: String = ""
+    var residences: [Residence] = []
+    var language_detail: LanguageDetail?
+    var profession: Profession?
+    var question: Question?
+    
+    required init() {
+        
+    }
+}
+
+// MARK: - Residence
+class Residence : SmartCodable {
+    var id: Int = -1
+    var country: String = ""
+    var startTime: String = ""
+    var endTime: String = ""
+    
+    var orderID: Int = -1
+    var endTimeChecked: Bool = false
+    
+    
+    required init() {
+        
+    }
+}
+
+// MARK: - LanguageDetail
+class LanguageDetail : SmartCodable  {
+    var schoolAddressAboard: Bool = false
+    var level: Int = -1
+    var name: String = ""
+    var remark: String = ""
+    
+    required init() {
+        
+    }
+}
+
+// MARK: - Profession
+class Profession : SmartCodable{
+    var option: Int = -1
+    var remark: String = ""
+    
+    required init() {
+        
+    }
+}
+
+// MARK: - Question
+class Question : SmartCodable {
+    var professionalQualification : Int = -1
+    var paper : Int = -1
+    var scholarship : Int = -1
+    var mediaInterview : Int = -1
+    var academicAwards : String = ""
+    var otherInformation: String = ""
+    
+    required init() {
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift

+//
+//  YHOtherInfoFillCell.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/2/18.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHOtherInfoFillCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHOtherInfoFillCell"
+    var dataModel: YHOtherInfoFillModel? {
+        didSet {
+            updateUI()
+        }
+    }
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+}
+
+extension YHOtherInfoFillCell {
+    func updateUI() {
+        
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift

+//
+//  YHOtherInfoFillViewModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/2/18.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHOtherInfoFillViewModel: YHBaseViewModel {
+    var otherInfoFillData : YHOtherInfoFillModel?
+}
+
+extension YHOtherInfoFillViewModel {
+    
+    //获取其他资料信息
+    func getOtherInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+//        createOrgBasiceInfoData()
+//        callBackBlock(true,nil)//先返回数据 让界面展示相关的UI
+        
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.otherInfoFillApi
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            guard let model = NetBaseModel.deserialize(dict: json) else {
+                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
+                callBackBlock(false,error)
+                return
+            }
+            printLog("model 是 ==> \(model)")
+            let dic = model.data?.peel
+            guard let resultModel = YHOtherInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                callBackBlock(false,nil)
+                return
+            }
+            
+            self.otherInfoFillData = resultModel
+            //根据返回值 组装 真实的数据
+            callBackBlock(true,nil)
+        } failBlock: { err in
+            callBackBlock(false,err)
+        }
+    }
+    
+    
+    //保存其他资料信息
+    func saveOtherInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.updateBasicInfoApi
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard self != nil else { return }
+            guard let model = NetBaseModel.deserialize(dict: json) else {
+                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
+                callBackBlock(false,error)
+                return
+            }
+            printLog("model 是 ==> \(model)")
+//            let dic = model.data?.peel
+//            guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+//                callBackBlock(false,nil)
+//                return
+//            }
+//
+//            self.dataModelForBasicInfo = resultModel
+            //根据返回值 组装 真实的数据
+            callBackBlock(true,nil)
+        } failBlock: { err in
+            callBackBlock(false,err)
+        }
+    }
+    
+}

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -27,8 +27,10 @@ class YHAllApiName {
         //我的评分结果
         static let scoreDetailApi = "frontend/order-assessment/score_detail"
         
-        
-        
+        //获取其他资料填写信息
+        static let otherInfoFillApi = "frontend/order/getOrderOtherInformation"
+        //保存其他资料信息
+        static let  updateOtherInfoApi = "frontend/order/updateOrderOtherInformation"