// 方案进入

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

@@ -222,8 +222,7 @@ extension YHInformationPerfectListVC {
 //        vc.model = serviceCenterMainReqVM.allInfoScoreModel
 //        navigationController?.pushViewController(vc)
         
-        let vc = YHMyNewSchemeViewController()
-        navigationController?.pushViewController(vc)
+        YHMyNewSchemeViewController.shared.goToSchemePage()
     }
     
     @objc func goInfoListVC( ) {

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

@@ -74,9 +74,8 @@ class YHServiceOrderListView: YHBaseViewController {
                     
         } else if type == 4 { // 方案
             //我的方案
-            let vc = YHMyNewSchemeViewController()
-            UIViewController.current?.navigationController?.pushViewController(vc)
-            
+            YHMyNewSchemeViewController.shared.goToSchemePage()
+
         } else if type == 5 {
             //我的签字
             let vc = YHMySignatureListViewController()

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

@@ -35,6 +35,8 @@ class YHMyNewSchemeViewController: YHBaseViewController {
     var unpassArr: [YHComprehensiveEevaluationModel] = []
     var isPass: Bool = false
     let viewModel = YHSchemeViewModel()
+    
+    static let shared = YHMyNewSchemeViewController()
 
     lazy var tableView: UITableView = {
         
@@ -169,6 +171,35 @@ class YHMyNewSchemeViewController: YHBaseViewController {
         return view
     }()
     
+    func goToSchemePage() {
+        
+        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
+            orderId = orderID
+        }
+        YHHUD.show(.progress(message: "加载中..."))
+        viewModel.getImproveDetail(orderId: orderId) {
+            [weak self] success, error in
+            YHHUD.hide()
+            guard let self = self else { return }
+            
+            if self.viewModel.improveDetailModel.improvePlanItem.count > 0 { // 提交过方案
+                let vc1 = YHMyNewSchemeViewController()
+                let vc2 = YHImproveSchemeViewController()
+                vc2.isPass = false
+                vc2.orderId = orderId
+                
+                UIViewController.current?.navigationController?.pushViewController(vc1, animated: false)
+                UIViewController.current?.navigationController?.pushViewController(vc2, animated: false)
+
+            } else { // 未提交过方案
+                
+                let vc = YHMyNewSchemeViewController()
+                UIViewController.current?.navigationController?.pushViewController(vc)
+            }
+                
+        }
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
        
@@ -231,6 +262,7 @@ class YHMyNewSchemeViewController: YHBaseViewController {
                 let item5 = YHSchemeItem(type: .documentList)
                 let item6 = YHSchemeItem(type: .improveScheme)
                 var arr1: [YHSchemeItem]
+                
                 if passArr.count > 0 {
                     arr1 = [item1, item2, item3, item4, item5, item6]
                 } else {

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

@@ -474,8 +474,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
             }
         
         } else if msg.redirectPage == YHRedirectPage.myPlan.rawValue { // 我的方案
-            let vc = YHMyNewSchemeViewController()
-            navigationController?.pushViewController(vc)
+            YHMyNewSchemeViewController.shared.goToSchemePage()
 
         } else if msg.redirectPage == YHRedirectPage.myDocument.rawValue { // 我的文书
             if let orderId = Int(msg.orderId) {