// 续期证件管理接口添加参数 批次ID

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

@@ -646,7 +646,7 @@ class YHServiceOrderListViewController: YHBaseViewController {
             gotoHKImmigrationRecordsVC(orderID: orderId)
         } else if type == 104 {
             // 续签证件管理
-            gotoResignCertificateListVC(orderID: orderId)
+            gotoResignCertificateListVC(orderID: orderId, stepID: stepId)
         }
         
         /*
@@ -819,9 +819,10 @@ extension YHServiceOrderListViewController {
         UIViewController.current?.navigationController?.pushViewController(vc)
     }
     
-    static func gotoResignCertificateListVC(orderID: Int) {
+    static func gotoResignCertificateListVC(orderID: Int, stepID: Int) {
         let vc = YHResignCertificateListViewController()
         vc.orderId = orderID
+        vc.batchId = stepID
         UIViewController.current?.navigationController?.pushViewController(vc)
     }
 }
@@ -898,7 +899,7 @@ extension YHServiceOrderListViewController: UITableViewDelegate, UITableViewData
                         YHServiceOrderListViewController.gotoHKImmigrationRecordsVC(orderID: orderID)
                     } else if tag == 4 {
                         // 续签证件管理
-                        YHServiceOrderListViewController.gotoResignCertificateListVC(orderID: orderID)
+                        YHServiceOrderListViewController.gotoResignCertificateListVC(orderID: orderID, stepID: stepID)
                     }
                 }
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateListViewController.swift

@@ -11,6 +11,7 @@ import UIKit
 class YHResignCertificateListViewController: YHBaseViewController {
     var tableView: UITableView!
     var orderId: Int = 0
+    var batchId: Int = 0
     var viewModel = YHResignCertificateListViewModel()
     
     override func viewDidLoad() {
@@ -27,7 +28,7 @@ class YHResignCertificateListViewController: YHBaseViewController {
     }
     
     func getData() {
-        viewModel.getResignCertificateList(orderId: orderId) {[weak self] _, _ in
+        viewModel.getResignCertificateList(orderId: orderId, batchId: batchId) {[weak self] _, _ in
             guard let self = self else { return }
             self.tableView.reloadData()
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignCertificateManage(续期证件管理)/VM/YHResignCertificateListViewModel.swift

@@ -11,8 +11,9 @@ import UIKit
 class YHResignCertificateListViewModel: YHBaseViewModel {
     var mainModel: YHResignCertificateMainModel = YHResignCertificateMainModel()
     
-    func getResignCertificateList(orderId: Int, callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
-        let param = ["orderId": orderId]
+    func getResignCertificateList(orderId: Int, batchId: Int, callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
+        let param = ["orderId": orderId,
+                     "renewal_id": batchId]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignCertificate.resignCertificateList
         _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, _ in
             // 1. json字符串 转 对象

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

@@ -616,6 +616,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                  if let orderId = Int(msg.orderId) {
                      let vc = YHResignCertificateListViewController()
                      vc.orderId = orderId
+                     vc.batchId = self.serviceCenterViewModel.mainModel.master_id
                      UIViewController.current?.navigationController?.pushViewController(vc)
                  }