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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -215,7 +215,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
 
-            let dic = json.data
+            let dic = json.data 
             guard let result = YHMainInformationModel.deserialize(from: dic as? Dictionary) else {
                 callBackBlock(nil,nil)
                 return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHCompanySelectViewController.swift

@@ -120,7 +120,7 @@ extension YHCompanySelectViewController: UITableViewDelegate, UITableViewDataSou
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHCompanyTableViewCell.self)
-        cell.titleLabel.text = searchDataSource?[indexPath.row].name
+        cell.titleLabel.text = searchDataSource?[indexPath.row].company_name
         return cell
     }
     
@@ -129,7 +129,7 @@ extension YHCompanySelectViewController: UITableViewDelegate, UITableViewDataSou
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let text = searchDataSource?[indexPath.row].name ?? ""
+        let text = searchDataSource?[indexPath.row].company_name ?? ""
         if let backLocationStringController = backLocationStringController {
             backLocationStringController(text)
             self.navigationController?.popViewController()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkExperienceListViewController.swift

@@ -16,7 +16,7 @@ class YHWorkExperienceListViewController: YHBaseViewController {
     var viewModel: YHWorkItemListViewModel?
     var isMore: Bool = false
     var orderId: Int = 0
-
+    var showPrompt: Bool = false
     override func viewDidLoad() {
         super.viewDidLoad()
         viewModel = YHWorkItemListViewModel()
@@ -26,6 +26,11 @@ class YHWorkExperienceListViewController: YHBaseViewController {
         // Do any additional setup after loading the view.
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        getData()
+    }
+    
     func getData() {
         viewModel?.requestWorkList("\(orderId)", callBackBlock: {[weak self] success, error in
             guard let self = self else { return }
@@ -91,8 +96,21 @@ class YHWorkExperienceListViewController: YHBaseViewController {
     }
     
     @objc func submit() {
-        let vc = YHWorkExperienceViewController()
-        self.navigationController?.pushViewController(vc, animated: true)
+        guard let dataSource = dataSource else { return }
+        for item in dataSource {
+            if item.vacant_num ?? 0 > 0 {
+                showPrompt = true
+                tableView.reloadData()
+                YHHUD.flash(message: "您的工作经验未全部填写完成，请先填写完成再提交")
+                return
+            }
+        }
+        viewModel?.requestSaveAllWorkExperience("\(orderId)", callBackBlock: {[weak self] success, error in
+            guard let self = self else { return }
+            if success ?? false {
+                self.navigationController?.popViewController(animated: true)
+            }
+        })
     }
 }
 
@@ -103,6 +121,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHWorkExperienceListTableViewCell.self)
+        cell.showPrompt = showPrompt
         cell.dataSource = dataSource
         if isMore {
             cell.more()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkIntroductionViewController.swift

@@ -72,6 +72,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
             textField.font = UIFont.PFSC_R(ofSize: 14)
             textField.placeholder = "如方便提供，请填写"
             textField.text = dataSource.project_name
+            textField.delegate = self
             return textField
         }()
         view.addSubview(nameTextField)
@@ -283,3 +284,14 @@ extension YHWorkIntroductionViewController: UITextViewDelegate {
     }
 }
 
+extension YHWorkIntroductionViewController: UITextFieldDelegate {
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        
+    }
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        let newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
+        dataSource.project_name = newText
+        return true
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/Model/YHCompanyModel.swift

@@ -19,14 +19,13 @@ class YHCompanyModel: YHBaseModel {
     var prev_page_url: String?
     var to: Int?
     var total: Int?
-    var data: [YHCompanyModelListModel]?
+    var list: [YHCompanyModelListModel]?
 }
 
 class YHCompanyModelListModel: YHBaseModel {
-    var id: Int?
-    var name: String?
-    var customer_num: Int?
-    var is_del: Int?
-    var website_link: String?
-    var introduce: String?
+    var company_id: Int?
+    var company_name: String?
+    var company_num: Int?
+    var company_link: String?
+    var company_introduce: String?
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/Model/YHWorkExperienceDetailModel.swift

@@ -26,7 +26,7 @@ class YHWorkExperienceDetailModel: YHBaseModel {
     var old_id: Int  = 0
     var created_at: String  = ""
     var updated_at: String  = ""
-    var is_show: Int  = 0
+    var is_show: Int = 1 //1.保存会显示到列表上
     var deleted_at: String  = ""
     var operator_name: String  = ""
     var operator_english_name: String  = ""

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/Model/YHWorkExperienceProjectModel.swift

@@ -18,7 +18,7 @@ class YHWorkExperienceProjectModel: YHBaseModel {
     var project_end_time: String?
     var project_highlights: String?
     var update_from_appid: Int?
-    var create_from_appid: Int?
+    var create_from_appid: Int? 
     var customer_center_id: Int?
     var created_at: String?
     var updated_at: String?

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExampleMessageView.swift

@@ -119,7 +119,7 @@ extension YHWorkExampleMessageView: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         
         let text = dataSource?[indexPath.row] // 要显示的文本内容
-        let font = UIFont.systemFont(ofSize: 14) // 字体大小
+        let font = UIFont.PFSC_R(ofSize: 14) // 字体大小
         let maxWidth = KScreenWidth - 74 // 最大宽度限制
         
         // 创建NSAttributedString对象并设置属性

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceListTableViewCell.swift

@@ -23,6 +23,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
     var moreButton: UIButton!
     var mainItemView: UIView!
     var bottomView: YHWorkItemAddView!
+    var showPrompt: Bool = false
     var dataSource: [YHWorkItemListModel]?{
         didSet {
             updateAllViews()
@@ -84,7 +85,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
             let label = UILabel()
             label.font = UIFont.PFSC_R(ofSize: 12)
             label.text = "(从最近一份全职工作开始，直至毕业后的第一份工作）"
-            label.textColor = UIColor.contentBkgColor
+            label.textColor = UIColor.subTextColor
             return label
         }()
         centerView.addSubview(subTitleLabel)
@@ -209,6 +210,7 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
             }
             itemView.tag = 4000 + i
             itemView.dataSource = dataSource[i]
+            itemView.showPrompt = showPrompt
             mainItemView.addSubview(itemView)
             itemView.snp.makeConstraints { make in
                 make.left.equalTo(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkIntroductionItemView.swift

@@ -53,7 +53,7 @@ class YHWorkIntroductionItemView: UIView {
             let label = UILabel()
             label.font = UIFont.PFSC_M(ofSize: 12)
             label.textAlignment = .left
-            label.textColor = UIColor.contentBkgColor
+            label.textColor = UIColor.subTextColor
             return label
         }()
         addSubview(subTitleLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkItemView.swift

@@ -19,7 +19,16 @@ class YHWorkItemView: UIView {
     var nextStepImageView: UIImageView!
     var deleteButton: UIButton!
     var centerButton: UIButton!
-    
+    var showPrompt: Bool = false {
+        didSet {
+            if showPrompt {
+                explainLabel.textColor = .red
+            } else {
+                explainLabel.textColor = UIColor.subTextColor
+            }
+        }
+    }
+
     var dataSource: YHWorkItemListModel? {
         didSet {
             updateAllViews()
@@ -55,7 +64,7 @@ class YHWorkItemView: UIView {
             let label = UILabel()
             label.font = UIFont.PFSC_M(ofSize: 12)
             label.textAlignment = .left
-            label.textColor = UIColor.contentBkgColor
+            label.textColor = UIColor.subTextColor
             return label
         }()
         addSubview(subTitleLabel)
@@ -69,7 +78,7 @@ class YHWorkItemView: UIView {
             let label = UILabel()
             label.font = UIFont.PFSC_M(ofSize: 14)
             label.textAlignment = .right
-            label.textColor = UIColor.contentBkgColor
+            label.textColor = UIColor.subTextColor
             return label
         }()
         addSubview(explainLabel)
@@ -133,6 +142,9 @@ class YHWorkItemView: UIView {
         } else {
             explainLabel.text = (dataSource.entry_time ?? "") + "-" + (dataSource.entry_time ?? "")
         }
+        if dataSource.company_name?.count == 0 {
+            titleLabel.text = "工作经验\(tag - 4000 + 1)"
+        }
     }
     
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHCompanyViewModel.swift

@@ -14,7 +14,7 @@ class YHCompanyViewModel: YHBaseViewModel {
     }
     
     func requestCompany(_ key: String, callBackBlock:@escaping (_ success: [YHCompanyModelListModel]?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company + "?company=\(key)&page_size=20"
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company + "?company_name=\(key)&page_size=20&current_page=1"
         YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
@@ -24,7 +24,7 @@ class YHCompanyViewModel: YHBaseViewModel {
                 return
             }
             
-            callBackBlock(result.data, nil)
+            callBackBlock(result.list, nil)
         } failBlock: { err in
             callBackBlock([],err)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkExperienceViewModel.swift

@@ -193,7 +193,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                     "file": mainModel.file,
                     "highlights": mainModel.highlights,
                     "id": mainModel.id,
-                    "orderId": orderID,
+                    "order_id": orderID,
                     "industry": mainModel.industry,
                     "international_work_experience": mainModel.international_work_experience,
                     "is_executives": mainModel.is_executives,
@@ -233,7 +233,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
                 callBackBlock(false,nil)
                 return
             }
-            self.mainModel = result
+            self.mainModel.id = result.id
             callBackBlock(true, nil)
         } failBlock: { err in
             callBackBlock(false, err)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkIntroductionViewModel.swift

@@ -34,14 +34,15 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
     
     // 0保存 1下一步
     func saveWorkProjectDetail(_ workModel: YHWorkExperienceDetailModel, projectModel: YHWorkExperienceProjectModel, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
-        let params: [String : Any] = ["app_id": workModel.create_from_appid,
-                                      "id": projectModel.id ?? 0,
+        let params: [String : Any] = ["id": projectModel.id ?? 0,
                                       "order_id": workModel.order_id,
+                                      "work_id": workModel.id,
+                                      "project_name": projectModel.project_name ?? "",
+                                      "project_start_time": projectModel.project_start_time ?? "",
                                       "project_end_time": projectModel.project_end_time ?? "",
                                       "project_highlights": projectModel.project_highlights ?? 0,
-                                      "project_name": projectModel.project_name ?? 0,
-                                      "project_start_time": projectModel.project_start_time ?? "",
-                                      "work_id": workModel.id
+                                      "create_from_appid": projectModel.create_from_appid ?? 2,
+                                      "update_from_appid": projectModel.create_from_appid ?? 2
                                     ]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.saveProject
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkItemListViewModel.swift

@@ -44,4 +44,16 @@ class YHWorkItemListViewModel: YHBaseViewModel {
             callBackBlock(false, err)
         }
     }
+    
+    func requestSaveAllWorkExperience(_ orderId: String, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
+        let params: [String : Any] = ["order_id": orderId]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.saveAll
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            callBackBlock(true, nil)
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -102,8 +102,7 @@ class YHNetRequest: NSObject {
     private func testToken(_ requestHeader:inout HTTPHeaders) {
         //金龙的账号
         requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE2MDcwNjQsImkiOjE0NDg0MTczMjc0MjE2LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.KwTWdaLy5UG4LLs6i-D9ne0RflRTT5v4zvu-66yihDE")
-        
-//        requestHeader.add(name: "token", value:"eyJpdiI6InhISTlXZjA2cXE5Z2pqMDZDa2NrTkE9PSIsInZhbHVlIjoiR3NkRVR0dVdjWE5GN2N3UmNiU0xobVYzZTR6SXlGXC9XVEhWV0xcL1F1YXVBOU9jRDlFZ2pOanBcL1RBMUVkUDlRQ2xhREx0c3dKeHNJQjMwaVVuYkloZHBiUXQzZkJlS2dTWDJrTE90K2FpM0FDWm10a3FFUGZpdW90TDNscStud0tSenRRV2kyV3JVbEZ6eXppUHZ5ajFQMXpBejh0YUZ4Z0VPZkwwdEtwXC9mNjh4bWQySGpSS2pzVkJ1Y3ZrbGFKdGVsMkhkRXJrTlRHbzkxcVdkcE1yWXRja2xDRHVmRUhhdU9ybkJmXC9VRVJnY2RXeVpXMzZVc2h2eUsxYVRmSXR0QXB1WjVsaDBLTllVOEtKWUhSTE5yNXFvYWlaQzdQSWZ0T0V2VTZwTFJjb25OZGdYbE1lNHZOZ0ZWcWhWWkhnUm8rWGJqSE1Jdm1DY3hlWVliY2F0YkplZFwvQ0pMMndtdHFBQUF0MjJYTFNZYk14Tzh0d0g1K2c2M1U2bXFZY3JUbXptbEhCSXR5R3hFZ0JHNmpXTHgzeTJvc0Z2UXpENk5LOTlBN0VjWE8rNmYzTklBN3d0YVVPb2VyS0lNK3FINUZlTmR6UTlBdENuZEtDKzE3emwxMGxvaEc1Sm1mc0E3Y251cU5xcjd4ZzdSbHNNQ2xoRUc4VUJTR24zQ1lRSE5VRGtUd0s0ZTljSlRxRmdwMFVqY0RsMjQwcm1SaVdSN29lNjYrd1JDSlwvSUtiSWpneFpuR2VzeUFBbzNBUUh2MnNVTFZ5bXVLTGVLNFM5TjdzdXpaM1ZFRDdvRUVlRFF0QUY4d2pXcmF4NkFwMGVodXRVUFlxVGhVRmVpYlwvRUJFT05idFhyeXp4TUtcLzN0MlVcL3ZIc2dWSncxaW55TDVUVXFIWjZZMUdHakJKVnpzRkxGeE52RWdLaW9WT0tCb3pTQW1xelNwaTRaQmtGeEpITjVEUU44Q3VGSnBGdzdOcFRyTE9sYmFTT3RrMDJYU3l0XC9PcVJ1OXo2MUpJdm5XSHZFZ0lIMGh5OGR2TEJkNTZjVHFKM1hSYnVEbm9vVFU1VUUzcmRDZ3JhZWRYQWZ1cU9aajVKMHdOMGpxczBSVU5GejNrNzk3bnVBa210dFdCblVBaUs5Y0VIWmxCdE04UlV6T2NEN3ZTN2E0MEhRYmlCNGk3V2xZN1R2ZUM4cVVZZ1Rlb1BndmFcL2phemNnbEhKb05QeHhxa1BldFFqK2ErcWZmYWs1RnNPWEpNK0x4MFo4MTU4OEttZTNxeDMrcCtkNUVwSUd4b1krOXRFdU1UNVFxZyszXC9Lb21TSG5hSFI2OVRVWmxIRm9UcTRlU2kyNWF6K1pQR3lMK1MyS0FvQ2ZFaTViTmdybm1xQ1BscVMzM2tjeUFCQVlvZFdPMTJTb2ttZDl2Q3BuTXVvTnJkUDRpa0g5cE4rWlRcL1l2MWdNdmY0MFVsMFArWWYzWVNmMW5oUnkwWk1mTVc3WUluU3dyQUM4TTZBbHJac0lOMDNiYVhVWks2TCs3QnN0VDlOXC9xaEwyUEtmblVmOXpcL3hoekQ1K3JKWVozVWxrdElKbTdWTHpaMnk2bXFQQ0VJalR1TVpIc1d4bmJjVVIwdTR1VXY1M1wvMEJMODVTWkNreVpCVmh3MWRDeERROGh5YnVsMkVKV2poMFwvYnZHakMycHJmQjUycDQ3b3laUUlTSjdmaDdFMnFtTHhIN1RvUnhhcUhCWXkybkhoMlFwZUVtM0VPUVZrcXp3S0lLMFwvOUtvZnhibE1ZUnp0bGVkcGdqTlp0dGV0cGhCa3hjUmxZXC96SWRFXC83OWxEUnRma1MyYnZqWGhMN0lSM0x2Z0NCTWxIR0pUYjByWDN4Y3JCT3JLTzFzUWkzS3NYTDVDZVJ3MmhEbXlXSENqYWc9PSIsIm1hYyI6Ijc1YmU5YTE4ZGEwNzExZGJlZWQ0MzZhNGVkNWE1NGMzYmE1YWFjNjBhYTgxYjFlYjUyN2M1Yzc4ZjkwNTcyNmMifQ==")
+//        requestHeader.add(name: "token", value:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE3ODI1OTUsImkiOjEyNDMwMTA1MTY0OTA0LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.jqWpIf3SmbetApdErmBIYh-YEhX1zF_WqgqgOq5oI2A")
     }
     
     ///  链式语法
@@ -246,13 +245,15 @@ class YHNetRequest: NSObject {
 
 extension YHNetRequest {
     class func getRequest(url:String, params:[String:Any] = [:], successBlock: SuccessResultType!, failBlock: FailureHandlerType!) -> Request? {
-        
         printLog("\n发起请求的URL是===> url = \(url)")
+        printLog("\n发起请求的参数是===> url = \(params)")
         return YHNetRequest().url(url).requestType(.get).params(params).success(successBlock).failed(failBlock).startRequest()
     }
     
     class func postRequest(url:String, params:[String:Any] = [:], successBlock: SuccessResultType!, failBlock: FailureHandlerType!) -> Request? {
         printLog("\n发起请求的URL是===> url = \(url)")
+        printLog("\n发起请求的参数是===> url = \(params)")
+
         return YHNetRequest().url(url).requestType(.post).params(params).success(successBlock).failed(failBlock).startRequest()
     }