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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHInformationPerfectModel.swift

@@ -70,7 +70,6 @@ class YHInformationPerfectModel {
             }
         }
     }
-    var isNextDoingCell : Bool = false
     var isFirstCell : Bool = false
     var isLastestCell : Bool = false
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/V/YHEducationCertificateConfirmCell.swift

@@ -43,7 +43,7 @@ class YHEducationCertificateConfirmCell: UITableViewCell {
                 }
                 if let isSelectTrue = isSelectTrue { // 进行过选择
                     if isSelectTrue == false {
-                        let a: ASAttributedString = .init("若不能提供以上证明材料，将导致您的该收入", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
+                        let a: ASAttributedString = .init("若不能提供以上证明材料，将导致您的该学历", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
                         let b: ASAttributedString = .init("不被认可不予加分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.failColor))
                         let c: ASAttributedString = .init("，请尽可能准备以上材料并修改此选项。", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
                         tipsLabel.attributed.text = a+b+c

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/M/YHWorkExpInfoPreviewModel.swift

@@ -30,7 +30,7 @@ class YHWorkExpInfoPreviewDetail_NewModel : SmartCodable {
     var professional_level : String = ""
     var work_duty : String = ""
     var work_highlights : String = ""
-    var attachment_list : [YHWorkExpFilePreview_NewModel] = []
+    var attachment_list : [WorkExpFilePreviewModel] = []
     var why_work_time_overlap : String = ""
     var why_work_time_empty : String = ""
     var position_list : [YHWorkExpPosition_NewModel] = []
@@ -131,8 +131,10 @@ class WorkExpInfoPreviewDetailModel: SmartCodable {
 }
 
 class WorkExpFilePreviewModel: SmartCodable {
-    var fileName: String  = ""
-    var fileUrl: String  = ""
+    var fileName : String  = ""
+    var fileUrl : String  = ""
+    var fileSize : Int = 0
+    
     required init() {
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -53,13 +53,14 @@ extension YHPreviewViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHWorkExpInfoPreviewModel.deserialize(from: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHWorkExpInfoPreview_NewModel.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBackBlock(false,error)
                     return
                 }
-                workExpInfoPreviewModel = resultModel
-                installDataForWorkExpInfo()
+                
+                workExpInfoPreviewModel2 = resultModel
+                installDataForWorkExp_NewInfo()
                 callBackBlock(true,nil)
             } else {
                 let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
@@ -237,6 +238,139 @@ extension YHPreviewViewModel {
     
 }
 private extension YHPreviewViewModel {
+    
+    //组装 工作经验 数据
+    func installDataForWorkExp_NewInfo() {
+        guard let model0 = workExpInfoPreviewModel2 else { return}
+        arrDataForWorkExpInfoNew.removeAll()
+        if let list = model0.list,list.isEmpty == false {
+            
+            for(index,model) in list.enumerated() {
+                var arr1 : [YHPreviewQuestionAndAnswerModel] = []
+                do {
+                    //1.基本信息
+                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "用人单位：", answer: model.company_name)
+                    let tmp2 = YHPreviewQuestionAndAnswerModel(question: "公司是否上市：", answer: model.is_ipo_company ? "是" : "否")
+                    arr1.append(contentsOf: [tmp1,tmp2])
+                    if model.is_ipo_company {
+                        let tmp2 = YHPreviewQuestionAndAnswerModel(question: "您是否拥有此公司所有权(10%以上股权)：", answer: model.has_ipo_company_equity ? "是" : "否")
+                        arr1.append(tmp2)
+                       
+                    } else {
+                        let tmp2 = YHPreviewQuestionAndAnswerModel(question: "您是否拥有此公司所有权(50%以上股权)：", answer: model.has_company_equity ? "是" : "否")
+                        arr1.append(tmp2)
+                        
+                        if model.has_company_equity {
+                            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "您公司营业收入是否在500W港币或以上：", answer: model.has_sales_reached ? "是" : "否")
+                            arr1.append(tmp2)
+                        }
+                        
+                        if model.has_sales_reached {
+                            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "您的公司所在地：", answer: "缺少地址字段")
+                            arr1.append(tmp2)
+                            
+                        }
+                    }
+                    
+                    
+                    
+                    
+                    
+//                    var title = "-"
+//                    if let item = model.location {
+//                        if item.country.contains("中国") {
+//                            title = "国内 "
+//                            if item.area.count > 1 {
+//                                title = title + item.area[0] + "/" + item.area[1]
+//                            }
+//                        } else {
+//                            title = "国外 " + item.country + "-" + item.foreign
+//                        }
+//                    }
+//                    
+//                    
+//                    let tmp7 = YHPreviewQuestionAndAnswerModel(question: "入职年月：", answer: model.enter_time)
+//                    let tmp8 = YHPreviewQuestionAndAnswerModel(question: "离职年月：", answer: model.leave_time)
+//                    let tmp9 = YHPreviewQuestionAndAnswerModel(question: "工作证明文件：", answer: model.work_certificate)
+                    
+                    
+//                    let tmp10 = YHPreviewQuestionAndAnswerModel(question: "职责性质：", answer: model.duty)
+//                    title = model.international_work_experience == 0 ? "否" : "是"
+//                    let tmp11 = YHPreviewQuestionAndAnswerModel(question: "相关工作是否属国际工作经验：", answer:title)
+//                    let tmp12 = YHPreviewQuestionAndAnswerModel(question: "企业人数规模：", answer:String(model.company_member_total))
+//                    
+//                    let tempppp = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .structure)
+//                    let tmp13 = YHPreviewQuestionAndAnswerModel(question: "行政架构层级：", answer:tempppp)
+//                    let tmp14 = YHPreviewQuestionAndAnswerModel(question: "下属管理人数：", answer:String(model.company_manage_total))
+//                    
+//                    var ttt = ""
+//                    if model.turnover == 0 {
+//                        ttt = "0"
+//                    } else {
+//                        ttt = String(model.turnover).defaultStringIfEmpty()
+//                    }
+//                    let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:ttt)
+//                    
+//                    let tempppp0 = YHConstantArrayData.getShowNameBy(indexStr: String(model.professional_level), type: .level)
+//                    let tmp16 = YHPreviewQuestionAndAnswerModel(question: "职业水平类别：", answer:tempppp0)
+//                    arr1.append(contentsOf: [tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12,tmp13,tmp14,tmp15,tmp16])
+                }
+                
+                let dataModel1 = YHWorkExpDataModel(title: "", data: arr1)
+                
+                var arr2 : [YHPreviewQuestionAndAnswerModel] = []
+                do {
+                    //2.
+//                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "公司业务性质/范畴/所属行业：", answer:model.business_nature.defaultStringIfEmpty())
+//                    let tmp2 = YHPreviewQuestionAndAnswerModel(question: "工作职责：", answer:model.wduty)
+//                    let tmp3 = YHPreviewQuestionAndAnswerModel(question: "工作亮点：", answer:model.highlights)
+//                    
+//                    arr2.append(contentsOf: [tmp1,tmp2,tmp3])
+                }
+                let dataModel2 = YHWorkExpDataModel(title: "", data: arr2)
+                
+                var arr3 : [Any] = []
+                do {
+                    //3.项目介绍
+//                    if let items = model.projects,items.isEmpty == false {
+//                        for(index,item) in items.enumerated() {
+//                            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "项目名称", answer:item.project_name)
+//                            let title  = item.project_start_time + "-" + item.project_end_time
+//                            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "项目时间", answer:title)
+//                            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "项目业绩/亮点", answer:item.project_highlights)
+//                            let arrT : [YHPreviewQuestionAndAnswerModel] = [tmp1,tmp2,tmp3]
+//                            
+//                            
+//                            let addationIndex = list.count > 1 ? String(index + 1) : ""
+//                            let dataModelTemp = YHWorkExpDataModel(title: "项目介绍" + addationIndex, data: arrT)
+//                            arr3.append(dataModelTemp)
+//                        }
+//                    }
+                }
+                let dataModel3 = YHWorkExpDataModel(title: "", data: arr3)
+                
+                var arr4 : [Any] = []
+                do {
+                    //4.简历/工作总结：
+//                    if let items = model.file,items.isEmpty == false {
+//                        var arrT : [Any] = []
+//                        for(_,item) in items.enumerated() {
+//                            arrT.append(item)
+//                        }
+//                        let dataModelTemp = YHWorkExpDataModel(title: "简历/工作总结：", data: arrT)
+//                        arr4.append(dataModelTemp)
+//                    }
+                }
+                
+                let dataModel4 = YHWorkExpDataModel(title: "", data: arr4)
+                
+                let addationIndex = list.count > 1 ? String(index + 1) : ""
+                let mmmm = YHPreviewInfoSessionModel(cellType: .workExp, cellTitle: "主申请人工作经历" + addationIndex, cellData4: [dataModel1,dataModel2,dataModel3,dataModel4])
+                arrDataForWorkExpInfo.append(mmmm)
+            }
+        }
+    }
+    
     //组装 工作经验 数据
     func installDataForWorkExpInfo() {
         guard let model0 = workExpInfoPreviewModel else { return}
@@ -253,7 +387,6 @@ private extension YHPreviewViewModel {
                     let tmp4 = YHPreviewQuestionAndAnswerModel(question: "用人单位官网：", answer: model.company_website.defaultStringIfEmpty())
                     var title = "-"
                     if let item = model.location {
-//                        title = item.country + "-"  + item.details
                         if item.country.contains("中国") {
                             title = "国内 "
                             if item.area.count > 1 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -332,8 +332,6 @@ extension YHServiceCenterMainViewModel {
                         //已完成6  或者 已提交7
                         model.isDoing = false
                         model.isFinished = true
-                        
-//                        model.isNextDoingCell = false
                     } else {
                         if index < targetIndex {
                             model.isFinished = true
@@ -344,18 +342,9 @@ extension YHServiceCenterMainViewModel {
                         if index == targetIndex  {
                             model.isDoing = true
                         }
-                        
-//                        if item == target + 1 {
-//                            model.isNextDoingCell = true
-//                        } else {
-//                            model.isNextDoingCell = false
-//                        }
                     }
-                    
                 }
-                
                 callBackBlock(true,nil)
-                
             } else {
                 let err : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg)
                 self.arrInfoFillStep = []

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

@@ -120,9 +120,6 @@ class YHAllApiName {
         static let homeLifeDetail = "super-app/goods-info"
     }
     
-    
-   
-    
     //order 模块
     struct Order {
         //合同列表