添加参数 stepID

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

@@ -11,7 +11,7 @@ import JXSegmentedView
 
 class YHServerCenterHoldViewController: UIViewController {
     private let serviceCenterMainReqVM : YHServiceCenterViewModel = YHServiceCenterViewModel()
-
+    var stepID: Int = 0
     var mobile: String = ""
     var orderId: Int = 0 {
         didSet {
@@ -28,6 +28,7 @@ class YHServerCenterHoldViewController: UIViewController {
                 vc.mobile = mobile
                 vc.arrDataForSeviceCenterProgress = arrDataForSeviceCenterProgress
                 vc.state = state
+                vc.stepID = stepID
                 vc.loadData()
             }
         }
@@ -100,6 +101,7 @@ class YHServerCenterHoldViewController: UIViewController {
         view.backgroundColor = .clear
         controllerOne.type = 0
         controllerOne.orderID = orderId
+        controllerOne.stepID = stepID
         controllerOne.block = {[weak self] type, count, flag in
             guard let self = self else { return }
             arrItemTitles[0] = "全部(\(count))"
@@ -107,6 +109,7 @@ class YHServerCenterHoldViewController: UIViewController {
         }
         controllerTwo.type = 2
         controllerTwo.orderID = orderId
+        controllerTwo.stepID = stepID
         controllerTwo.block = {[weak self] type, count, flag in
             guard let self = self else { return }
             arrItemTitles[1] = "进行中(\(count))"
@@ -114,6 +117,7 @@ class YHServerCenterHoldViewController: UIViewController {
         }
         controllerThree.type = 1
         controllerThree.orderID = orderId
+        controllerThree.stepID = stepID
         controllerThree.block = {[weak self] type, count, flag in
             guard let self = self else { return }
             arrItemTitles[2] = "待开始(\(count))"
@@ -121,6 +125,7 @@ class YHServerCenterHoldViewController: UIViewController {
         }
         controllerFour.type = 3
         controllerFour.orderID = orderId
+        controllerFour.stepID = stepID
         controllerFour.block = {[weak self] type, count, flag in
             guard let self = self else { return }
             arrItemTitles[3] = "已完成(\(count))"

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

@@ -26,6 +26,7 @@ class YHServiceCenterViewController: YHBaseViewController {
     var arrDataForSeviceCenterProgress: [YHServiceCenterProgressModel] = []
     var state: Int = 0
     var isCanSelectStep: Bool = false
+    var stepID: Int = 0
     
     private lazy var topBkg : UIView = {
         let imagV = UIImageView()
@@ -274,9 +275,11 @@ extension YHServiceCenterViewController {
             }
             if self.state == 3 {
                 self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.list ?? []
+                self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.id ?? 0
                 self.homeTableView.tableHeaderView = headView
-                self.headView.block = {[weak self] array in
+                self.headView.block = {[weak self] id, array in
                     guard let self = self else { return }
+                    self.stepID = id
                     self.arrDataForSeviceCenterProgress = array
                     self.homeTableView.reloadData()
                 }
@@ -344,9 +347,11 @@ extension YHServiceCenterViewController {
             }
             if self.state == 3 {
                 self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.list ?? []
+                self.stepID = self.serviceCenterMainReqVM.mainModel.renewalSection.list.first?.id ?? 0
                 self.homeTableView.tableHeaderView = headView
-                self.headView.block = {[weak self] array in
+                self.headView.block = {[weak self] id, array in
                     guard let self = self else { return }
+                    self.stepID = id
                     self.arrDataForSeviceCenterProgress = array
                     self.homeTableView.reloadData()
                 }
@@ -410,6 +415,7 @@ extension YHServiceCenterViewController : UITableViewDelegate,UITableViewDataSou
         cellView.arrDataForSeviceCenterProgress = arrDataForSeviceCenterProgress
         cellView.mobile = model.mobile
         cellView.state = state
+        cellView.stepID = stepID
         cellView.orderId = orderId
         return cell
     }

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

@@ -22,6 +22,7 @@ class YHServiceOrderListView: YHBaseViewController {
     var homeTableView: UITableView!
     var orderType: Int = 0
     var state: Int = 0
+    var stepID: Int = 0
     var arrDataForSeviceCenterProgress: [YHServiceCenterProgressModel] = []
 
     lazy var noDataView: YHEmptyDataView = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHServiceCenterProgressModel.swift

@@ -44,7 +44,7 @@ struct YHServiceStepProgressModel: SmartCodable {
 
 struct YHServiceStepProgressThreeModel: SmartCodable {
     var personStr : String = ""
-    var type : Int = 0
+    var id : Int = 0
     var list : [YHServiceCenterProgressModel] = []
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceCenterStepThreeTableHeadView.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 class YHServiceCenterStepThreeTableHeadView: UIView {
-    typealias Block = ([YHServiceCenterProgressModel]) -> ()
+    typealias Block = (Int, [YHServiceCenterProgressModel]) -> ()
     var block: Block?
     
     var dataSource: [YHServiceStepProgressThreeModel] = [] {
@@ -155,7 +155,7 @@ extension YHServiceCenterStepThreeTableHeadView: UICollectionViewDelegate, UICol
         collectionView.reloadData()
         let array = model.list
         if let block = block {
-            block(array)
+            block(model.id, array)
         }
     }
 }