Merge branch 'qmas-1130' into AI-1212

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

@@ -173,6 +173,8 @@ class YHImproveSchemeViewController: YHBaseViewController {
         }
         view.bringSubviewToFront(gk_navigationBar)
         tableView.reloadData()
+        tableView.isHidden = true
+        bottomView.isHidden = true
         
         requestData()
     }
@@ -189,13 +191,16 @@ class YHImproveSchemeViewController: YHBaseViewController {
     }
 
     func requestData() {
+        YHHUD.show(.progress(message: "加载中..."))
         viewModel.getImproveDetail(orderId: orderId) {
             [weak self] success, error in
+            YHHUD.hide()
             guard let self = self else { return }
             items.removeAll()
             items.append(contentsOf: viewModel.improveDetailModel.improvePlanItem)
             tableView.reloadData()
-            
+            tableView.isHidden = false
+            bottomView.isHidden = false
             var name = viewModel.improveDetailModel.username
             if name.count > 5 {
                 name = String(name.prefix(5)) + "..."

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

@@ -461,7 +461,7 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
                     }
                     self.companyModel.has_all_file = flag.rawValue
                     self.isHasAllFileOK = flag != .unknown
-                    self.tableView.reloadRows(at: [indexPath], with: .none)
+                    self.tableView.reloadRows(at: [indexPath], with: .automatic)
                 }
                 return cell
             }

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

@@ -191,9 +191,9 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
             cell.clickBlock = { [weak self] value, index in
                 guard let self = self else { return }
                 if index == 0 {
-                    self.viewModel?.mainModel.work_time_empty_remark = value
-                } else {
                     self.viewModel?.mainModel.work_time_overlap_remark = value
+                } else {
+                    self.viewModel?.mainModel.work_time_empty_remark = value
                 }
             }
             cell.backgroundColor = .clear

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

@@ -60,8 +60,8 @@ class YHWorkItemListViewModel: YHBaseViewModel {
     
     func requestWorkTimeRemarkWorkExperience(_ orderId: String, _ isSaveAll: Int = 0, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
         let params: [String : Any] = ["order_id": orderId,
-                                      "work_time_empty_remark": self.mainModel.work_time_overlap_remark,
-                                      "work_time_overlap_remark": self.mainModel.work_time_empty_remark,
+                                      "work_time_empty_remark": self.mainModel.work_time_empty_remark,
+                                      "work_time_overlap_remark": self.mainModel.work_time_overlap_remark,
                                       "is_save_all": isSaveAll]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.saveWorkTimeRemark
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in