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:
  工作经验首页添加字段
  // 方案UI 走查
  // 方案
  保存所有
  // 方案进入
  工作经验文件上传细节
  工作经验细节
  删除测试代码
  // 标题

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -357,13 +357,11 @@
 		045EEEB22B9F171A0022A143 /* YHWorkActionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDDB2B9F171A0022A143 /* YHWorkActionView.swift */; };
 		045EEEB32B9F171A0022A143 /* YHWorkFileSyncTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDDC2B9F171A0022A143 /* YHWorkFileSyncTableViewCell.swift */; };
 		045EEEB42B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDDD2B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift */; };
-		045EEEB52B9F171A0022A143 /* YHWorkIntroductionItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDDE2B9F171A0022A143 /* YHWorkIntroductionItemView.swift */; };
 		045EEEB62B9F171A0022A143 /* YHWorkExperienceItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDDF2B9F171A0022A143 /* YHWorkExperienceItemView.swift */; };
 		045EEEB72B9F171A0022A143 /* YHWorkItemAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDE02B9F171A0022A143 /* YHWorkItemAddView.swift */; };
 		045EEEB82B9F171A0022A143 /* YHWorkExampleMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDE12B9F171A0022A143 /* YHWorkExampleMessageView.swift */; };
 		045EEEB92B9F171A0022A143 /* YHWorkMessageSelectTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDE22B9F171A0022A143 /* YHWorkMessageSelectTableViewCell.swift */; };
 		045EEEBA2B9F171A0022A143 /* YHWorkResponsibilitiesTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDE32B9F171A0022A143 /* YHWorkResponsibilitiesTableViewCell.swift */; };
-		045EEEBB2B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDE42B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift */; };
 		045EEEBC2B9F171A0022A143 /* YHClipperButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDE52B9F171A0022A143 /* YHClipperButton.swift */; };
 		045EEEBD2B9F171A0022A143 /* YHWorkExampleTypeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDE62B9F171A0022A143 /* YHWorkExampleTypeView.swift */; };
 		045EEEBE2B9F171A0022A143 /* YHResultBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEDE72B9F171A0022A143 /* YHResultBottomView.swift */; };
@@ -1392,13 +1390,11 @@
 		045EEDDB2B9F171A0022A143 /* YHWorkActionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkActionView.swift; sourceTree = "<group>"; };
 		045EEDDC2B9F171A0022A143 /* YHWorkFileSyncTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkFileSyncTableViewCell.swift; sourceTree = "<group>"; };
 		045EEDDD2B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkExampleMessageTableViewCell.swift; sourceTree = "<group>"; };
-		045EEDDE2B9F171A0022A143 /* YHWorkIntroductionItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkIntroductionItemView.swift; sourceTree = "<group>"; };
 		045EEDDF2B9F171A0022A143 /* YHWorkExperienceItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkExperienceItemView.swift; sourceTree = "<group>"; };
 		045EEDE02B9F171A0022A143 /* YHWorkItemAddView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkItemAddView.swift; sourceTree = "<group>"; };
 		045EEDE12B9F171A0022A143 /* YHWorkExampleMessageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkExampleMessageView.swift; sourceTree = "<group>"; };
 		045EEDE22B9F171A0022A143 /* YHWorkMessageSelectTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkMessageSelectTableViewCell.swift; sourceTree = "<group>"; };
 		045EEDE32B9F171A0022A143 /* YHWorkResponsibilitiesTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkResponsibilitiesTableViewCell.swift; sourceTree = "<group>"; };
-		045EEDE42B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkIntroductionTableViewCell.swift; sourceTree = "<group>"; };
 		045EEDE52B9F171A0022A143 /* YHClipperButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHClipperButton.swift; sourceTree = "<group>"; };
 		045EEDE62B9F171A0022A143 /* YHWorkExampleTypeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHWorkExampleTypeView.swift; sourceTree = "<group>"; };
 		045EEDE72B9F171A0022A143 /* YHResultBottomView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHResultBottomView.swift; sourceTree = "<group>"; };
@@ -2999,13 +2995,11 @@
 				045EEDDB2B9F171A0022A143 /* YHWorkActionView.swift */,
 				045EEDDC2B9F171A0022A143 /* YHWorkFileSyncTableViewCell.swift */,
 				045EEDDD2B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift */,
-				045EEDDE2B9F171A0022A143 /* YHWorkIntroductionItemView.swift */,
 				045EEDDF2B9F171A0022A143 /* YHWorkExperienceItemView.swift */,
 				045EEDE02B9F171A0022A143 /* YHWorkItemAddView.swift */,
 				045EEDE12B9F171A0022A143 /* YHWorkExampleMessageView.swift */,
 				045EEDE22B9F171A0022A143 /* YHWorkMessageSelectTableViewCell.swift */,
 				045EEDE32B9F171A0022A143 /* YHWorkResponsibilitiesTableViewCell.swift */,
-				045EEDE42B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift */,
 				045EEDE52B9F171A0022A143 /* YHClipperButton.swift */,
 				045EEDE62B9F171A0022A143 /* YHWorkExampleTypeView.swift */,
 				047619E82BA9867100F45358 /* YHCountryHotView.swift */,
@@ -6263,7 +6257,6 @@
 				A5ACE9482B4564F7002C94D2 /* YHHUDWariningView.swift in Sources */,
 				045EEF0F2B9F171A0022A143 /* YHSelectCountryViewModel.swift in Sources */,
 				04F2432B2C942B5100DF2C74 /* YHResignDocumentTipsCell.swift in Sources */,
-				045EEEB52B9F171A0022A143 /* YHWorkIntroductionItemView.swift in Sources */,
 				A567E59F2BD7643D00D5D5A0 /* YHStartPageViewController.swift in Sources */,
 				045EEF202B9F171A0022A143 /* YHCardExampleView.swift in Sources */,
 				A567E5A72BD7643D00D5D5A0 /* YHHomeKingKongBlockView.swift in Sources */,
@@ -6511,7 +6504,6 @@
 				045EEE822B9F171A0022A143 /* YHPersonInfoIdentityCardModel.swift in Sources */,
 				045EEE952B9F171A0022A143 /* YHPreviewInfoCertificateInformationItemsView.swift in Sources */,
 				044D0C042C2180B700C5CF5E /* YHInformationAuthorizationStepTwoViewController.swift in Sources */,
-				045EEEBB2B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift in Sources */,
 				04912F762CB77F4500CC3105 /* YHResignLeaveHKSwitchItemView.swift in Sources */,
 				044EE2382C92BBC500A2FE3A /* YHResignCertificateListTableViewCell.swift in Sources */,
 				045EEEED2B9F171A0022A143 /* YHParentInfoVC.swift in Sources */,

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

@@ -222,8 +222,7 @@ extension YHInformationPerfectListVC {
 //        vc.model = serviceCenterMainReqVM.allInfoScoreModel
 //        navigationController?.pushViewController(vc)
         
-        let vc = YHMyNewSchemeViewController()
-        navigationController?.pushViewController(vc)
+        YHMyNewSchemeViewController.shared.goToSchemePage()
     }
     
     @objc func goInfoListVC( ) {

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

@@ -74,9 +74,8 @@ class YHServiceOrderListView: YHBaseViewController {
                     
         } else if type == 4 { // 方案
             //我的方案
-            let vc = YHMyNewSchemeViewController()
-            UIViewController.current?.navigationController?.pushViewController(vc)
-            
+            YHMyNewSchemeViewController.shared.goToSchemePage()
+
         } else if type == 5 {
             //我的签字
             let vc = YHMySignatureListViewController()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHMyNewSchemeViewController.swift

@@ -30,11 +30,17 @@ class YHSchemeItem {
 class YHMyNewSchemeViewController: YHBaseViewController {
 
     var orderId: Int = 0
+    // 通过的至少要求数量
+    let passMinCount: Int = 6
+    var tipsType = YHSchemeTipsType.none
+
     var items: [[YHSchemeItem]] = []
     var passArr: [YHComprehensiveEevaluationModel] = []
     var unpassArr: [YHComprehensiveEevaluationModel] = []
     var isPass: Bool = false
     let viewModel = YHSchemeViewModel()
+    
+    static let shared = YHMyNewSchemeViewController()
 
     lazy var tableView: UITableView = {
         
@@ -169,6 +175,35 @@ class YHMyNewSchemeViewController: YHBaseViewController {
         return view
     }()
     
+    func goToSchemePage() {
+        
+        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
+            orderId = orderID
+        }
+        YHHUD.show(.progress(message: "加载中..."))
+        viewModel.getImproveDetail(orderId: orderId) {
+            [weak self] success, error in
+            YHHUD.hide()
+            guard let self = self else { return }
+            
+            if self.viewModel.improveDetailModel.improvePlanItem.count > 0 { // 提交过方案
+                let vc1 = YHMyNewSchemeViewController()
+                let vc2 = YHImproveSchemeViewController()
+                vc2.isPass = false
+                vc2.orderId = orderId
+                
+                UIViewController.current?.navigationController?.pushViewController(vc1, animated: false)
+                UIViewController.current?.navigationController?.pushViewController(vc2, animated: false)
+
+            } else { // 未提交过方案
+                
+                let vc = YHMyNewSchemeViewController()
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            }
+                
+        }
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
        
@@ -221,39 +256,60 @@ class YHMyNewSchemeViewController: YHBaseViewController {
                 }
             }
             
-            isPass = passArr.count >= 6
-                        
-            if isPass {
+            items.removeAll()
+            
+            // 至少满足6项才通过
+            isPass = passArr.count >= passMinCount
+            
+            var arr1 = [YHSchemeItem]()
+            if passArr.count == 0 { // 一项都不满足 不通过
+                
+                tipsType = .neverPass
+                
+                let item1 = YHSchemeItem(type: .evaluate)
+                let item2 = YHSchemeItem(type: .modifyInfo)
+                arr1 = [item1, item2]
+                
+            } else if 1 <= passArr.count, passArr.count < passMinCount { // 不满足至少通过数 不通过
+                
+                tipsType = .partPass
+
                 let item1 = YHSchemeItem(type: .evaluate)
                 let item2 = YHSchemeItem(type: .hkRequireList)
-                let item3 = YHSchemeItem(type: .industryLocation)
-                let item4 = YHSchemeItem(type: .materialList)
-                let item5 = YHSchemeItem(type: .documentList)
-                let item6 = YHSchemeItem(type: .improveScheme)
-                var arr1: [YHSchemeItem]
-                if passArr.count > 0 {
-                    arr1 = [item1, item2, item3, item4, item5, item6]
-                } else {
-                    arr1 = [item1, item3, item4, item5, item6]
-                }
+                let item3 = YHSchemeItem(type: .modifyInfo)
+                arr1 = [item1, item2, item3]
+
+            } else if passArr.count >= passMinCount { // 满足至少通过数
                 
-                items.append(arr1)
+                tipsType = .pass
+
+                let item1 = YHSchemeItem(type: .evaluate)
+                arr1.append(item1)
                 
-            } else {
+                let item2 = YHSchemeItem(type: .hkRequireList)
+                arr1.append(item2)
+
+                let item3 = YHSchemeItem(type: .industryLocation)
+                arr1.append(item3)
                 
-                let item01 = YHSchemeItem(type: .evaluate)
-                let item02 = YHSchemeItem(type: .hkRequireList)
-                let item03 = YHSchemeItem(type: .modifyInfo)
-                var arr1: [YHSchemeItem] = []
-                if passArr.count > 0 {
-                    arr1 = [item01, item02, item03]
-                } else {
-                    arr1 = [item01, item03]
+                let item4 = YHSchemeItem(type: .materialList)
+                arr1.append(item4)
+
+                let item5 = YHSchemeItem(type: .documentList)
+                arr1.append(item5)
+
+                if passArr.count < self.viewModel.schemeModel.comprehensive_evaluation.count { // 不是全满足则显示提升方案
+                    let item6 = YHSchemeItem(type: .improveScheme)
+                    arr1.append(item6)
                 }
-                
+            }
+            
+            items.append(arr1)
+                        
+            if !isPass {
                 let item11 = YHSchemeItem(type: .improveTarget)
                 let arr2: [YHSchemeItem] = [item11]
-                items.append(contentsOf: [arr1, arr2])
+                items.append(arr2)
             }
             self.tableView.reloadData()
         }
@@ -347,7 +403,7 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
                 
                 if item.type == .evaluate {
                     let cell = tableView.dequeueReusableCell(withIdentifier: YHComprehensiveEvaluationCell.cellReuseIdentifier, for: indexPath) as! YHComprehensiveEvaluationCell
-                    cell.isPass = isPass
+                    cell.tipsType = self.tipsType
                     targetCell = cell
                 }
                 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHComprehensiveEvaluationCell.swift

@@ -9,13 +9,28 @@
 import UIKit
 import AttributedString
 
+enum YHSchemeTipsType: Int {
+    case none = 0
+    case neverPass = 1 // 要求一项都不满足
+    case pass = 2 // 要求满足了6项以上 通过
+    case partPass = 3 // 要求未满足6项 不通过
+}
+
 class YHComprehensiveEvaluationCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHComprehensiveEvaluationCell"
     
-    var isPass: Bool = false {
+    var tipsType: YHSchemeTipsType = .none {
         didSet {
-            tipsLabel.attributed.text = isPass ? passText : unPassText
+            if tipsType == .neverPass {
+                tipsLabel.attributed.text = neverPassText
+                
+            } else if tipsType == .partPass {
+                tipsLabel.attributed.text = partPassText
+
+            } else if tipsType == .pass {
+                tipsLabel.attributed.text = passText
+            }
         }
     }
     
@@ -43,24 +58,32 @@ class YHComprehensiveEvaluationCell: UITableViewCell {
     lazy var tipsLabel: UILabel = {
         let label = UILabel()
         label.numberOfLines = 0
-        label.attributed.text = unPassText
+        label.attributed.text = neverPassText
         return label
     }()
     
+    
     lazy var passText: ASAttributedString = {
         let aa: ASAttributedString = .init("经初步评估，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
-        let bb: ASAttributedString = .init("您符合【优秀人才入境计划-综合计分制】甄选条件", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
+        let bb: ASAttributedString = .init("您符合【优秀人才入境计划-综合计分制】甄选条件", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
         let cc: ASAttributedString = .init("，您在以下方面具备明显优势，为您感到开心！接下来辛苦您根据指引配合准备申请材料", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
         return aa+bb+cc
     }()
     
-    lazy var unPassText: ASAttributedString = {
+    lazy var partPassText: ASAttributedString = {
         let aa: ASAttributedString = .init("经初步评估，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
-        let bb: ASAttributedString = .init("您目前已符合【优秀人才入境计划 - 综合计分制】的部分重要甄选条件", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
+        let bb: ASAttributedString = .init("您目前已符合【优秀人才入境计划 - 综合计分制】的部分重要甄选条件", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
         let cc: ASAttributedString = .init("，在如下方面具备优势，足以证明您的优秀之处！考虑到优才计划的的多维度要求，以及您目前已经具备的良好基础，如果您能进一步去孵化其他条件，后续的申请将会更具竞争力", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
         return aa+bb+cc
     }()
     
+    lazy var neverPassText: ASAttributedString = {
+        let aa: ASAttributedString = .init("经初步评估，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
+        let bb: ASAttributedString = .init("您目前不符合【优秀人才入境计划-综合计分制】甄选条件", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
+        let cc: ASAttributedString = .init("，考虑到优才计划的的多维度要求，我们建议您进一步孵化以下条件，后续的申请将会更具竞争力", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
+        return aa+bb+cc
+    }()
+    
     lazy var bgView: UIView = {
         let view = UIView()
         view.backgroundColor = .clear

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHIHKIdentityPlanCell.swift

@@ -65,7 +65,7 @@ class YHIHKIdentityPlanCell: UITableViewCell {
             make.left.equalTo(17)
             make.right.equalTo(-17)
             make.top.equalToSuperview()
-            make.height.equalTo(bgImgView.snp.width).multipliedBy(93.0/(KScreenWidth-34.0))
+            make.height.equalTo(95)
             make.bottom.equalTo(-33)
         }
         

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

@@ -58,7 +58,7 @@ class YHMajorSearchViewController: YHBaseViewController {
     func createUI() {
         
         self.view.backgroundColor = .white
-        self.gk_navTitle = "学校名称".local
+        self.gk_navTitle = "专业名称".local
 
         view.addSubview(tableView)
         view.addSubview(searchBar)

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

@@ -16,7 +16,6 @@ class YHWorkExperienceViewController: YHBaseViewController {
     var tableView: UITableView!
     var viewModel: YHWorkExperienceViewModel!
     var baseDataSource: [YHSectionWorkExperienceModel]?
-    var introductionDataSource: [YHWorkExperienceProjectModel]?
     var fileDataSource: [YHWorkExperienceFileModel]?
     var workExperienceID: String?
     var orderID: Int = 0
@@ -49,8 +48,9 @@ class YHWorkExperienceViewController: YHBaseViewController {
         gk_navBackgroundColor = .white
         gk_navBarAlpha = 1.0
         
-        
         setView()
+        getData()
+
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardDidShowNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardDidHideNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(handleKeyboardNotification(_:)), name: UIResponder.keyboardWillShowNotification, object: nil)
@@ -78,7 +78,10 @@ class YHWorkExperienceViewController: YHBaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        getData()
+        viewModel.requestWorkPositionList("\(orderID)", workExperienceID ?? "") {[weak self]  success, error in
+            guard let self = self else { return }
+            self.updateDataSource()
+        }
     }
     
     @objc func handleKeyboardNotification(_ notification: Notification) {
@@ -108,12 +111,15 @@ class YHWorkExperienceViewController: YHBaseViewController {
         viewModel.requestWorkExample { success, error in
             
         }
-        viewModel.requestWorkPositionList("\(orderID)", workExperienceID ?? "") {[weak self]  success, error in
-            guard let self = self else { return }
+        if workExperienceID == "" {
+            self.stepView.currentIndex = 0
+            self.stepView.maxIndex = 0
             self.updateDataSource()
+            return
         }
-        viewModel.requestWorkStep("\(orderID)", workExperienceID ?? "") { success, error in
-            if self.stepView.currentIndex < 3 {
+        viewModel.requestWorkStep("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
+            guard let self = self else { return }
+            if self.viewModel.stepModel.step < 3 {
                 self.stepView.currentIndex = self.viewModel.stepModel.step
                 self.stepView.maxIndex = self.viewModel.stepModel.step
             } else {
@@ -121,24 +127,28 @@ class YHWorkExperienceViewController: YHBaseViewController {
                 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.updateDataSource()
-            self.viewModel.requestWorkInfoProject("\(self.viewModel.mainModel.word_id)") {[weak self] success, error in
+            viewModel.requestWorkPositionList("\(orderID)", workExperienceID ?? "") {[weak self]  success, error in
+                guard let self = self else { return }
+                self.updateDataSource()
+            }
+            viewModel.requestworkDutyDetail(workExperienceID ?? "") {[weak self] success, error in
+                guard let self = self else { return }
+                self.updateDataSource()
+            }
+            viewModel.requestWorkHighlightsDetail(workExperienceID ?? "") {[weak self] success, error in
+                guard let self = self else { return }
+                self.updateDataSource()
+            }
+            viewModel.requestWorkDetail("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
+                guard let self = self else { return }
+                self.updateDataSource()
+            }
+            self.viewModel.requestWorkInfoProject(workExperienceID ?? "") {[weak self] success, error in
                 guard let self = self else { return }
-                self.introductionDataSource = success
                 self.fileDataSource = self.viewModel.mainModel.file
                 self.updateDataSource()
             }
         }
-        updateDataSource()
     }
     
     func updateDataSource() {
@@ -220,7 +230,6 @@ class YHWorkExperienceViewController: YHBaseViewController {
             tableView.register(cellWithClass: YHWorkExperienceTableViewCell.self)
             tableView.register(cellWithClass: YHWorkResponsibilitiesTableViewCell.self)
             tableView.register(cellWithClass: YHWorkHighlightsTableViewCell.self)
-            tableView.register(cellWithClass: YHWorkIntroductionTableViewCell.self)
             tableView.register(cellWithClass: YHWorkMessageSelectTableViewCell.self)
             tableView.register(cellWithClass: YHWorkFileSyncTableViewCell.self)
             tableView.register(cellWithClass: YHWorkExperiencePositionTableViewCell.self)
@@ -816,18 +825,15 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                 }
                 cell.newWorkBlock = {[weak self] in
                     guard let self = self else { return }
-//                    if self.dataSource?.count == 10 {
-//                        YHHUD.flash(message: "新增工作经历不能超过10条")
-//                    } else {
-//                        let vc = YHWorkExperienceViewController()
-//                        vc.isShowMessageSelect = true
-//                        vc.orderID = self.orderId
-//                        self.navigationController?.pushViewController(vc, animated: true)
-//                    }
-                    let vc = YHWorkExperiencePositionViewViewController()
-                    vc.workID = workExperienceID?.intValue() ?? 0
-                    vc.orderID = orderID
-                    self.navigationController?.pushViewController(vc, animated: true)
+                    if self.viewModel.positionList.count == 5 {
+                        YHHUD.flash(message: "新增职位不能超过5条")
+                    } else {
+                        let vc = YHWorkExperiencePositionViewViewController()
+                        vc.workID = workExperienceID?.intValue() ?? 0
+                        vc.orderID = orderID
+                        self.navigationController?.pushViewController(vc, animated: true)
+                    }
+                    
                 }
                 cell.backgroundColor = .clear
                 cell.contentView.backgroundColor = .clear

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

@@ -10,19 +10,17 @@ import UIKit
 import SmartCodable
 
 class YHWorkExperienceProjectModel: SmartCodable {
-    var id: Int?
-    var order_id: Int?
-    var work_id: Int?
-    var project_name: String?
-    var project_start_time: String?
-    var project_end_time: String?
-    var project_highlights: String?
-    var update_from_appid: Int?
-    var create_from_appid: Int? 
-    var customer_center_id: Int?
-    var created_at: String?
-    var updated_at: String?
-    var deleted_at: String?
+    var list: [YHWorkExperienceProjectListModel] = []
+    required init() {
+    }
+}
+
+class YHWorkExperienceProjectListModel: SmartCodable {
+    var file_name: String = ""
+    var file_url: String = ""
+    var file_size: Int = 0
+    var uploaded_at: String = ""
+    
     required init() {
     }
 }

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

@@ -11,8 +11,11 @@ import SmartCodable
 
 class YHWorkModel: SmartCodable {
     var count: Int?
+    var has_work_time_overlap: Int = 0
+    var has_work_time_empty: Int = 0
     var work_time_overlap_remark: String = "" //重叠期
     var work_time_empty_remark: String = ""   //空窗期
+    var agree_work_doc_url: String = ""
     var list: [YHWorkItemListModel]?
     required init() {
     }

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

-//
-//  YHWorkIntroductionItemView.swift
-//  galaxy
-//
-//  Created by EDY on 2024/2/20.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-
-class YHWorkIntroductionItemView: UIView {
-    typealias ItemBlock = (_ model: YHWorkExperienceProjectModel) -> ()
-    var clickBlock: ItemBlock?
-    var deleteBlock: ItemBlock?
-    var titleLabel: UILabel!
-    var subTitleLabel: UILabel!
-    var nextStepImageView: UIImageView!
-    var deleteButton: UIButton!
-    var centerButton: UIButton!
-    
-    var dataSource: YHWorkExperienceProjectModel? {
-        didSet {
-            updateAllViews()
-        }
-    }
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        backgroundColor = .white
-        setUpView()
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    func setUpView() {
-        titleLabel = {
-            let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 14)
-            label.textAlignment = .left
-            label.textColor = UIColor.mainTextColor
-            return label
-        }()
-        addSubview(titleLabel)
-        titleLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview()
-            make.top.equalTo(16)
-            make.right.equalTo(-30)
-            make.height.equalTo(20)
-        }
-        
-        subTitleLabel = {
-            let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 12)
-            label.textAlignment = .left
-            label.textColor = UIColor.subTextColor
-            return label
-        }()
-        addSubview(subTitleLabel)
-        subTitleLabel.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.height.equalTo(20)
-            make.top.equalTo(40)
-        }
-        
-        nextStepImageView = {
-            let imageView = UIImageView()
-            imageView.image = UIImage(named: "form_right_arrow")
-            return imageView
-        }()
-        addSubview(nextStepImageView)
-        nextStepImageView.snp.makeConstraints { make in
-            make.right.equalToSuperview()
-            make.centerY.equalToSuperview()
-            make.height.width.equalTo(20)
-        }
-        
-        centerButton = {
-            let button = UIButton(type: .custom)
-            button.addTarget(self, action: #selector(centerClick), for: .touchUpInside)
-            return button
-        }()
-        addSubview(centerButton)
-        centerButton.snp.makeConstraints { make in
-            make.right.top.bottom.equalToSuperview()
-            make.left.equalTo(112)
-        }
-        
-        deleteButton = {
-            let button = UIButton(type: .custom)
-            button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
-            button.contentHorizontalAlignment = .center
-            button.setTitle("删除", for: .normal)
-            button.setTitleColor( UIColor.failColor, for: .normal)
-            button.addTarget(self, action: #selector(deleteClick), for: .touchUpInside)
-            button.isHidden = true
-            return button
-        }()
-        addSubview(deleteButton)
-        deleteButton.snp.makeConstraints { make in
-            make.right.equalToSuperview()
-            make.height.equalTo(20)
-            make.width.equalTo(28)
-            make.centerY.equalTo(titleLabel.snp.centerY)
-        }
-    }
-    
-    func updateAllViews() {
-        guard let dataSource = dataSource else { return }
-        titleLabel.text = dataSource.project_name
-        subTitleLabel.text = "\(dataSource.project_start_time ?? "")" + " ～ " + "\(dataSource.project_end_time ?? "")"
-    }
-    
-    
-    @objc func centerClick() {
-        if let block = clickBlock {
-            block(self.dataSource ?? YHWorkExperienceProjectModel())
-        }
-    }
-    
-    @objc func deleteClick() {
-        if let block = deleteBlock {
-            block(self.dataSource ?? YHWorkExperienceProjectModel())
-        }
-    }
-    
-    func isShowDelete(isShow: Bool) {
-        if isShow {
-            nextStepImageView.isHidden = true
-            deleteButton.isHidden = false
-        } else {
-            nextStepImageView.isHidden = false
-            deleteButton.isHidden = true
-        }
-    }
-}

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

-//
-//  YHWorkIntroductionTableViewCell.swift
-//  galaxy
-//
-//  Created by EDY on 2024/2/20.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-
-class YHWorkIntroductionTableViewCell: UITableViewCell {
-    typealias ExperienceListBlock = (_ model: YHWorkExperienceProjectModel) -> ()
-    typealias IsMoreBlock = (_ isMore: Bool) -> ()
-    typealias AddIntroductionBlock = () -> ()
-    var clickBlock: ExperienceListBlock?
-    var deleteBlock: ExperienceListBlock?
-    var addIntroductionBlock: AddIntroductionBlock?
-    var isMoreBlock: IsMoreBlock?
-    var centerView: UIView!
-    var titleLabel: UILabel!
-    var subTitleLabel: UILabel!
-    var cannalButton: UIButton!
-    var moreButton: UIButton!
-    var mainItemView: UIView!
-    var bottomView: YHWorkItemAddView!
-    var dataSource: [YHWorkExperienceProjectModel]?{
-        didSet {
-            updateAllViews()
-        }
-    }
-    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_R(ofSize: 16)
-            label.text = "项目介绍(选填)"
-            label.textColor = UIColor.mainTextColor
-            return label
-        }()
-        centerView.addSubview(titleLabel)
-        titleLabel.snp.makeConstraints { make in
-            make.left.equalTo(20)
-            make.top.equalTo(23)
-            make.height.equalTo(24)
-            make.right.equalTo(-20)
-        }
-        
-        cannalButton = {
-            let button = UIButton(type: .custom)
-            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
-            button.contentHorizontalAlignment = .center
-            button.setTitle("取消操作", for: .normal)
-            button.setTitleColor( UIColor.brandMainColor, for: .normal)
-            button.addTarget(self, action: #selector(cannal), for: .touchUpInside)
-            button.isHidden = true
-            return button
-        }()
-        centerView.addSubview(cannalButton)
-        cannalButton.snp.makeConstraints { make in
-            make.right.equalTo(-18)
-            make.top.equalTo(24)
-            make.height.equalTo(20)
-            make.width.equalTo(60)
-        }
-        
-        moreButton = {
-            let button = UIButton(type: .custom)
-            button.setBackgroundImage(UIImage(named: "work_more"), for: .normal)
-            button.addTarget(self, action: #selector(more), for: .touchUpInside)
-            return button
-        }()
-        centerView.addSubview(moreButton)
-        moreButton.snp.makeConstraints { make in
-            make.right.equalTo(-18)
-            make.top.equalTo(24)
-            make.height.equalTo(24)
-            make.width.equalTo(24)
-        }
-        
-        
-        mainItemView = {
-            let view = UIView()
-            view.backgroundColor = .white
-            view.layer.cornerRadius = kCornerRadius6
-            return view
-        }()
-        centerView.addSubview(mainItemView)
-        mainItemView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.bottom.equalTo(-79)
-            make.top.equalTo(63)
-        }
-        
-        bottomView = {
-            let view = YHWorkItemAddView()
-            view.addBtn.setTitle("新增项目".local, for: .normal)
-            view.clickBlock = {[weak self] in
-                guard let self = self else { return }
-                if let block = self.addIntroductionBlock {
-                    block()
-                }
-            }
-            return view
-        }()
-        centerView.addSubview(bottomView)
-        bottomView.snp.makeConstraints { make in
-            make.right.bottom.equalTo(-18)
-            make.left.equalTo(18)
-            make.height.equalTo(45)
-        }
-    }
-    
-    func updateAllViews() {
-        mainItemView.removeSubviews()
-        for i in 0 ..< (dataSource?.count ?? 0) {
-            let line = UIView()
-            line.backgroundColor = UIColor.separatorColor
-            mainItemView.addSubview(line)
-            line.snp.makeConstraints { make in
-                make.left.equalTo(18)
-                make.top.equalTo(76 * i)
-                make.height.equalTo(1)
-                make.right.equalTo(-18)
-            }
-            let itemView = YHWorkIntroductionItemView()
-            itemView.dataSource = dataSource?[i]
-            itemView.tag = 4000 + i
-            itemView.clickBlock = {[weak self] model in
-                guard let self = self else { return }
-                if let block = self.clickBlock {
-                    block(model)
-                }
-            }
-            
-            itemView.deleteBlock = {[weak self] model in
-                guard let self = self else { return }
-                if let block = self.deleteBlock {
-                    block(model)
-                }
-            }
-            mainItemView.addSubview(itemView)
-            itemView.snp.makeConstraints { make in
-                make.left.equalTo(18)
-                make.top.equalTo(76 * i + 1)
-                make.height.equalTo(75)
-                make.right.equalTo(-18)
-            }
-        }
-    }
-    
-    @objc func cannal() {
-        moreButton.isHidden = false
-        cannalButton.isHidden = true
-        for i in 0..<(dataSource?.count ?? 0) {
-            let view = mainItemView.viewWithTag(4000 + i) as! YHWorkIntroductionItemView
-            view.isShowDelete(isShow: false)
-        }
-        if let block = isMoreBlock {
-            block(false)
-        }
-    }
-    
-    @objc func more() {
-        moreButton.isHidden = true
-        cannalButton.isHidden = false
-        for i in 0..<(dataSource?.count ?? 0) {
-            let view = mainItemView.viewWithTag(4000 + i) as! YHWorkIntroductionItemView
-            view.isShowDelete(isShow: true)
-        }
-        if let block = isMoreBlock {
-            block(true)
-        }
-    }
-}

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

@@ -12,7 +12,7 @@ import Alamofire
 class YHWorkExperienceViewModel: YHBaseViewModel {
     var mainModel: YHWorkExperienceDetailModel = YHWorkExperienceDetailModel()
     var exampleModels: [YHWorkExampleModel]?
-    var projectModels: [YHWorkExperienceProjectModel]?
+    var projectModels: [YHWorkExperienceProjectListModel] = []
     var fileList: [YHWorkExperienceFileModel] = []
     var positionList: [YHWorkExperiencePositionModel] = []
     var stepModel: YHWorkExperienceStepModel = YHWorkExperienceStepModel()
@@ -127,9 +127,9 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     func saveWorkDetail(workId: Int, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
         var file: [[String : Any]] = []
         for item in mainModel.file {
-            let fileDic = ["fileName": item.fileName,
-                           "fileUrl": item.fileUrl,
-                           "uploadedAt": item.uploadedAt]
+            let fileDic = ["file_name": item.fileName,
+                           "file_url": item.fileUrl,
+                           "uploaded_at": item.uploadedAt]
             file.append(fileDic)
         }
         let params: [String : Any] = ["next_step": 0,
@@ -164,12 +164,21 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let resultArray = [YHWorkExperienceProjectModel].deserialize(from: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceProjectModel.deserialize(from: dic) else {
                     callBackBlock([],nil)
                     return
                 }
-                self.projectModels = resultArray as? [YHWorkExperienceProjectModel]
-                callBackBlock(self.projectModels, nil)
+                self.projectModels = result.list
+                var fileArray: [YHWorkExperienceFileModel] = []
+                for item in self.projectModels {
+                    var model = YHWorkExperienceFileModel()
+                    model.fileUrl = item.file_url
+                    model.fileName = item.file_name
+                    model.uploadedAt = item.uploaded_at
+                    fileArray.append(model)
+                }
+                self.mainModel.file = fileArray
+                callBackBlock([], nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
                 callBackBlock([], error)

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -474,8 +474,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
             }
         
         } else if msg.redirectPage == YHRedirectPage.myPlan.rawValue { // 我的方案
-            let vc = YHMyNewSchemeViewController()
-            navigationController?.pushViewController(vc)
+            YHMyNewSchemeViewController.shared.goToSchemePage()
 
         } else if msg.redirectPage == YHRedirectPage.myDocument.rawValue { // 我的文书
             if let orderId = Int(msg.orderId) {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -349,13 +349,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             return
         }
         
-        if true {
-            let vc = YHMyNewSchemeViewController()
-//            let vc = YHImproveSchemeViewController()
-            self.navigationController?.pushViewController(vc)
-            return
-        }
-        
         let item: PersonalModuleItem = items[indexPath.row]
         switch item.type {
         case .myCard://我的名片

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

@@ -233,7 +233,7 @@ class YHAllApiName {
         //工作经验保存
         static let save = "infoflow/work/v1/saveWorkAttachmentFile"
         static let saveAll = "infoflow/work/save-all"
-        static let saveWorkTimeRemark = "infoflow/work/v1/saveWorkTimeRemark"
+        static let saveWorkTimeRemark = "infoflow/work/v1/saveWorkAllV1Request"
         //公司列表
         static let company = "infoflow/company/search"
         //工作经历删除
@@ -244,7 +244,7 @@ class YHAllApiName {
         //工作经验项目保存
         static let saveProject = "infoflow/work/saveWorkProject"
         //工作经验项目列表
-        static let projectList = "infoflow/work/getWorkProjectList"
+        static let projectList = "infoflow/work/v1/workAttachmentFileList"
         //工作经验项目列表
         static let projectDetail = "infoflow/work/getWorkProjectDetail"
         //删除工作经验项目