Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 学历
  // 家庭成员
  //  家庭成员
  我的签字 cell
  // 家庭成员
  // 家庭成员

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterSecondViewController.swift

@@ -181,11 +181,11 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
             vc.model = serviceCenterMainReqVM.allInfoScoreModel
             navigationController?.pushViewController(vc)
         } else if model.type == 4 {
-            let vc = YHMySignatureListViewController()
+            let vc = YHMyDocumentsListViewController()
             vc.orderId = orderId ?? 0
             navigationController?.pushViewController(vc)
         } else if model.type == 5 {
-            let vc = YHMyDocumentsListViewController()
+            let vc = YHMySignatureListViewController()
             vc.orderId = orderId ?? 0
             navigationController?.pushViewController(vc)
         } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHCollegeSearchViewController.swift

@@ -91,7 +91,7 @@ class YHCollegeSearchViewController: YHBaseViewController {
            [weak self]  text in
             guard let self = self else { return }
             searchCollegeName = text
-            if Date().timeIntervalSince1970 * 1000 - lastSearchTime * 1000 >= 500 {
+            if Date().timeIntervalSince1970  - lastSearchTime >= 1.0 {
                 lastSearchTime = Date().timeIntervalSince1970
                 searchCollege()
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift

@@ -172,6 +172,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             if let targetStep = getStepForArrayIndex(index) {
                 currentStep = targetStep
             }
+            requestDetail()
             print("index:\(index)")
         }
         
@@ -192,7 +193,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
                             self.navigationController?.popViewController()
                             return
                         }
-                        
+                        requestDetail()
                         if let cur = getArrayIndexOfCurrentStep(), let item = stepVCs[safe:cur+1] {
                             currentStep = item.step
                             if cur+1 > stepView.maxIndex {
@@ -270,6 +271,25 @@ extension YHChildInfoContainerVC {
         }
     }
     
+    func requestDetail() {
+        guard let child = child else { return }
+        if orderId <= 0 || child.detailId <= 0 {
+            print("订单号或成员ID不存在")
+            return
+        }
+        self.familyRequest.requestFamilyMemberInfo(orderId:orderId, detailId:child.detailId) { 
+            
+            [weak self] detail, error in
+            guard let self = self else { return }
+            if let detail = detail {
+                self.child = detail
+                for vcItem in stepVCs {
+                    vcItem.vc.loadInfo()
+                }
+            }
+        }
+    }
+    
     func saveInfoSilent() {
         saveInfo(isSubmit:false, isShowLoading:false, callBack:nil)
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -295,7 +295,7 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     guard let child = child else { return }
 
                     if detailItem.type == .detailAddress {
-                        if child.address.isInChina() {
+                        if child.isLiveInChina() {
                             child.address.details = text ?? ""
                         } else {
                             child.address.foreign = text ?? ""
@@ -466,7 +466,7 @@ extension YHChildPrimaryInfoVC {
             if isEmptyString(child.address.country) {
                 return false
             }
-            if child.address.isInChina() {
+            if child.isLiveInChina() {
                 if isEmptyArray(child.address.area) {
                     return false
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -588,7 +588,7 @@ extension YHBrotherInfoVC {
     // 静默保存 不显示toast和loading
     func saveInfoSilent() {
         guard let brotherInfo = brotherInfo else { return }
-        if brotherInfo.id == 0 { return }
+        if brotherInfo.detailId == 0 { return }
         saveInfo(isSubmit: false, isLoading: false, callBack: nil)
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -627,7 +627,7 @@ extension YHParentInfoVC {
     // 静默保存 不显示toast和loading
     func saveInfoSilent() {
         guard let parentInfo = parentInfo else { return }
-        if parentInfo.id == 0 { return }
+        if parentInfo.detailId == 0 { return }
         saveInfo(isSubmit: false, isLoading: false, callBack: nil)
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift

@@ -190,6 +190,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             if let targetStep = getStepForArrayIndex(index) {
                 currentStep = targetStep
             }
+            requestDetail()
             print("index:\(index)")
         }
         
@@ -233,7 +234,10 @@ extension YHSpouseInfoContainerVC {
     }
     
     func saveInfoSilent() {
-        saveInfo(isSubmit: false, isLoading: false, callBack: nil)
+        saveInfo(isSubmit: false, isLoading: false) {
+           [weak self] success in
+           
+        }
     }
     
     
@@ -249,7 +253,7 @@ extension YHSpouseInfoContainerVC {
                             self.navigationController?.popViewController()
                             return
                         }
-                        
+                        requestDetail()
                         if let cur = getArrayIndexOfCurrentStep(), let item = stepVCs[safe:cur+1] {
                             currentStep = item.step
                             if cur+1 > stepView.maxIndex {
@@ -264,16 +268,20 @@ extension YHSpouseInfoContainerVC {
     }
     
     func requestDetail() {
-//        if orderId <= 0 || spouse.id <= 0 {
-//            print("订单号或成员id不存在")
-//            return
-//        }
-//        self.familyRequest.requestFamilyMemberInfo(orderId:orderId, detailId:spouse.id) { 
-//            [weak self] detail, error in
-//            if let detail = detail {
-//                spouse = detail
-//            }
-//        }
+        if orderId <= 0 {
+            print("订单号不存在")
+            return
+        }
+        self.familyRequest.requestFamilyMemberDetailInfo(memberType:.spouse, orderId:orderId) { 
+            [weak self] detail in
+            guard let self = self else { return }
+            if let detail = detail {
+                self.spouse = detail
+                for vcItem in stepVCs {
+                    vcItem.vc.loadInfo()
+                }
+            }
+        }
     }
     
     // 【WARNING!】步骤step和在数组中的下标有时候并不是一一对应

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -250,7 +250,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     
                     if detailItem.type == .detailAddress {
                         
-                        if spouse.address.isInChina() {
+                        if spouse.isLiveInChina() {
                             spouse.address.details = text ?? ""
                         } else {
                             spouse.address.foreign = text ?? ""
@@ -387,7 +387,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
             if isEmptyString(spouse.address.country) {
                 return false
             }
-            if spouse.address.isInChina() {
+            if spouse.isLiveInChina() {
                 if isEmptyArray(spouse.address.area) {
                     return false
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift

@@ -235,14 +235,14 @@ extension YHFamilyMemberInfoListVC {
     // 请求家庭成员信息
     func requestFamilyInfo() {
         
-        self.familyRequest.getFamilyInfo(params: ["order_id": self.orderId]) { [weak self] success, error in
+        self.familyRequest.getFamilyInfoList(orderId:orderId) { [weak self] detail, error in
             guard let self = self else { return }
-            if success {
-                familyMemberInfo = self.familyRequest.familyInfo
+            if let detail = detail {
+                familyMemberInfo = detail
             }
             loadFamilyMember()
         }
-    }
+    }     
     
     // 添加兄弟姐妹子女
     func addFamilyMember(_ type:YHFamilyMemberType) {
@@ -439,7 +439,7 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
                             
                             if !sure { return }
                             
-                            self.deleteFamilyMember(orderId: self.orderId, memberId:child.id) {
+                            self.deleteFamilyMember(orderId: self.orderId, memberId:child.detailId) {
                                 [weak self] success in
                                 guard let self = self else { return }
                                 
@@ -467,7 +467,7 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
                             
                             if !sure { return }
                             
-                            self.deleteFamilyMember(orderId: self.orderId, memberId:brother.id) {
+                            self.deleteFamilyMember(orderId: self.orderId, memberId:brother.detailId) {
                                 [weak self] success in
                                 guard let self = self else { return }
                                 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -587,7 +587,7 @@ enum YHFamilyMemberType: Int {
 
 class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
-    var id: Int = 0
+    var detailId: Int = 0
     var nationality: String = ""
     var orderId: Int = 0
     var relation: String = ""
@@ -675,7 +675,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     }
 
     enum CodingKeys: String, CodingKey {
-        case id = "id"
+        case detailId = "id"
         case deceased = "deceased"
         case custody = "custody"
         case nationality = "nationality"
@@ -874,6 +874,16 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         self.childStepchild.has = (val ? "Y" : "N")
     }
     
+    // 是否住在中国
+    func isLiveInChina() ->Bool {
+        // 默认在中国
+        if isEmptyString(self.address.country) { return true }
+        if self.address.country.contains("中国") {
+            return true
+        }
+        return false
+    }
+    
     // 根据生日推算年龄
     func getAge(birthday:String) ->Int {
         let arr = birthday.components(separatedBy: YHDatePickView.separator)
@@ -986,16 +996,6 @@ class YHAddress: SmartCodable {
         
     }
     
-    // 是否在中国
-    func isInChina() ->Bool {
-        // 默认在中国
-        if isEmptyString(country) { return true }
-        if country.contains("中国") {
-            return true
-        }
-        return false
-    }
-    
     // 清空地址信息
     func clearAddress() {
         self.area = []

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift

@@ -9,38 +9,34 @@
 
 class YHFamilyRequestViewModel {
     
-    var familyInfo:YHFamilyMemberGroupInfo?
-
     //请求所有家庭成员信息
-     func getFamilyInfo(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+     func getFamilyInfoList(orderId:Int, callBackBlock:@escaping (_ listInfo: YHFamilyMemberGroupInfo?,_ error:YHErrorModel?)->()) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoApi
-         
+        let params = ["order_id": orderId]
          YHHUD.show(.progress(message: "数据加载中..."))
         
-        let _ = YHNetRequest.getRequest(url: strUrl, params:params) {[weak self] json, code in
+        let _ = YHNetRequest.getRequest(url: strUrl, params:params) { json, code in
             YHHUD.hide()
-            
-            guard let self = self else { return }
-             
+                         
             printLog("model 是 ==> \(json)")
             let dic = json.data
             
             if code == NetWorkCode.success.rawValue {
                 guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? Dictionary ) else {
-                    callBackBlock(false, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
+                    callBackBlock(nil, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
                     return
                 }
-                familyInfo = resultModel.checkDefaultValue()
-                callBackBlock(true,nil)
+                _ = resultModel.checkDefaultValue()
+                callBackBlock(resultModel, nil)
                 
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(false, error)
+                callBackBlock(nil, error)
             }
             
         } failBlock: { err in
-            callBackBlock(false,err)
+            callBackBlock(nil, err)
         }
     }
     
@@ -52,14 +48,12 @@ class YHFamilyRequestViewModel {
         }
 
        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoApi
-//       let strUrl = "http://192.168.34.187:8808/" + YHAllApiName.Family.familyInfoApi
        
-       let _ = YHNetRequest.postRequest(url: strUrl, params:params) {[weak self] json, code in
+       let _ = YHNetRequest.postRequest(url: strUrl, params:params) { json, code in
            
            if isShowLoading {
                YHHUD.hide()
            }
-           guard let self = self else { return }
            printLog("model 是 ==> \(json)")
            if json.code == NetWorkCode.success.rawValue {
                callBackBlock(true,nil)
@@ -141,4 +135,25 @@ class YHFamilyRequestViewModel {
             callBackBlock(nil, err)
         }
     }
+    
+    // memberType 只能传 父亲、母亲、配偶
+    func requestFamilyMemberDetailInfo(memberType:YHFamilyMemberType, orderId:Int, callBack:((_ detail:YHFamilyMember?)->Void)?) {
+        
+        let params:[String:Any] =  ["order_id": orderId]
+        self.getFamilyInfoList(orderId:orderId) {
+            listInfo, error in
+            guard let callBack = callBack else { return }
+            if let listInfo = listInfo {
+                if memberType == .spouse {
+                    callBack(listInfo.spouse)
+                } else if memberType == .father {
+                    callBack(listInfo.father)
+                } else if memberType == .mother {
+                    callBack(listInfo.mother)
+                } else {
+                    callBack(nil)
+                }
+            }
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MySignature(我的签字)/C/YHMySignatureListViewController.swift

@@ -32,7 +32,9 @@ class YHMySignatureListViewController: YHBaseViewController {
     }
     
     func getData() {
-        
+        viewModel?.requestSignatureList("\(orderId)", callBackBlock: {[weak self] success, error in
+            guard let self = self else { return }
+        })
     }
     
     func updateDataSource() {
@@ -50,7 +52,7 @@ class YHMySignatureListViewController: YHBaseViewController {
             tableView.separatorStyle = .none
             tableView.delegate = self
             tableView.dataSource = self
-            tableView.register(cellWithClass: YHWorkExperienceListTableViewCell.self)
+            tableView.register(cellWithClass: YHMySignatureListTableViewCell.self)
             return tableView
         }()
         view.addSubview(tableView)
@@ -96,15 +98,7 @@ class YHMySignatureListViewController: YHBaseViewController {
     }
     
     @objc func submit() {
-        guard let dataSource = dataSource else { return }
-        for item in dataSource {
-            if item.vacant_num ?? 0 > 0 {
-                showPrompt = true
-                tableView.reloadData()
-                YHHUD.flash(message: "您的工作经验未全部填写完成，请先填写完成再提交")
-                return
-            }
-        }
+        
     }
 }
 
@@ -114,21 +108,14 @@ extension YHMySignatureListViewController: UITableViewDelegate, UITableViewDataS
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withClass: YHWorkExperienceListTableViewCell.self)
-        cell.showPrompt = showPrompt
-        cell.dataSource = dataSource
+        let cell = tableView.dequeueReusableCell(withClass: YHMySignatureListTableViewCell.self)
         cell.backgroundColor = .clear
         cell.contentView.backgroundColor = .clear
         return cell
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        let number = dataSource?.count ?? 0
-        if number == 0 {
-            return CGFloat(16 + 216)
-        } else {
-            return CGFloat(16 + 154 + 76 * number)
-        }
+        return CGFloat(82)
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MySignature(我的签字)/V/YHMySignatureListTableViewCell.swift

+//
+//  YHMySignatureListTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/3/8.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHMySignatureListTableViewCell: UITableViewCell {
+    var centerView: UIView!
+    var titleLabel: UILabel!
+    var subTitleLabel: UILabel!
+
+    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
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        backgroundColor = .clear
+        centerView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius6
+            return view
+        }()
+        contentView.addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.top.equalTo(7)
+            make.bottom.equalTo(-7)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.text = "主申请人工作经历"
+            label.textColor = UIColor.mainTextColor
+            return label
+        }()
+        centerView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.bottom.equalToSuperview()
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+        }
+        
+        subTitleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_R(ofSize: 12)
+            label.text = "(从最近一份全职工作开始，直至毕业后的第一份工作）"
+            label.textColor = UIColor.labelTextColor2
+            label.textAlignment = .right
+            return label
+        }()
+        centerView.addSubview(subTitleLabel)
+        subTitleLabel.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.top.bottom.equalToSuperview()
+            make.right.equalTo(-21)
+        }
+        
+    }
+    
+    func updateAllViews() {
+        
+    }
+
+}