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

* 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  工作经验步骤流程接口

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

@@ -112,12 +112,25 @@ class YHWorkExperienceViewController: YHBaseViewController {
             guard let self = self else { return }
             self.updateDataSource()
         }
+        viewModel.requestWorkStep("\(orderID)", workExperienceID ?? "") { success, error in
+            if self.stepView.currentIndex < 3 {
+                self.stepView.currentIndex = self.viewModel.stepModel.step
+                self.stepView.maxIndex = self.viewModel.mainModel.step
+            } else {
+                self.stepView.currentIndex = 3
+                self.stepView.maxIndex = 3
+            }
+            self.stepView.dataSource = ["基本信息", "工作职责", "工作亮点", "简历/工作总结"]
+        }
+        viewModel.requestworkDutyDetail(workExperienceID ?? "") {[weak self] success, error in
+            guard let self = self else { return }
+        }
+        viewModel.requestWorkHighlightsDetail(workExperienceID ?? "") {[weak self] success, error in
+            guard let self = self else { return }
+        }
         viewModel.requestWorkDetail("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
             guard let self = self else { return }
-            self.stepView.currentIndex = self.viewModel.mainModel.step
-            self.stepView.maxIndex = self.viewModel.mainModel.step
             self.updateDataSource()
-            self.stepView.dataSource = ["基本信息", "工作职责", "工作亮点", "简历/工作总结"]
             self.viewModel.requestWorkInfoProject("\(self.viewModel.mainModel.word_id)") {[weak self] success, error in
                 guard let self = self else { return }
                 self.introductionDataSource = success
@@ -125,7 +138,6 @@ class YHWorkExperienceViewController: YHBaseViewController {
                 self.updateDataSource()
             }
         }
-        
         updateDataSource()
     }
     
@@ -227,7 +239,40 @@ class YHWorkExperienceViewController: YHBaseViewController {
                 bottom.nextButton.isEnabled = false
                 guard let self = self else { return }
                 if self.viewModel.isCanNext(self.stepView.currentIndex) {
-                    self.viewModel.mainModel.step = self.stepView.currentIndex
+                    if self.stepView.currentIndex == 0 {
+                        self.viewModel.saveWorkData(orderID, workId: workExperienceID?.intValue() ?? 0) {[weak self]  success, error in
+                            guard let self = self else { return }
+                            bottom.nextButton.isEnabled = true
+                            if let error = error {
+                                YHHUD.flash(message: error.errorMsg )
+                            } else {
+                                self.stepView.currentIndex = self.stepView.currentIndex + 1
+                                self.updateDataSource()
+                            }
+                        }
+                    } else if self.stepView.currentIndex == 1 {
+                        self.viewModel.saveWorkDuty(workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
+                            guard let self = self else { return }
+                            bottom.nextButton.isEnabled = true
+                            if let error = error {
+                                YHHUD.flash(message: error.errorMsg )
+                            } else {
+                                self.stepView.currentIndex = self.stepView.currentIndex + 1
+                                self.updateDataSource()
+                            }
+                        }
+                    } else if self.stepView.currentIndex == 2 {
+                        self.viewModel.saveWorkHighlights(workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
+                            guard let self = self else { return }
+                            bottom.nextButton.isEnabled = true
+                            if let error = error {
+                                YHHUD.flash(message: error.errorMsg )
+                            } else {
+                                self.stepView.currentIndex = self.stepView.currentIndex + 1
+                                self.updateDataSource()
+                            }
+                        }
+                    } else {
                         self.viewModel.saveWorkDetail(1, orderID: self.orderID, callBackBlock: {[weak self] flag, error in
                             guard let self = self else { return }
                             bottom.nextButton.isEnabled = true
@@ -240,10 +285,10 @@ class YHWorkExperienceViewController: YHBaseViewController {
                                     self.navigationController?.popViewController()
                                 } else {
                                     self.stepView.currentIndex = self.stepView.currentIndex + 1
-                                self.updateDataSource()
                                 }
                             }
                         })
+                    }
                 } else {
                     bottom.nextButton.isEnabled = true
                     self.isShowPrompt = true
@@ -253,6 +298,38 @@ class YHWorkExperienceViewController: YHBaseViewController {
             }
             bottom.saveBlock = { [weak self] in
                 guard let self = self else { return }
+                if self.stepView.currentIndex == 0 {
+                    self.viewModel.saveWorkData(orderID, workId: workExperienceID?.intValue() ?? 0) {[weak self]  success, error in
+                        guard let self = self else { return }
+                        bottom.nextButton.isEnabled = true
+                        if let error = error {
+                            YHHUD.flash(message: error.errorMsg )
+                        } else {
+                            YHHUD.flash(message: "保存成功")
+                        }
+                    }
+                } else if self.stepView.currentIndex == 1 {
+                    self.viewModel.saveWorkDuty(workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
+                        guard let self = self else { return }
+                        bottom.nextButton.isEnabled = true
+                        if let error = error {
+                            YHHUD.flash(message: error.errorMsg )
+                        } else {
+                            YHHUD.flash(message: "保存成功")
+                        }
+                    }
+                } else if self.stepView.currentIndex == 2 {
+                    self.viewModel.saveWorkHighlights(workId: workExperienceID?.intValue() ?? 0) {[weak self] success, error in
+                        guard let self = self else { return }
+                        bottom.nextButton.isEnabled = true
+                        if let error = error {
+                            YHHUD.flash(message: error.errorMsg )
+                        } else {
+                            self.stepView.currentIndex = self.stepView.currentIndex + 1
+                            self.updateDataSource()
+                        }
+                    }
+                } else {
                     self.viewModel.saveWorkDetail(0, orderID: self.orderID, callBackBlock: {[weak self] flag, error in
                         guard let self = self else { return }
                         if let error = error {
@@ -262,6 +339,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
                         }
                     })
                 }
+            }
             return bottom
         }()
         view.addSubview(bottomView)
@@ -482,7 +560,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if stepView.currentIndex == 1 {
             let cell = tableView.dequeueReusableCell(withClass: YHWorkResponsibilitiesTableViewCell.self)
-            cell.dataSource = viewModel.mainModel.wduty
+            cell.dataSource = viewModel.dutyModel.work_duty
             cell.exampleBlock = {[weak self] in
                 guard let self = self else { return }
                 let mainVc = YHWorkExampleViewController()
@@ -518,7 +596,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
             return cell
         } else if stepView.currentIndex == 2 {
             let cell = tableView.dequeueReusableCell(withClass: YHWorkHighlightsTableViewCell.self)
-            cell.dataSource = viewModel.mainModel.highlights
+            cell.dataSource = viewModel.helightModel.work_highlights
             cell.exampleBlock = {[weak self] in
                 guard let self = self else { return }
                 let mainVc = YHWorkExampleViewController()
@@ -772,7 +850,6 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                 }
                 return CGFloat(h + 52 + 14 + 386)
             } else {
-                let number = viewModel.positionList.count
                 var height = 23 + 154
                 for item in viewModel.positionList {
                     if item.position_name == "" {

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

@@ -16,6 +16,8 @@ class YHWorkExperienceDetailModel: SmartCodable {
     var professional_level: Int  = 0
     var work_certificate: String = ""
     var has_finish_basic_question: Int = 0
+    var work_duty: String = ""
+    var work_highlights: String = ""
     
     var is_famous_enterprise: Int  = 0
     var duty: String  = ""
@@ -73,3 +75,11 @@ class YHWorkExperienceFileModel: SmartCodable {
     required init() {
     }
 }
+
+class YHWorkExperienceStepModel: SmartCodable {
+    var step: Int  = 0
+    var step_name: String  = ""
+    required init() {
+    }
+}
+

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

@@ -18,7 +18,7 @@ class YHWorkExperiencePositionModel: SmartCodable {
     var entry_time: String = ""
     var departure_time: String = ""
     var experience_scope: String = ""
-    var experience_sub_scope: String = ""
+    var experience_sub_scope: String = " "
     var is_international_work_experience: Int = 0
     var provide_certificate_type: Int = 0
     var work_country: String = ""

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

@@ -229,6 +229,7 @@ class YHAllApiName {
         static let list = "infoflow/work/v1/list"
         //工作经验详情
         static let detail = "infoflow/work/v1/workDetail"
+        static let workStep = "infoflow/work/v1/WorkStep"
         //工作经验保存
         static let save = "infoflow/work/save"
         static let saveAll = "infoflow/work/save-all"
@@ -260,6 +261,12 @@ class YHAllApiName {
         
         static let workQuestionDetail = "infoflow/work/v1/workQuestionDetail"
         static let saveWorkQuestion = "infoflow/work/v1/SaveWorkQuestion"
+        
+        static let saveWorkData = "infoflow/work/v1/saveWorkData"
+        static let workDutyDetail = "infoflow/work/v1/workDutyDetail"
+        static let saveWorkDuty = "infoflow/work/v1/saveWorkDuty"
+        static let workHighlightsDetail = "infoflow/work/v1/workHighlightsDetail"
+        static let saveWorkHighlights = "infoflow/work/v1/saveWorkHighlights"
     }
     
     //登录