ninggege。提交了新的 CRUD

JiaPeiManage/Sources/Modulars/Home/Controllers/HomeViewController.swift

@@ -55,7 +55,6 @@ final class HomeViewController: BaseViewController {
         self.meStuAction_button.rx.tap.subscribe ({ [unowned self] (_)  in
             if !LocalManager.isOpenLogin() { return}
             NYSwRouter.open(NYSwOpenType.traineetab.rawValue)
-            //NYSwRouter.push(NYSwPushType.trainee_list.path)
         }).disposed(by: disposeBag)
         //在校学员-action
         self.onSchoolAction_button.rx.tap.subscribe ({ [unowned self] (_)  in
@@ -70,7 +69,7 @@ final class HomeViewController: BaseViewController {
         //绑定学员-action
         self.biandAction_button.rx.tap.subscribe ({ [unowned self] (_)  in
             if !LocalManager.isOpenLogin() { return}
-            
+            NYSwRouter.push(NYSwPushType.trainee_list_biand.path)
         }).disposed(by: disposeBag)
         //统计-action
         self.statisticsAction_button.rx.tap.subscribe ({ [unowned self] (_)  in

JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeListViewController.swift

@@ -12,6 +12,7 @@ import RxCocoa
 enum TraineeType {
     case advancet
     case official
+    case biandstu
     case none
 }
 
@@ -54,6 +55,8 @@ final class MeTraineeListViewController: BaseViewController {
         $0.magicView.separatorHeight = 0 //下划线h
     }
     
+    var advancetTraineeSubjectPageViewController:MeTraineeSubjectPageViewController?
+    
     override func setupConstraints() {
         
         statusBar.snp.makeConstraints { (make) in
@@ -66,12 +69,17 @@ final class MeTraineeListViewController: BaseViewController {
             make.height.equalTo(Metric.navBarHeight)
             make.top.equalTo(statusBar.snp.bottom)
         }
-        
-        pageController.view.snp.makeConstraints { (make) in
-            make.left.right.bottom.equalToSuperview()
-            make.top.equalTo(navBar.snp.bottom)
+        if self.type != .advancet {
+            pageController.view.snp.makeConstraints { (make) in
+                make.left.right.bottom.equalToSuperview()
+                make.top.equalTo(navBar.snp.bottom)
+            }
+        }else {
+            advancetTraineeSubjectPageViewController?.view.snp.makeConstraints { (make) in
+                make.left.right.bottom.equalToSuperview()
+                make.top.equalTo(navBar.snp.bottom)
+            }
         }
-        
     }
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
     }
@@ -99,6 +107,9 @@ final class MeTraineeListViewController: BaseViewController {
             self.tabBarItem.image = NYImage.TabBar.official
             self.tabBarItem.selectedImage = NYImage.TabBar.official_s?.withRenderingMode(.alwaysOriginal)
             return
+        case .biandstu:
+            self.navBar.title_label.text = "我的绑定学员"
+            return
         case .none:
             return
         }
@@ -111,8 +122,8 @@ final class MeTraineeListViewController: BaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        setupUI()
         configureMagicController()
+        setupUI()
     }
     
     // MARK: 私有方法
@@ -121,21 +132,29 @@ final class MeTraineeListViewController: BaseViewController {
         self.navBar.back_button.addTarget(self, action: #selector(actionBackdo), for: .touchUpInside)
         self.navBar.search_button.addTarget(self, action: #selector(jumpSearchdo), for: .touchUpInside)
 //        self.navBar.search_button.rx.tap.subscribe ({  [unowned self] (_) in
-//            self.jumpSearch()
-//        }).disposed(by: self.disposeBag)
+////            self.jumpSearch()
+//            print("search_button=====%@",self)
+//            NYSwRouter.push(NYSwPushType.trainee_search.path)
+//        }).disposed(by: disposeBag)
     }
     
     func configureMagicController(){
      
         self.view.addSubview(navBar)
         self.view.addSubview(statusBar)
-        self.addChild(pageController)
-        self.view.addSubview(pageController.view)
-        
-        //设置VTMagicController代理,初始页码
-        pageController.magicView.delegate = self
-        pageController.magicView.dataSource = self
-        pageController.magicView.reloadData(toPage: 0)
+        if self.type != .advancet {
+            self.addChild(pageController)
+            self.view.addSubview(pageController.view)
+            //设置VTMagicController代理,初始页码
+            pageController.magicView.delegate = self
+            pageController.magicView.dataSource = self
+            pageController.magicView.reloadData(toPage: 0)
+        }else{
+            //预报名
+            advancetTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "0",schoolId: schoolId)
+            self.addChild(advancetTraineeSubjectPageViewController!)
+            self.view.addSubview(advancetTraineeSubjectPageViewController!.view)
+        }
         
     }
     

JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeSubjectPageViewController.swift

@@ -70,6 +70,21 @@ final class MeTraineeSubjectPageViewController: BaseTableViewController {
                 .disposed(by: disposeBag)
             
             return
+        }else if(self.type == .biandstu){ //绑定学员
+            self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: "\(LocalManager.userInfo.id)", coachId: "", field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                .subscribe(onSuccess: { traineeDataModel in
+                    self.rows.removeAll()
+                    self.traineeDataModel = traineeDataModel
+                    self.rows += traineeDataModel.rows!
+                    print("coachInfoListRequest成功")
+                    self.hideLoadAnimation()
+                    self.tableView.reloadData()
+                    self.stopRefresh()
+                }, onError: { error in
+                    self.stopRefresh()
+                })
+                .disposed(by: disposeBag)
+            return
         }
         self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: "\(LocalManager.userInfo.id)", field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
             .subscribe(onSuccess: { traineeDataModel in
@@ -113,6 +128,21 @@ final class MeTraineeSubjectPageViewController: BaseTableViewController {
                 })
                 .disposed(by: disposeBag)
             return
+        }else if(self.type == .biandstu){ //绑定学员
+            self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: "\(LocalManager.userInfo.id)", coachId: "", field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                .subscribe(onSuccess: { traineeDataModel in
+                    self.traineeDataModel = traineeDataModel
+                    if(traineeDataModel.rows!.count>0){
+                        self.rows += traineeDataModel.rows!
+                    }
+                    print("coachInfoListRequest成功")
+                    self.tableView.reloadData()
+                    self.stopLoad()
+                }, onError: { error in
+                    self.stopLoad()
+                })
+                .disposed(by: disposeBag)
+            return
         }
         //请求网络-加载
         self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: "\(LocalManager.userInfo.id)", field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)

JiaPeiManage/Sources/Utils/NYSwRouter.swift

@@ -14,6 +14,7 @@ enum NYSwPushType {
     case trainee_info
     case trainee_search
     case trainee_list
+    case trainee_list_biand
     case mine_center
     case mine_uppassword
     case trainee_list_school
@@ -36,6 +37,8 @@ extension NYSwPushType {
             return "JiaPeiManage://me/trainee/info"
         case .trainee_list:
             return "JiaPeiManage://me/trainee/list"
+        case .trainee_list_biand:
+            return "JiaPeiManage://me/trainee/list/biand"
         case .trainee_search:
             return "JiaPeiManage://me/trainee/search"
         case .trainee_list_school:

JiaPeiManage/Sources/Utils/URLNavigationMap.swift

@@ -36,6 +36,11 @@ final class URLNavigationMap {
             return meTraineeListViewController
         }
         
+        navigator.register(NYSwPushType.trainee_list_biand.path) { (url, values, context) -> UIViewController? in
+            let meTraineeListViewController = MeTraineeListViewController(type: .biandstu)
+            return meTraineeListViewController
+        }
+        
         navigator.register(NYSwPushType.trainee_list_school.path) { (url, values, context) -> UIViewController? in
             
             let meTraineeListViewController = MeTraineeListViewController(type: .none)