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

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

@@ -255,7 +255,7 @@ class YHServiceOrderListView: YHBaseViewController {
             gotoResignCertificateListVC(orderID: orderId)
         } else if type == 201 {
             //高才我的信息
-            let vc = YHGCMainApplicantInformationViewController()
+            let vc = YHGCWorkExperienceListViewController()
             vc.orderId = orderId
             UIViewController.current?.navigationController?.pushViewController(vc)
         } else if type == 202 {

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

@@ -30,6 +30,7 @@ class YHWorkItemListModel: SmartCodable {
     var entry_time: String?
     var departure_time: String?
     var vacant_num: Int?
+    var income: String? //用于高A 收入金额
     required init() {
     }
 }

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

+//
+//  YHGCWorkExperienceViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/12/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHGCWorkExperienceViewController: YHBaseViewController {
+    var bottomView: YHBottomNextView!
+    var tableView: UITableView!
+    var viewModel: YHGCWorkExperienceViewModel!
+    var baseDataSource: [YHSectionWorkExperienceModel]?
+    var introductionDataSource: [YHWorkExperienceProjectModel]?
+    var fileDataSource: [YHWorkExperienceFileModel]?
+    var workID: Int = 0
+    var orderID: Int = 0
+    var positionId: Int = 0
+    var isMore: Bool = false
+    var isShowPrompt: Bool = false
+    var isShowMessageSelect: Bool = true
+    var isKeyboardShow: Bool = false
+    var selectReasonIndex: Int = 5
+    var selectEditItem = YHWorkExperienceFileModel()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        viewModel = YHGCWorkExperienceViewModel()
+        gk_navTitle = "工作经验信息填写"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1.0
+        
+        setView()
+        getData()
+    }
+    
+    func getData() {
+        viewModel.requestWorkPositionDetail(workID) {[weak self] success, error in
+            guard let self = self else { return }
+            if success ?? false {
+                updateDataSource()
+            } else {
+                self.viewModel.position.order_id = orderID
+                updateDataSource()
+            }
+        }
+    }
+    
+    func updateDataSource() {
+        bottomView.nextButton.setTitle("提交", for: .normal)
+        self.baseDataSource = self.viewModel.getBaseDataSource(false)
+        self.tableView.reloadData()
+    }
+    
+    func setView() {
+        tableView = {
+            let tableView = UITableView(frame: .zero, style: .grouped)
+            if #available(iOS 11.0, *) {
+                tableView.contentInsetAdjustmentBehavior = .never
+            }
+            tableView.sectionHeaderHeight = 16
+            tableView.backgroundColor = .clear
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHWorkExperiencePositionListTableViewCell.self)
+            tableView.register(cellWithClass: YHWorkExperiencePositionReasonTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
+            make.left.right.bottom.equalTo(view)
+        }
+        
+        bottomView = {
+            let bottom = YHBottomNextView()
+            bottom.nextblock = { [weak self] in
+                bottom.nextButton.isEnabled = false
+                guard let self = self else { return }
+                if self.viewModel.isCanNext() {
+                    self.viewModel.saveWorkPosition(callBackBlock: {[weak self] flag, error in
+                        guard let self = self else { return }
+                        bottom.nextButton.isEnabled = true
+                        if let error = error {
+                            YHHUD.flash(message: error.errorMsg )
+                        } else {
+                            YHHUD.hideFlashMessage()
+                            YHHUD.flash(message: "提交成功")
+                            self.navigationController?.popViewController()
+                        }
+                    })
+                } else {
+                    bottom.nextButton.isEnabled = true
+                    self.isShowPrompt = true
+                    self.updateDataSource()
+                    YHHUD.flash(message: "您还有信息未填写")
+                }
+            }
+            bottom.saveBlock = { [weak self] in
+                guard let self = self else { return }
+                self.viewModel.saveWorkPosition(callBackBlock: {[weak self] flag, error in
+                    guard let _ = self else { return }
+                    if let error = error {
+                        YHHUD.flash(message: error.errorMsg )
+                    } else {
+                        YHHUD.flash(message: "保存成功")
+                    }
+                })
+            }
+            return bottom
+        }()
+        view.addSubview(bottomView)
+        bottomView.snp.makeConstraints { make in
+            make.left.right.bottom.equalTo(view)
+            make.height.equalTo(k_Height_safeAreaInsetsBottom() + 64)
+        }
+        bottomView.layoutIfNeeded()
+        bottomView.nextButton.addYinHeGradualLayer()
+    }
+    
+}
+
+extension YHGCWorkExperienceViewController: UITableViewDelegate, UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCell(withClass: YHWorkExperiencePositionListTableViewCell.self)
+        cell.dataSource = baseDataSource?[indexPath.row]
+        cell.workExperienceBlock = {[weak self] model in
+            guard let self = self else { return }
+            self.viewModel.updateModel(model)
+            let id = model.id
+            if id != .id1 && id != .id2 && id != .id6 && id != .id10 && id != .id11 {
+                self.updateDataSource()
+            }
+        }
+        return cell
+      
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.row == 0 {
+            let array = baseDataSource?[indexPath.row].models ?? []
+            var h = 0
+            for i in 0..<array.count {
+                let data = array[i]
+                let message = data.message ?? ""
+                let isShow = data.isShowPrompts ?? false
+                if data.id == .id7 {
+                    h = h + 72
+                } else {
+                    h = h + 52
+                }
+                if isShow && message.count == 0 {
+                    h = h + 20
+                }
+            }
+            return CGFloat(h + 52 + 14)
+        } else {
+            return UITableView.automaticDimension
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 7))
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 16
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/M/YHGCWorkExperienceModel.swift

+//
+//  YHGCWorkExperienceModel.swift
+//  galaxy
+//
+//  Created by EDY on 2024/12/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHGCWorkExperienceModel: SmartCodable {
+    var id: Int = 0
+    var order_id: Int = 0
+    var company_name: String = ""
+    var entry_time: String = ""
+    var departure_time: String = ""
+    var location_aboard: Int = 0
+    var position: String = ""
+    var has_work_certificate: Int = 0
+    var company_type: String = ""
+    var company_type_other: String = ""
+    var location: YHAddress = YHAddress()
+    required init() {
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/M/YHGCWorkModel.swift

+//
+//  YHGCWorkModel.swift
+//  galaxy
+//
+//  Created by EDY on 2024/12/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHGCWorkModel: 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 has_company_consent: Int = 0 //高才使用 在职公司是否可以提供赴港同意书 0 未知 1 是 2 否
+    var consent_work_id: Int = 0 //高才使用 可以提供赴港同意书的工作经历id
+    var has_center_consent: Int = 0 //高才使用 人才中心是否可以提供赴港同意书 0 未知 1 是 2 否
+    var why_work_time_overlap: String = "" //高才使用 关于工作时间重叠的说明
+    var has_work_experience: Int = 0 //高BC使用 是否有工作经历 0.未知 1.是 2.否
+    var is_consent_required: Int = 0 //高才使用 是否必须提供赴港同意书 0-否 1-是
+
+    var list: [YHWorkItemListModel]?
+    required init() {
+    }
+}
+
+

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

+//
+//  YHGCWorkListHasDocTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/12/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHGCWorkListHasDocTableViewCell: UITableViewCell {
+    typealias WorkExperienceBlock = (_ model: YHWorkExperienceModel) -> ()
+    var workExperienceBlock: WorkExperienceBlock?
+    var centerView: UIView!
+    var titleLabel: UILabel!
+    var messageLabel: UILabel!
+    var mainItemView: UIView!
+    var workId: Int = 0
+    var orderId: Int = 0
+    var dataSource: YHSectionWorkExperienceModel?{
+        didSet {
+            updateAllViews()
+        }
+    }
+    var selectDataSource: [ASAttributedString]?
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        backgroundColor = .clear
+        centerView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius6
+            return view
+        }()
+        contentView.addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.top.equalTo(7)
+            make.bottom.equalTo(-7)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            return label
+        }()
+        centerView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(16)
+            make.height.equalTo(20)
+            make.right.equalTo(-18)
+        }
+        
+        let line = UIView()
+        line.backgroundColor = UIColor.separatorColor
+        centerView.addSubview(line)
+        line.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(52)
+            make.height.equalTo(1)
+            make.right.equalTo(-18)
+        }
+        
+        messageLabel = {
+            let label = UILabel()
+            label.numberOfLines = 0
+            let a: ASAttributedString = .init("备注：赴港同意书为目前在职公司盖章提供，若目前未就职于任何公司，则由档案所在地人才中心盖章提供，", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x8893a2)))
+            let b: ASAttributedString = .init("查看示例模板", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor),.underline(.single),.action {
+                //跳转模版
+            })
+            label.attributed.text = a + b
+            return label
+        }()
+        centerView.addSubview(messageLabel)
+        messageLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(68)
+            make.right.equalTo(-18)
+        }
+        
+        mainItemView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius6
+            return view
+        }()
+        centerView.addSubview(mainItemView)
+        mainItemView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.top.equalTo(132)
+        }
+    }
+    
+    func updateAllViews() {
+        titleLabel.text = dataSource?.title
+        mainItemView.removeSubviews()
+        var y = 0
+        for i in 0 ..< (dataSource?.models?.count ?? 0) {
+            if y != 0 {
+                let line = UIView()
+                line.backgroundColor = UIColor.separatorColor
+                mainItemView.addSubview(line)
+                line.snp.makeConstraints { make in
+                    make.left.equalTo(18)
+                    make.top.equalTo(y)
+                    make.height.equalTo(1)
+                    make.right.equalTo(-18)
+                }
+            }
+            y = y + 1
+            let data = dataSource?.models?[i]
+            let isShow = data?.isShowPrompts ?? false
+            let message = data?.message ?? ""
+            var h = 51
+            if isShow && message.count == 0 {
+                h = h + 20
+            }
+            let itemView = YHWorkExperienceItemView()
+            itemView.dataSource = data
+            itemView.workId = workId
+            itemView.orderId = orderId
+            itemView.block = {[weak self] model in
+                guard let self = self else { return }
+                if let block = self.workExperienceBlock {
+                    block(model)
+                }
+            }
+            mainItemView.addSubview(itemView)
+            itemView.snp.makeConstraints { make in
+                make.left.equalTo(18)
+                make.top.equalTo(y)
+                make.height.equalTo(h)
+                make.right.equalTo(-18)
+            }
+            y = y + h
+        }
+    }
+}

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

+//
+//  YHGCWorkListHasWorkExperienceTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/12/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHGCWorkListHasWorkExperienceTableViewCell: UITableViewCell {
+    typealias WorkExperienceBlock = (_ model: YHWorkExperienceModel) -> ()
+    var workExperienceBlock: WorkExperienceBlock?
+    var centerView: UIView!
+    var titleLabel: UILabel!
+    var mainItemView: UIView!
+    var workId: Int = 0
+    var orderId: Int = 0
+    var dataSource: YHSectionWorkExperienceModel?{
+        didSet {
+            updateAllViews()
+        }
+    }
+    var selectDataSource: [ASAttributedString]?
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        backgroundColor = .clear
+        centerView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius6
+            return view
+        }()
+        contentView.addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.top.equalTo(7)
+            make.bottom.equalTo(-7)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            return label
+        }()
+        centerView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(16)
+            make.height.equalTo(20)
+            make.right.equalTo(-18)
+        }
+        
+        mainItemView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius6
+            return view
+        }()
+        centerView.addSubview(mainItemView)
+        mainItemView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.top.equalTo(52)
+        }
+    }
+    
+    func updateAllViews() {
+        titleLabel.text = dataSource?.title
+        mainItemView.removeSubviews()
+        var y = 0
+        for i in 0 ..< (dataSource?.models?.count ?? 0) {
+            let line = UIView()
+            line.backgroundColor = UIColor.separatorColor
+            mainItemView.addSubview(line)
+            line.snp.makeConstraints { make in
+                make.left.equalTo(18)
+                make.top.equalTo(y)
+                make.height.equalTo(1)
+                make.right.equalTo(-18)
+            }
+            y = y + 1
+            let data = dataSource?.models?[i]
+            let isShow = data?.isShowPrompts ?? false
+            let message = data?.message ?? ""
+            var h = 51
+            if isShow && message.count == 0 {
+                h = h + 20
+            }
+            let itemView = YHWorkExperienceItemView()
+            itemView.dataSource = data
+            itemView.workId = workId
+            itemView.orderId = orderId
+            itemView.block = {[weak self] model in
+                guard let self = self else { return }
+                if let block = self.workExperienceBlock {
+                    block(model)
+                }
+            }
+            mainItemView.addSubview(itemView)
+            itemView.snp.makeConstraints { make in
+                make.left.equalTo(18)
+                make.top.equalTo(y)
+                make.height.equalTo(h)
+                make.right.equalTo(-18)
+            }
+            y = y + h
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/VM/YHGCWorkItemListViewModel.swift

+//
+//  YHGCWorkItemListViewModel.swift
+//  galaxy
+//
+//  Created by EDY on 2024/12/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHGCWorkItemListViewModel: YHBaseViewModel {
+    var mainModel: YHGCWorkModel = YHGCWorkModel()
+    var listModel: [YHWorkItemListModel]?
+    var workId: Int = 0
+    override init() {
+        super.init()
+    }
+    
+    func getBaseDataSource(_ isShowPrompt: Bool) -> YHSectionWorkExperienceModel {
+        let item = YHWorkExperienceModel(id: .id1, isNeed: true, title: "主申请人是否有工作经验", isUserKeyBoard: false, prompts: "", message: "", leftButtonString: "是", rightButtonString: "否", isShowPrompts: isShowPrompt, alertMessage:"请选择")
+        let section = YHSectionWorkExperienceModel(title: "工作经验", models: [item])
+        return section
+    }
+    
+    func getDocDataSource(_ isShowPrompt: Bool) -> YHSectionWorkExperienceModel {
+        let item = YHWorkExperienceModel(id: .id2, isNeed: true, title: "在职公司是否可以提供赴港同意书", isUserKeyBoard: false, prompts: "", message: "", leftButtonString: "是", rightButtonString: "否", isShowPrompts: isShowPrompt, alertMessage:"请选择")
+        let item1 = YHWorkExperienceModel(id: .id2, isNeed: true, title: "人才中心是否可以提供赴港同意书？", isUserKeyBoard: false, prompts: "", message: "", leftButtonString: "是", rightButtonString: "否", isShowPrompts: isShowPrompt, alertMessage:"请选择")
+        let item2 = YHWorkExperienceModel(id: .id2, isNeed: true, title: "公司基本情况", isUserKeyBoard: false, prompts: "请选择", message: "", type: .unit, isShowPrompts: isShowPrompt, alertMessage:"请选择")
+        let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item,item1,item2])
+        return section
+    }
+    
+    func requestWorkList(_ orderId: String, callBackBlock:@escaping (_ success: [YHWorkItemListModel]?, _ error:YHErrorModel?)->()) {
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.list + "?order_id=\(orderId)"
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.gclist
+        let params: [String : Any] = ["order_id": orderId]
+        
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            if json.code == 200 {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHGCWorkModel.deserialize(from: dic) else {
+                    callBackBlock([],nil)
+                    return
+                }
+                self.mainModel = result
+                self.listModel = result.list
+                callBackBlock(self.listModel, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock([], error)
+            }
+        } failBlock: { err in
+            callBackBlock([],err)
+        }
+    }
+    
+    func requestDeleteWorkExperience(_ id: Int,_ orderId: String, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
+        let params: [String : Any] = ["id": id, "order_id": orderId]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.del
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            if json.code == 200 {
+                callBackBlock(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
+    
+    
+    func requestWorkTimeRemarkWorkExperience(_ orderId: String, _ isSaveAll: Int = 0, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
+        let params: [String : Any] = ["order_id": orderId,
+                                      "has_company_consent": self.mainModel.has_company_consent,
+                                      "consent_work_id": self.mainModel.consent_work_id,
+                                      "has_center_consent": self.mainModel.has_center_consent,
+                                      "why_work_time_overlap": self.mainModel.why_work_time_overlap,
+                                      "has_work_experience": self.mainModel.has_work_experience,
+                                      "is_submit": true]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.saveWorkTimeRemark
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            if json.code == 200 {
+                callBackBlock(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
+    
+    //创建新的是否可用
+    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]
+        
+        let _ = YHNetRequest.postRequest(url: strUrl,params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            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(0,nil)
+                    return
+                }
+                self.workId = result.work_id
+                callBackBlock(result.work_id, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(0, error)
+            }
+        } failBlock: { err in
+            callBackBlock(0,err)
+        }
+    }
+}

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

@@ -270,6 +270,10 @@ class YHAllApiName {
         static let workHighlightsDetail = "infoflow/work/v1/workHighlightsDetail"
         static let saveWorkHighlights = "infoflow/work/v1/saveWorkHighlights"
         static let createNewWork = "infoflow/work/v1/createNewWork"
+        
+        static let gclist = "infoflow/work/list"
+        static let gcworkDetail = "infoflow/work/detail"
+        static let gcWorkSave = "infoflow/work/save"
     }
     
     //登录