Merge branch 'qmas-1130' into yinhe-live-1212

* qmas-1130:
  修改一处布局
  修改版本号
  几处细节修改
  // 预览
  收入记录工作经验部分金额填写，初始为0时变成空串以方便输入
  // 预览
  aaaaa
  工作经验bug修复
  // 学历
  // 学历

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6789,7 +6789,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -6934,7 +6934,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -7142,7 +7142,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -7192,7 +7192,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -17,7 +17,7 @@ class YHCollegeNameCell: UITableViewCell {
         label.textColor = .mainTextColor
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSC_B(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     

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

@@ -25,7 +25,6 @@ class YHCollegeSearchBar: UIView, UITextFieldDelegate {
     private lazy var contentView = {
         let view = UIView()
         view.backgroundColor = .contentBkgColor
-        view.layer.cornerRadius = Self.height/2.0
         view.clipsToBounds = true
         return view
     }()
@@ -47,7 +46,6 @@ class YHCollegeSearchBar: UIView, UITextFieldDelegate {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = Self.confirmBtnHeight/2.0
         btn.addTarget(self, action: #selector(confirmBtnClicked), for: .touchUpInside)
         return btn
     }()

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

@@ -17,7 +17,7 @@ class YHMajorNameCell: UITableViewCell {
         label.textColor = .mainTextColor
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSC_B(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordWorkExperienceViewController.swift

@@ -388,6 +388,9 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
                     var text = textField.text ?? ""
                     text = text.replacingOccurrences(of: "¥", with: "")
                     text = text.replacingOccurrences(of: ",", with: "")
+                    if text == "0" {
+                        text = ""
+                    }
                     textField.text = text
                 }
                 cell.didEndEditing = { [weak self] textField in

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

@@ -22,6 +22,8 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor.labelTextColor2
         lable0.font = UIFont.PFSC_R(ofSize: 14)
+        lable0.numberOfLines = 0
+        lable0.lineBreakMode = .byWordWrapping
         return lable0
     }()
     
@@ -40,10 +42,12 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
     private func setupUI() {
         addSubview(nameLable)
         nameLable.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(18)
+//            make.top.equalToSuperview().offset(18)
+            make.top.equalToSuperview()
             make.left.equalToSuperview()
-//            make.width.lessThanOrEqualTo(154)
-            make.height.equalTo(20)
+            make.width.lessThanOrEqualTo(160.fix)
+//            make.height.equalTo(20)
+            make.bottom.lessThanOrEqualToSuperview()
         }
         
         
@@ -54,11 +58,16 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
             make.left.equalTo(nameLable.snp.right).offset(10)
             make.height.greaterThanOrEqualTo(20)
             
-            make.bottom.equalToSuperview()
+//            make.bottom.equalToSuperview()
+            
+            make.bottom.lessThanOrEqualToSuperview()
         }
         nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
         subtitleLable.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         
+//        nameLable.backgroundColor = .red //for test hjl
+//        subtitleLable.backgroundColor = .yellow //for test hjl
+        
     }
 }
 
@@ -67,6 +76,31 @@ extension YHPreviewInfoNameAndSubNameItemView {
         nameLable.text = title
         subtitleLable.text = subtitle
         
+        nameLable.snp.removeConstraints()
+        subtitleLable.snp.removeConstraints()
+        
+        
+        nameLable.snp.remakeConstraints() { make in
+            make.top.equalToSuperview().offset(kMargin)
+            make.left.equalToSuperview()
+            make.width.lessThanOrEqualTo(160.fix)
+//            make.height.equalTo(20)
+            make.bottom.lessThanOrEqualToSuperview()
+        }
+        
+        
+        addSubview(subtitleLable)
+        subtitleLable.snp.remakeConstraints { make in
+            make.top.equalTo(nameLable.snp.top)
+            make.right.equalToSuperview()
+            make.left.equalTo(nameLable.snp.right).offset(10)
+            make.height.greaterThanOrEqualTo(20)
+            
+//            make.bottom.equalToSuperview()
+            
+            make.bottom.lessThanOrEqualToSuperview()
+        }
+        
         //处理特长的字符
 //        if title.contains("相关工作是否属国际工作经验：") || title.contains("公司营业额/港元(近一年)：") || title.contains("是否在海外居住满1年及以上：")   {
 //            nameLable.snp.remakeConstraints { make in

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

@@ -28,8 +28,8 @@ extension YHPreviewInfoNameAndSubNameItemsView {
             addSubview(sessionView)
             sessionView.snp.makeConstraints { make in
                 make.top.equalToSuperview()
-                make.right.equalToSuperview().offset(-18)
-                make.left.equalToSuperview().offset(18)
+                make.right.equalToSuperview().offset(-kMargin)
+                make.left.equalToSuperview().offset(kMargin)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
             lastTagView = sessionView
@@ -45,16 +45,16 @@ extension YHPreviewInfoNameAndSubNameItemsView {
             if lastTagView == nil {
                 cellView.snp.makeConstraints { make in
                     make.top.equalToSuperview()
-                    make.right.equalToSuperview().offset(-18)
-                    make.left.equalToSuperview().offset(18)
+                    make.right.equalToSuperview().offset(-kMargin)
+                    make.left.equalToSuperview().offset(kMargin)
                     make.bottom.equalToSuperview().offset(-21)
                 }
                 
             } else {
                 cellView.snp.makeConstraints { make in
-                    make.top.equalTo(lastTagView!.snp.bottom)
-                    make.right.equalToSuperview().offset(-18)
-                    make.left.equalToSuperview().offset(18)
+                    make.top.equalTo(lastTagView!.snp.bottom).offset(kMargin)
+                    make.right.equalToSuperview().offset(-kMargin)
+                    make.left.equalToSuperview().offset(kMargin)
                     make.bottom.equalToSuperview().offset(-21)
                 }
             }
@@ -70,13 +70,15 @@ extension YHPreviewInfoNameAndSubNameItemsView {
                     cellView.snp.makeConstraints { make in
                         if tmp == nil {
                             make.top.equalToSuperview()
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                             make.bottom.equalToSuperview().offset(-21)
+                            
+//                            cellView.backgroundColor = UIColor.purple//for test hjl
                         } else {
                             make.top.equalTo(tmp!.snp.bottom)
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                             make.bottom.equalToSuperview().offset(-21)
                         }
                     }
@@ -85,13 +87,15 @@ extension YHPreviewInfoNameAndSubNameItemsView {
                     cellView.snp.makeConstraints { make in
                         if tmp == nil {
                             make.top.equalToSuperview()
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
+                            
+//                            cellView.backgroundColor = UIColor.purple//for test hjl
                             
                         } else {
                             make.top.equalTo(tmp!.snp.bottom)
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                         }
                     }
                 }

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

@@ -508,21 +508,13 @@ private extension YHPreviewViewModel {
 //                    let tmp6 = YHPreviewQuestionAndAnswerModel(question: "学位类型：", answer: model.degree_type)
                     
                     
-                    var title = ""
+                    var title = "--"
                     if let item = model.school_address {
-                        if item.country.contains("中国") {
-                            title = ""
-                            if item.area.count > 1 {
-                                title = title + item.area[0] + "/" + item.area[1]
-                            }
-                        } else {
-                            title = item.country + "-" + item.foreign
+                        if !item.country.isEmpty {
+                            title = item.country
                         }
-                    } else {
-                        title = "--"
                     }
                     let tmp7 = YHPreviewQuestionAndAnswerModel(question: "上课城市：", answer:title)
-                    
                     let arr = [tmp5,tmp0,tmp1,tmp2,tmp3,tmp4,tmp7]
                     
                     let addationIndex = arr0.count > 1 ? String(index + 1) : ""

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift

@@ -149,10 +149,6 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
                 let vc = YHWorkExperienceViewController()
                 vc.workId = model.id ?? 0
                 vc.orderID = self.orderId
-                vc.isShowMessageSelect = true
-                if firstModel?.id == model.id {
-                    vc.isShowMessageSelect = false
-                }
                 self.navigationController?.pushViewController(vc, animated: true)
             }
             cell.deleteBlock = {[weak self] model in
@@ -170,11 +166,12 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
                 } else {
                     self.viewModel?.requestCreateNewWork(self.orderId, callBackBlock: {[weak self] success, error in
                         guard let self = self else { return }
-                        let vc = YHWorkExperienceViewController()
-                        vc.isShowMessageSelect = true
-                        vc.orderID = self.orderId
-                        vc.workId = self.viewModel?.workId ?? 0
-                        self.navigationController?.pushViewController(vc, animated: true)
+                        if success != 0 {
+                            let vc = YHWorkExperienceViewController()
+                            vc.orderID = self.orderId
+                            vc.workId = success
+                            self.navigationController?.pushViewController(vc, animated: true)
+                        }
                     })
                 }
             }
@@ -187,9 +184,9 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
             cell.clickBlock = { [weak self] value, index in
                 guard let self = self else { return }
                 if index == 0 {
-                    self.viewModel?.mainModel.work_time_empty_remark = value
-                } else {
                     self.viewModel?.mainModel.work_time_overlap_remark = value
+                } else {
+                    self.viewModel?.mainModel.work_time_empty_remark = value
                 }
             }
             cell.backgroundColor = .clear

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift

@@ -21,7 +21,6 @@ class YHWorkExperienceViewController: YHBaseViewController {
     var orderID: Int = 0
     var isMore: Bool = false
     var isShowPrompt: Bool = false
-    var isShowMessageSelect: Bool = true
     var isKeyboardShow: Bool = false
     var selectEditItem = YHWorkExperienceFileModel()
     var fileMessageArray: [String] = ["签字盖章的推荐信", "盖章的工作证明+签字的推荐信", "其他证明(退工单或合同+社保等证明)", "以上均不能提供"]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/Model/YHWorkExperienceDetailModel.swift

@@ -10,7 +10,7 @@ import Foundation
 import SmartCodable
 
 class YHWorkExperienceDetailModel: SmartCodable {
-    var word_id: Int  = 0
+    var work_id: Int  = 0
     var order_id: Int  = 0
     var company_name: String  = ""
     var professional_level: Int  = 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/Model/YHWorkExperienceModel.swift

@@ -46,6 +46,8 @@ enum YHWorkExperienceID: Int {
     case id20 = 19 // 高管证明文件
     case id21 = 20 // 高管在职开始时间
     case id22 = 21 // 高管在职结束时间
+    case id23 = 22 // 入职年月
+    case id24 = 23 // 离职年月
 }
 
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHSelectFileSheetView.swift

@@ -181,7 +181,7 @@ class YHSelectFileSheetView: UIView {
     }
     
     @objc func sure() {
-        var array:[YHWorkExperienceFileModel] = []
+        var array: [YHWorkExperienceFileModel] = []
         for item in dataSource {
             if item.isSelect {
                 array.append(item)
@@ -211,13 +211,17 @@ extension YHSelectFileSheetView: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHSelectFileCell.self)
         cell.updateModel(dataSource[indexPath.row])
+        cell.index = indexPath.row
         cell.editBlock = { [weak self] model in
             guard let self = self else { return }
+            var i = 0
             for item in dataSource {
-                if item.fileUrl == model.fileUrl {
+                if i == model {
                     item.isSelect = !item.isSelect
                 }
+                i = i + 1
             }
+            self.tableView.reloadData()
         }
         return cell
     }
@@ -248,8 +252,8 @@ class YHSelectFileCell: UITableViewCell {
     
     static let cellReuseIdentifier = "YHSelectFileCell"
     
-    var editBlock:((YHWorkExperienceFileModel)->())?
-    
+    var editBlock:((Int)->())?
+    var index: Int = 0
     var whiteView: UIView!
     var iconImgV: UIImageView!
     var nameLabel: UILabel!
@@ -306,7 +310,7 @@ class YHSelectFileCell: UITableViewCell {
     @objc func didEditBtnClicked() {
         editBtn.isSelected = !editBtn.isSelected
         if let editBlock = editBlock {
-            editBlock(contentItem)
+            editBlock(index)
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift

@@ -308,7 +308,7 @@ class YHWorkExperienceItemView: UIView {
             showPromptLabel.isHidden = true
         }
         
-        if dataSource.id == .id10 || dataSource.id == .id22{
+        if dataSource.id == .id10 || dataSource.id == .id22 || dataSource.id == .id24 {
             longTimeButton.isHidden = false
             nextStepImageView.isHidden = true
             if dataSource.message == "至今" {
@@ -439,6 +439,14 @@ class YHWorkExperienceItemView: UIView {
                 title = "选择高管在职结束时间"
                 lastIsTaday = true
             }
+            if dataSource?.id == .id23 {
+                title = "选择开始就职年月"
+                lastIsTaday = true
+            }
+            if dataSource?.id == .id24 {
+                title = "选择结束就职年月"
+                lastIsTaday = true
+            }
             YHDatePickView.show(type: .yyyymm, title: title, lastIsTaday: lastIsTaday, currentDay: dataSource?.message ?? "") { date in
                 self.dataSource?.message = date
                 self.updateAllViews()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceListReasonTableViewCell.swift

@@ -174,12 +174,12 @@ class YHWorkExperienceListReasonTableViewCell: UITableViewCell {
                     make.bottom.equalTo(-28)
                 }
             }
-            messageTextField.text = model?.work_time_empty_remark
+            messageTextField.text = model?.work_time_overlap_remark
             if messageTextField.text.count != 0 {
                 promptsLabel.isHidden = true
                 messageNumberLabel.text = "\(messageTextField.text.count)/1000"
             }
-            messageTwoTextField.text = model?.work_time_overlap_remark
+            messageTwoTextField.text = model?.work_time_empty_remark
             if messageTwoTextField.text.count != 0 {
                 promptsTwoLabel.isHidden = true
                 messageTwoNumberLabel.text = "\(messageTwoTextField.text.count)/1000"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperiencePositionViewModel.swift

@@ -18,8 +18,8 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
     func getBaseDataSource(_ isShowPrompt: Bool) -> [YHSectionWorkExperienceModel] {
         let item = YHWorkExperienceModel(id: .id1, isNeed: true, title: "职位名称", isUserKeyBoard: true, prompts: "请输入", message: position.position_name, isShowPrompts: isShowPrompt, alertMessage:"请输入")
         let item1 = YHWorkExperienceModel(id: .id2, isNeed: true, title: "职责性质", isUserKeyBoard: true, prompts: "请输入", message: position.wduty, isShowPrompts: isShowPrompt, alertMessage:"请输入")
-        let item2 = YHWorkExperienceModel(id: .id3, isNeed: true, title: "开始就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.entry_time, type: .time)
-        let item3 = YHWorkExperienceModel(id: .id10, isNeed: true, title: "结束就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.departure_time, type: .time)
+        let item2 = YHWorkExperienceModel(id: .id23, isNeed: true, title: "开始就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.entry_time, type: .time)
+        let item3 = YHWorkExperienceModel(id: .id24, isNeed: true, title: "结束就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.departure_time, type: .time)
         let item6 = YHWorkExperienceModel(id: .id5, isNeed: true, title: "经验领域", isUserKeyBoard: false, prompts: "请选择", message: position.experience_scope, type: .field, isShowPrompts: isShowPrompt, alertMessage:"请选择")
         let item66 = YHWorkExperienceModel(id: .id6, isNeed: true, title: "具体经验领域", isUserKeyBoard: true, prompts: "请输入", message: position.experience_sub_scope, type: .country, isShowPrompts: isShowPrompt, alertMessage:"请输入")
         let item11 = YHWorkExperienceModel(id: .id7, isNeed: true, title: "相关工作经验是否属于国际工作经验", isUserKeyBoard: false, prompts: "", message: "\(position.is_international_work_experience)", leftButtonString: "是", rightButtonString: "否")
@@ -56,7 +56,7 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
             position.position_name = item.message ?? ""
         case .id2: // 用人单位性质
             position.wduty = item.message ?? ""
-        case .id3: // 入职年月
+        case .id23: // 入职年月
             let format = DateFormatter()
             format.dateFormat = "yyyy-MM"
             if let selectDate = format.date(from:item.message ?? "") {
@@ -77,7 +77,7 @@ class YHWorkExperiencePositionViewModel: YHBaseViewModel {
                     }
                 }
             }
-        case .id10: // 离职年月
+        case .id24: // 离职年月
             let format = DateFormatter()
             format.dateFormat = "yyyy-MM"
             if let selectDate = format.date(from:item.message ?? ""), let startDate = format.date(from:position.entry_time) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift

@@ -304,7 +304,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                     callBackBlock(false,nil)
                     return
                 }
-                self.mainModel.word_id = result.word_id
+                self.mainModel.work_id = result.work_id
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
@@ -352,7 +352,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                     callBackBlock(false,nil)
                     return
                 }
-                self.mainModel.word_id = result.word_id
+                self.mainModel.work_id = result.work_id
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
@@ -400,7 +400,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                     callBackBlock(false,nil)
                     return
                 }
-                self.mainModel.word_id = result.word_id
+                self.mainModel.work_id = result.work_id
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkItemListViewModel.swift

@@ -78,7 +78,7 @@ class YHWorkItemListViewModel: YHBaseViewModel {
         }
     }
     
-    func requestCreateNewWork(_ orderId: Int, callBackBlock:@escaping (_ success: [YHWorkItemListModel]?, _ error:YHErrorModel?)->()) {
+    func requestCreateNewWork(_ orderId: Int, callBackBlock:@escaping (_ success: Int, _ error:YHErrorModel?)->()) {
 //        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.list + "?order_id=\(orderId)"
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.createNewWork
         let params: [String : Any] = ["order_id": orderId]
@@ -88,17 +88,17 @@ class YHWorkItemListViewModel: YHBaseViewModel {
             guard let self = self else { return }
             if json.code == 200 {
                 guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceDetailModel.deserialize(from: dic) else {
-                    callBackBlock([],nil)
+                    callBackBlock(0,nil)
                     return
                 }
-                self.workId = result.word_id
-                callBackBlock(self.listModel, nil)
+                self.workId = result.work_id
+                callBackBlock(result.work_id, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock([], error)
+                callBackBlock(0, error)
             }
         } failBlock: { err in
-            callBackBlock([],err)
+            callBackBlock(0,err)
         }
     }
 }