up

JiaPeiManage.xcodeproj/project.pbxproj

@@ -1475,7 +1475,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071904;
+				CURRENT_PROJECT_VERSION = 1202023071905;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1515,7 +1515,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071904;
+				CURRENT_PROJECT_VERSION = 1202023071905;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;

JiaPeiManage/Sources/Models/TraineeInfoModel.swift

@@ -53,6 +53,7 @@ struct TraineeInfoModel : ImmutableMappable{
     var trainTwoExamTime : String!
     var trainType : String!
 
+    
 
     init(map: Map) throws {
         
@@ -98,7 +99,7 @@ struct TraineeInfoModel : ImmutableMappable{
         trainTwoExamStatus = try map.value("trainTwoExamStatus") ?? ""
         trainTwoExamTime = try map.value("trainTwoExamTime") ?? ""
         trainType = try map.value("trainType")
-        
+        trainTwoExamTime = try map.value("trainTwoExamTime") ?? ""
     }
 
 }

JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetails/MeTraineeDetails01Controller.swift

@@ -56,8 +56,8 @@ final class MeTraineeDetails01Controller: BaseTableViewController {
                               "联系地址":info.address,
                               "培训车型":info.trainType,
                               "是否激活":(info.active=="1" ? "是":"否"),
-                              "备案时间":info.recordDate,
-                              "所属机构":info.schoolName,]
+                              "备案时间":info.recordDate ?? "",
+                              "所属机构":info.schoolName ?? "",]
         let onetime:String = info.trainOneExamStatus=="1" ? "运管已签章"+info.trainOneExamTime.prefix(10):"无"
         let twotime:String = info.trainTwoExamStatus=="1" ? "运管已签章"+info.trainTwoExamTime.prefix(10):"无"
         let threetime:String = info.trainThreeExamStatus=="1" ? "运管已签章"+info.trainThreeExamTime.prefix(10):"无"
@@ -155,15 +155,6 @@ extension MeTraineeDetails01Controller:UITableViewDataSource {
 
 //事件
 extension MeTraineeDetails01Controller:UITableViewDelegate {
-    
-//    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-//        tableView.deselectRow(at: indexPath, animated: false)
-//        let rowInfo = self.traineeDataModel?.rows![indexPath.row]
-//        if rowInfo != nil {
-//            let context: Int = rowInfo?.id ?? 0
-//            NYSwRouter.push(NYSwPushType.trainee_info,context: context)
-//        }
-//    }
-    
+
 }
 

JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetails/MeTraineeDetails03Controller.swift

@@ -26,11 +26,12 @@ final class MeTraineeDetails03Controller: BaseGroupTableViewController {
     var page:Int = 1
     var pageSize:Int = 10
     var stuOutId:Int = 0
+    var traineeInfoModel:TraineeInfoModel?
     
-    
-    init(stuOutId:Int) {
+    init(stuOutId:Int,info:TraineeInfoModel) {
         super.init()
         self.stuOutId = stuOutId
+        self.traineeInfoModel = info
     }
     
     required convenience init?(coder aDecoder: NSCoder) {
@@ -45,7 +46,6 @@ final class MeTraineeDetails03Controller: BaseGroupTableViewController {
     }
     
     // MARK: 私有方法
-    
     func getStuResultList(){
         page = 1
         self.cocahService.stuLogFacListByStuIdRequest(pageNum: page, pageSize: pageSize, stuOutId: stuOutId, city: LocalManager.userInfo.city!)
@@ -123,9 +123,8 @@ extension MeTraineeDetails03Controller:UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        if(rows.count>0){
-            let info = rows.first! as StuLogFacInfoModel
-            header03_view.usertemplate_imageview.sd_setImage(with: info.sourceimg?.urlValue)
+        if(self.traineeInfoModel != nil){
+            header03_view.usertemplate_imageview.sd_setImage(with: self.traineeInfoModel?.face?.urlValue)
         }
         return header03_view
     }

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

@@ -248,7 +248,7 @@ extension MeTraineeDetailsPageViewController : VTMagicViewDataSource{
                 if (traineeInfoModel != nil) {
                     stuId = (traineeInfoModel?.id)!
                 }
-                meTraineeDetails03Controller = MeTraineeDetails03Controller(stuOutId: stuId)
+                meTraineeDetails03Controller = MeTraineeDetails03Controller(stuOutId: stuId,info: self.traineeInfoModel!)
             }
             return meTraineeDetails03Controller ?? UIViewController()
         } else {