获奖情况列表页面 , 新增获奖情况页面 , 数字简历页面获奖数据同步

“张旭”
1 parent 3099124a
Showing 12 changed files with 764 additions and 115 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeWorkDetailController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkFirCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkSecCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
metaCode/Classes/Main/HomePage/ViewModel/Vitae/CNLiveVitaeViewModel.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_awardBg.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_awardBg.imageset/mine_jianli_awardBg@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/jianli/mine_jianli_awardBg.imageset/mine_jianli_awardBg@3x.png
@@ -3,13 +3,23 @@
 //  metaCode
 //
 //  Created by zx on 2024/7/29.
-//  数字简历-添加工作记录页面
+//  数字简历-添加工作记录页面/添加获奖情况页面
 import Foundation
 import SnapKit
+///数字简历工作/获奖类型
+enum CNLiveViateWorkAwardType {
+    ///工作记录
+    case work
+    ///获奖情况
+    case award
+}
+
 class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
+    var workAwardType:CNLiveViateWorkAwardType = .work
+    
     var hangHeight:CGFloat = (KSreenWidth-90)/3.0+10
     var secCell:CNLiveVitaeAddWorkSecCell?
     var seleArr:Array<String>?
@@ -26,7 +36,16 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
             _workModel = newValue!
         }
     }
-
+    //简历awardModel
+    var _awardModel : CNLiveVitaeAwardsModel?
+    var awardModel : CNLiveVitaeAwardsModel? {
+        get{
+            _awardModel
+        }
+        set{
+            _awardModel = newValue!
+        }
+    }
     let kCNLiveVitaeAddWorkFirCellIdentifier = "kCNLiveVitaeAddWorkFirCellIdentifier"
     let kCNLiveVitaeAddWorkSecCellIdentifier = "kCNLiveVitaeAddWorkSecCellIdentifier"
@@ -71,11 +90,15 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     override func viewDidLoad() {
         super.viewDidLoad()
-        titleName = "新增工作记录"
+        if self.workAwardType == .work{
+            titleName = "新增工作记录"
+        }else{
+            titleName = "新增获奖情况"
+        }
         navigationBarHidden = false
         self.initUI()
-        if self.workModel != nil{
+        if self.workModel != nil || self.awardModel != nil{
             self.tableView.reloadData()
         }
     }
@@ -117,7 +140,11 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 3
+        if self.workAwardType == .work{
+            return 3
+        }else{
+            return 2
+        }
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -128,9 +155,18 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 let cell = CNLiveVitaeAddWorkFirCell()
                 return cell
             }
-            if self.workModel != nil{
-                cell.workModel = self.workModel!
+            if self.workAwardType == .work{
+                if self.workModel != nil{
+                    cell.workModel = self.workModel!
+                }
+                cell.workAwardType = .work
+            }else{
+                if self.awardModel != nil{
+                    cell.awardModel = self.awardModel!
+                }
+                cell.workAwardType = .award
             }
+            
             return cell
         }else if indexPath.row == 1{
             //SecCell
@@ -139,15 +175,23 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 let cell = CNLiveVitaeAddWorkSecCell()
                 return cell
             }
-            if self.workModel != nil && self.isFirstEdit == true{
-                cell.workModel = self.workModel!
-                self.isFirstEdit = false
+            if self.workAwardType == .work{
+                
+                if self.workModel != nil && self.isFirstEdit == true{
+                    cell.workModel = self.workModel!
+                    self.isFirstEdit = false
+                }
+            }else{
+                if self.awardModel != nil && self.isFirstEdit == true{
+                    cell.awardModel = self.awardModel!
+                    self.isFirstEdit = false
+                }
             }
             cell.uploadImageSuceessBlock = { imageUrl in
             }
             cell.selectUploadImageView?.changeUploadDataCallBack = { imageUrls , videoUrl in
-                self.seleVideoUrl = videoUrl 
+                self.seleVideoUrl = videoUrl
                 self.seleArr = imageUrls
             }
@@ -160,6 +204,7 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 self.seleArr = arr
                 self.tableView.reloadData()
             }
+                
             return cell
         }else if indexPath.row == 2{
             //ThreeCell
@@ -183,7 +228,11 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.row == 0{
-            return 276+15
+            if self.workAwardType == .work{
+                return 276+15
+            }else{
+                return 184+15
+            }
         }else if indexPath.row == 1{
             if self.secCell == nil{
                 return self.hangHeight+268+15
@@ -199,74 +248,138 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
     //确认提交证书
     @objc func addWorkBtnAction() {
-        let firCell = self.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? CNLiveVitaeAddWorkFirCell
-        let secCell = self.tableView.cellForRow(at: IndexPath(row: 1, section: 0)) as? CNLiveVitaeAddWorkSecCell
-        let threeCell = self.tableView.cellForRow(at: IndexPath(row: 2, section: 0)) as? CNLiveVitaeAddWorkThreeCell
-        //判断非空
-        if firCell?.weizhiRightTitleLabel.text?.count == 0 || firCell?.weizhiRightTitleLabel.text == "请选择"{
-            showMessage(message: "请选择职业")
-            return
-        }
-        if firCell?.phoneTextFiled.text?.count == 0 || firCell?.phoneTextFiled.text == "请填写"{
-            showMessage(message: "请填写岗位名称")
-            return
-        }
-        if firCell?.canjiaRightTitleLabel.text?.count == 0 || firCell?.canjiaRightTitleLabel.text == "请选择"{
-            showMessage(message: "请选择开始时间")
-            return
-        }
-        if firCell?.endTimeRightTitleLabel.text?.count == 0 || firCell?.endTimeRightTitleLabel.text == "请选择"{
-            showMessage(message: "请选择结束时间")
-            return
-        }
-        if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "获奖描述"{
-            showMessage(message: "请填写经历描述")
-            return
-        }
-        var newString = ""
-        if self.seleArr?.count ?? 0 > 0{
-            if self.seleVideoUrl.count > 0{
-                self.seleArr!.append(self.seleVideoUrl)
+        if self.workAwardType == .work{
+            let firCell = self.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? CNLiveVitaeAddWorkFirCell
+            let secCell = self.tableView.cellForRow(at: IndexPath(row: 1, section: 0)) as? CNLiveVitaeAddWorkSecCell
+            let threeCell = self.tableView.cellForRow(at: IndexPath(row: 2, section: 0)) as? CNLiveVitaeAddWorkThreeCell
+
+            //判断非空
+            if firCell?.weizhiRightTitleLabel.text?.count == 0 || firCell?.weizhiRightTitleLabel.text == "请选择"{
+                showMessage(message: "请选择职业")
+                return
             }
-            newString = self.seleArr!.joined(separator: ",")
-        }else{
-            if self.seleArr == nil || self.seleArr?.count ?? 0 == 0{
-                if self.seleVideoUrl.count == 0{
-                    //
-                    showMessage(message: "请上传凭证")
-                    return
+            if firCell?.phoneTextFiled.text?.count == 0 || firCell?.phoneTextFiled.text == "请填写"{
+                showMessage(message: "请填写岗位名称")
+                return
+            }
+            if firCell?.canjiaRightTitleLabel.text?.count == 0 || firCell?.canjiaRightTitleLabel.text == "请选择"{
+                showMessage(message: "请选择开始时间")
+                return
+            }
+            if firCell?.endTimeRightTitleLabel.text?.count == 0 || firCell?.endTimeRightTitleLabel.text == "请选择"{
+                showMessage(message: "请选择结束时间")
+                return
+            }
+            if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "获奖描述"{
+                showMessage(message: "请填写经历描述")
+                return
+            }
+            
+            var newString = ""
+            if self.seleArr?.count ?? 0 > 0{
+                if self.seleVideoUrl.count > 0{
+                    self.seleArr!.append(self.seleVideoUrl)
+                }
+                newString = self.seleArr!.joined(separator: ",")
+            }else{
+                if self.seleArr == nil || self.seleArr?.count ?? 0 == 0{
+                    if self.seleVideoUrl.count == 0{
+                        //
+                        showMessage(message: "请上传凭证")
+                        return
+                    }else{
+                        if self.seleVideoUrl.count > 0{
+                            newString = self.seleVideoUrl
+                        }
+                    }
                 }else{
-                    if self.seleVideoUrl.count > 0{
-                        newString = self.seleVideoUrl
+                    
+                }
+            }
+            let danWei = threeCell?.phoneTextFiled.text ?? ""
+            let workDiDian = threeCell?.weizhiRightTitleLabel.text ?? ""
+            if let userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
+                let jianli_vitaeId = userDic["jianli_vitaeId"] as? String
+                let vsid = userDic["vsid"] as? String
+                let startTime = self.convertDateStringToMillisecondsString(dateString: firCell?.canjiaRightTitleLabel.text ?? "")
+                let endTime = self.convertDateStringToMillisecondsString(dateString: firCell?.endTimeRightTitleLabel.text ?? "")
+                //提交工作记录
+                var id = ""
+                if self.workModel != nil{
+                    id = self.workModel!.id
+                }
+                CNLiveVitaeViewModel.saveWork(city: workDiDian, companyName: danWei, imgs: newString, jobDuties: secCell?.huoJiangtextView.text ?? "", startWorkingDate:startTime ?? "" , endWorkingDate: endTime ?? "" , position: firCell?.phoneTextFiled.text ?? "", profession: firCell?.weizhiRightTitleLabel.text ?? "", vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
+                    if status == .success{
+                        self.navigationController?.viewControllers.forEach({ item in
+                            if (item.isKind(of: CNLiveDigitalResumeController.self)) {
+                                self.navigationController?.popToViewController(item, animated: true)
+                            }
+                        })
                     }
                 }
-            }else{
-                
             }
-        }
-        let danWei = threeCell?.phoneTextFiled.text ?? ""
-        let workDiDian = threeCell?.weizhiRightTitleLabel.text ?? ""
-        if let userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
-            let jianli_vitaeId = userDic["jianli_vitaeId"] as? String
-            let vsid = userDic["vsid"] as? String
-            let startTime = self.convertDateStringToMillisecondsString(dateString: firCell?.canjiaRightTitleLabel.text ?? "")
-            let endTime = self.convertDateStringToMillisecondsString(dateString: firCell?.endTimeRightTitleLabel.text ?? "")
-            //提交工作记录
-            var id = ""
-            if self.workModel != nil{
-                id = self.workModel!.id
+        }else{
+        //获奖
+            let firCell = self.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? CNLiveVitaeAddWorkFirCell
+            let secCell = self.tableView.cellForRow(at: IndexPath(row: 1, section: 0)) as? CNLiveVitaeAddWorkSecCell
+            //判断非空
+            if firCell?.phoneTextFiled.text?.count == 0 || firCell?.phoneTextFiled.text == "请填写"{
+                showMessage(message: "请填写获奖名称")
+                return
             }
-            CNLiveVitaeViewModel.saveWork(city: workDiDian, companyName: danWei, imgs: newString, jobDuties: secCell?.huoJiangtextView.text ?? "", startWorkingDate:startTime ?? "" , endWorkingDate: endTime ?? "" , position: firCell?.phoneTextFiled.text ?? "", profession: firCell?.weizhiRightTitleLabel.text ?? "", vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
-                if status == .success{
-                   self.navigationController?.viewControllers.forEach({ item in
-                       if (item.isKind(of: CNLiveDigitalResumeController.self)) {
-                           self.navigationController?.popToViewController(item, animated: true)
-                       }
-                   })
-               }
+            if firCell?.canjiaRightTitleLabel.text?.count == 0 || firCell?.canjiaRightTitleLabel.text == "请选择"{
+                showMessage(message: "请选择开始时间")
+                return
+            }
+            if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "描述"{
+                showMessage(message: "请填写描述")
+                return
             }
+            var newString = ""
+            if self.seleArr?.count ?? 0 > 0{
+                if self.seleVideoUrl.count > 0{
+                    self.seleArr!.append(self.seleVideoUrl)
+                }
+                newString = self.seleArr!.joined(separator: ",")
+            }else{
+                if self.seleArr == nil || self.seleArr?.count ?? 0 == 0{
+                    if self.seleVideoUrl.count == 0{
+                        //
+                        showMessage(message: "请上传凭证")
+                        return
+                    }else{
+                        if self.seleVideoUrl.count > 0{
+                            newString = self.seleVideoUrl
+                        }
+                    }
+                }else{
+                    
+                }
+            }
+
+            if let userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
+                let jianli_vitaeId = userDic["jianli_vitaeId"] as? String
+                let vsid = userDic["vsid"] as? String
+                let startTime = self.convertDateStringToMillisecondsString(dateString: firCell?.canjiaRightTitleLabel.text ?? "")
+                //提交工作记录
+                var id = ""
+                if self.awardModel != nil{
+                    id = self.awardModel!.id
+                }
+                CNLiveVitaeViewModel.saveAward(company: firCell?.banfaTextFiled.text ?? "", description: secCell?.huoJiangtextView.text ?? "", time: startTime ?? "", title: firCell?.phoneTextFiled.text ?? "", imgs: newString, vsid: vsid ?? "", vitaeId: jianli_vitaeId ?? "", id: id) { result, status in
+                    if status == .success{
+                        self.navigationController?.viewControllers.forEach({ item in
+                            if (item.isKind(of: CNLiveDigitalResumeController.self)) {
+                                self.navigationController?.popToViewController(item, animated: true)
+                            }
+                        })
+                    }
+
+                }
+                
+            }
         }
     }
@@ -11,6 +11,8 @@ import JFHeroBrowser
 class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
     var jianjieLblHeight:CGFloat = 40
     var cellHeights:Array<CGFloat> = Array()
+    
+    var workAwardType:CNLiveViateWorkAwardType = .work
     lazy var bgImgView :UIImageView = {
         let iconImgView = UIImageView()
@@ -61,8 +63,8 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
         nextBtn.addTarget(self, action: #selector(addWorkBtnAction), for: .touchUpInside)
         return nextBtn
     }()
-    lazy var workListArr :Array<CNLiveVitaeWorksModel> = {
-        let dataArray = Array<CNLiveVitaeWorksModel>()
+    lazy var workListArr :Array<Any> = {
+        let dataArray = Array<Any>()
         return dataArray
     }()
@@ -72,9 +74,19 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
     }
     override func viewDidLoad() {
         super.viewDidLoad()
-        titleName = "工作记录"
         navigationBarHidden = false
         self.initUI()
+        if self.workAwardType == .work{
+            titleName = "工作记录"
+            self.bgImgView.image = UIImage(named: "mine_jianli_workBg")
+            self.yuanmaLabel.text = "工作记录"
+            self.addWorkBtn.setTitle("添加工作记录", for: .normal)
+        }else{
+            titleName = "获奖情况"
+            self.bgImgView.image = UIImage(named: "mine_jianli_awardBg")
+            self.yuanmaLabel.text = "获奖情况"
+            self.addWorkBtn.setTitle("添加获奖记录", for: .normal)
+        }
     }
     deinit {}
@@ -131,17 +143,28 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
             let cell = CNLiveVitaeWorkCell()
             return cell
         }
-        let model = workListArr[indexPath.row]
-        cell.workModel = model
+        if self.workAwardType == .work{
+            let model = workListArr[indexPath.row] as! CNLiveVitaeWorksModel
+            cell.workModel = model
+        }else{
+            let model = workListArr[indexPath.row] as! CNLiveVitaeAwardsModel
+            cell.awardModel = model
+        }
         cell.vitaeWorkCellChangedBlock = { workCell,jianjieHeight in
             let res = self.workListArr
-            var tempArr = Array<CNLiveVitaeWorksModel>()
+            var tempArr = Array<Any>()
             let idxPath = tableView.indexPath(for: workCell)
             for (idx,mdl) in res.enumerated() {
                 if idx == idxPath?.row{
-                    let layout = CNLiveViateWorkModelLayout(model: mdl,descH: Float(jianjieHeight))
-                    let newWorkModel = layout.getCellHModel()
-                    tempArr.append(newWorkModel)
+                    if self.workAwardType == .work{
+                        let layout = CNLiveViateWorkModelLayout(model: mdl as! CNLiveVitaeWorksModel,descH: Float(jianjieHeight))
+                        let newWorkModel = layout.getCellHModel()
+                        tempArr.append(newWorkModel)
+                    }else{
+                        let layout = CNLiveViateAwardModelLayout(model: mdl as! CNLiveVitaeAwardsModel,descH: Float(jianjieHeight))
+                        let newWorkModel = layout.getCellHModel()
+                        tempArr.append(newWorkModel)
+                    }
                 }else{
                     tempArr.append(mdl)
                 }
@@ -171,32 +194,59 @@ class CNLiveVitaeWorkDetailController:CNLiveBaseViewController,UITableViewDataSo
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        let model = self.workListArr[indexPath.row] 
-        return CGFloat(model.cellH)
+        if self.workAwardType == .work{
+            let model = self.workListArr[indexPath.row] as! CNLiveVitaeWorksModel
+            return CGFloat(model.cellH)
+        }else{
+            let model = self.workListArr[indexPath.row] as! CNLiveVitaeAwardsModel
+            return CGFloat(model.cellH)
+        }
     }
     @objc func addWorkBtnAction(){
-        self.navigationController?.pushViewController(CNLiveVitaeAddWorkController(), animated: true)
+        let vc = CNLiveVitaeAddWorkController()
+        vc.workAwardType = self.workAwardType
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     func getWorkList(){
         let vsid = UserInfoManager.shared.userInfo.currentUser?.vsid ?? ""
-        CNLiveVitaeViewModel.getWorkList(vsid: vsid){ result, respStatus in
-            if respStatus == .success{
-                if let res = result as? [CNLiveVitaeWorksModel]{
-                    self.workListArr = Array()
-                    for mdl in res {
-                        let layout = CNLiveViateWorkModelLayout(model: mdl,descH: 40.0)
-                        let newWorkModel = layout.getCellHModel()
-                        self.workListArr.append(newWorkModel)
+        if self.workAwardType == .work{
+            CNLiveVitaeViewModel.getWorkList(vsid: vsid){ result, respStatus in
+                if respStatus == .success{
+                    if let res = result as? [CNLiveVitaeWorksModel]{
+                        self.workListArr = Array()
+                        for mdl in res {
+                            let layout = CNLiveViateWorkModelLayout(model: mdl,descH: 40.0)
+                            let newWorkModel = layout.getCellHModel()
+                            self.workListArr.append(newWorkModel)
+                        }
+                        self.tableView.reloadData()
+                        self.yuanmaDescLabel.text = "共 \(res.count) 条"
+                    }
+                }else{
+                    showMessage(message: "数据异常")
+                }
+                
+            }
+        }else{
+            CNLiveVitaeViewModel.getAwardList(vsid: vsid){ result, respStatus in
+                if respStatus == .success{
+                    if let res = result as? [CNLiveVitaeAwardsModel]{
+                        self.workListArr = Array()
+                        for mdl in res {
+                            let layout = CNLiveViateAwardModelLayout(model: mdl,descH: 40.0)
+                            let newWorkModel = layout.getCellHModel()
+                            self.workListArr.append(newWorkModel)
+                        }
+                        self.tableView.reloadData()
+                        self.yuanmaDescLabel.text = "共 \(res.count) 条"
                     }
-                    self.tableView.reloadData()
-                    self.yuanmaDescLabel.text = "共 \(res.count) 条"
+                }else{
+                    showMessage(message: "数据异常")
                 }
-            }else{
-                showMessage(message: "数据异常")
+                
             }
-            
         }
     }
 }
@@ -553,7 +553,19 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         }
     }
     @objc func huojiangDetailTitleLabelAciton(){
-        
+        //获奖情况
+        let works = self.vitaeModel?.awards
+        if works?.count ?? 0 > 0{
+            //有获奖->获奖情况页面
+            let vc = CNLiveVitaeWorkDetailController()
+            vc.workAwardType = .award
+            navigationViewController().pushViewController(vc, animated: true)
+        }else{
+            //无获奖->新增获奖情况页面
+            let vc = CNLiveVitaeAddWorkController()
+            vc.workAwardType = .award
+            navigationViewController().pushViewController(vc, animated: true)
+        }
     }
     @objc func chakanTitleLabelAciton(){
@@ -11,6 +11,24 @@ import SnapKit
 class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     var zhiyeStr:String = ""
+    
+//    var workAwardType:CNLiveViateWorkAwardType = .work
+    var _workAwardType:CNLiveViateWorkAwardType = .work
+    var workAwardType : CNLiveViateWorkAwardType {
+        get{
+            _workAwardType
+        }
+        set{
+            _workAwardType = newValue
+            if _workAwardType == .work{
+                self.initUI()
+            }else{
+                self.awardUI()
+            }
+        }
+    }
+
+
     //简历workModel
     var _workModel : CNLiveVitaeWorksModel?
     var workModel : CNLiveVitaeWorksModel? {
@@ -22,6 +40,17 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
             setupNewUI(model: _workModel!)
         }
     }
+    //简历awardModel
+    var _awardModel : CNLiveVitaeAwardsModel?
+    var awardModel : CNLiveVitaeAwardsModel? {
+        get{
+            _awardModel
+        }
+        set{
+            _awardModel = newValue!
+            setupNewAwardUI(model: _awardModel!)
+        }
+    }
     lazy var topWhiteView :UIView = {
         let bottomNavView = UIView()
@@ -64,6 +93,7 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
         bottomNavView.backgroundColor = HexColor("#EAEAEA")
         return bottomNavView
     }()
+    //"岗位名称"或"获奖名称"
     lazy var lianxiTitleLabel: UILabel = {
         let titleLabel = UILabel.init()
         titleLabel.textColor = HexColor("#333333")
@@ -166,13 +196,43 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
         closeBtn.addTarget(self, action: #selector(zhiJinBtnAction), for: .touchUpInside)
         return closeBtn
     }()
+    
+    //获奖-颁发单位
+    lazy var banfaTitleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.text = "颁发单位"
+        titleLabel.textAlignment = .left
+        titleLabel.font = BoldFont_15
+        titleLabel.adjustsFontSizeToFitWidth=true
+        return titleLabel
+    }()
+    lazy var xuantianTitleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textColor = HexColor("#B4B4B4")
+        titleLabel.text = "(选填)"
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_13
+        titleLabel.adjustsFontSizeToFitWidth=true
+        return titleLabel
+    }()
+    lazy var banfaTextFiled :UITextField = {
+        let textFiled = UITextField()
+        textFiled.textAlignment = .right
+        textFiled.font = Font_15
+        textFiled.attributedPlaceholder = NSAttributedString(string: "请输入", attributes: [.foregroundColor: HexColor("#B4B4B4")!])
+        textFiled.textColor = HexColor("#333333")
+        textFiled.delegate = self
+        textFiled.returnKeyType = .done
+        textFiled.clearButtonMode = .whileEditing
+        return textFiled
+    }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
         self.backgroundColor = .clear
         self.contentView.backgroundColor = .clear
-        self.initUI()
     }
     required init?(coder: NSCoder) {
@@ -301,6 +361,92 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     }
+    func awardUI(){
+
+        self.contentView.addSubview(self.topWhiteView)
+        self.topWhiteView.snp.makeConstraints { make in
+            make.top.equalTo(15)
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+            make.height.equalTo(184)
+        }
+        self.topWhiteView.addSubview(self.lianxiTitleLabel)
+        self.lianxiTitleLabel.text = "获奖名称"
+        self.lianxiTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(20)
+            make.left.equalTo(15)
+            make.width.equalTo(62)
+            make.height.equalTo(21)
+        }
+        self.topWhiteView.addSubview(self.phoneTextFiled)
+        self.phoneTextFiled.snp.makeConstraints { make in
+            make.centerY.equalTo(self.lianxiTitleLabel.snp.centerY)
+            make.left.equalTo(self.lianxiTitleLabel.snp.right).offset(10)
+            make.right.equalToSuperview().offset(-15)
+            make.height.equalTo(21)
+        }
+        self.topWhiteView.addSubview(self.topLine2View)
+        self.topLine2View.snp.makeConstraints { make in
+            make.top.equalTo(self.lianxiTitleLabel.snp.bottom).offset(adapt_length(length: 20))
+            make.left.equalTo(15)
+            make.height.equalTo(0.5)
+            make.right.equalToSuperview().offset(-15)
+        }
+        self.topWhiteView.addSubview(self.canjiaTitleLabel)
+        self.canjiaTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.topLine2View.snp.bottom).offset(adapt_length(length: 20))
+            make.left.equalTo(15)
+        }
+        self.topWhiteView.addSubview(self.canjiaRightTitleLabel)
+        self.canjiaRightTitleLabel.snp.makeConstraints { make in
+            make.centerY.equalTo(self.canjiaTitleLabel.snp.centerY)
+            make.right.equalToSuperview().offset(-28)
+            make.left.equalTo(self.canjiaTitleLabel.snp.right).offset(5)
+            make.height.equalTo(21)
+        }
+        self.topWhiteView.addSubview(self.canjiaRightImgView)
+        self.canjiaRightImgView.snp.makeConstraints { make in
+            make.width.height.equalTo(13)
+            make.centerY.equalTo(self.canjiaRightTitleLabel.snp.centerY)
+            make.left.equalTo(self.canjiaRightTitleLabel.snp.right)
+        }
+        self.topWhiteView.addSubview(self.canjiaTapView)
+        self.canjiaTapView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(self.topLine2View.snp.bottom)
+            make.bottom.equalTo(self.canjiaTitleLabel.snp.bottom).offset(adapt_length(length: 20))
+        }
+        self.topWhiteView.addSubview(self.topLine3View)
+        self.topLine3View.snp.makeConstraints { make in
+            make.top.equalTo(self.canjiaTitleLabel.snp.bottom).offset(adapt_length(length: 20))
+            make.left.equalTo(15)
+            make.height.equalTo(0.5)
+            make.right.equalToSuperview().offset(-15)
+        }
+        
+        self.topWhiteView.addSubview(self.banfaTitleLabel)
+        self.banfaTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.topLine3View.snp.bottom).offset(adapt_length(length: 20))
+            make.left.equalTo(15)
+            make.width.equalTo(62)
+            make.height.equalTo(21)
+        }
+        self.topWhiteView.addSubview(self.xuantianTitleLabel)
+        self.xuantianTitleLabel.snp.makeConstraints { make in
+            make.centerY.equalTo(self.banfaTitleLabel.snp.centerY)
+            make.width.equalTo(50)
+            make.left.equalTo(self.banfaTitleLabel.snp.right).offset(5)
+            make.height.equalTo(21)
+        }
+        self.topWhiteView.addSubview(self.banfaTextFiled)
+        self.banfaTextFiled.snp.makeConstraints { make in
+            make.centerY.equalTo(self.xuantianTitleLabel.snp.centerY)
+            make.left.equalTo(self.xuantianTitleLabel.snp.right).offset(10)
+            make.right.equalToSuperview().offset(-15)
+            make.height.equalTo(21)
+        }
+    }
+    
     // MARK: - UITextFieldDelegate
     func textFieldDidEndEditing(_ textField: UITextField) {
         currentViewController()?.view.endEditing(true)
@@ -357,6 +503,23 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
         }
     }
+    //获奖
+    func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
+        
+        self.weizhiRightTitleLabel.text = model.title
+        self.banfaTextFiled.text = model.company
+        
+        let startStr = self.convertMillisecondsStringToDateString(millisecondsString: model.time)
+        if startStr?.count ?? 0 > 0{
+            self.canjiaRightTitleLabel.text = startStr
+            self.canjiaRightTitleLabel.textColor = HexColor("#333333")
+        }else{
+            self.canjiaRightTitleLabel.text = "请选择"
+            self.canjiaRightTitleLabel.textColor = HexColor("#B4B4B4")
+        }
+    }
+
+    //工作记录
     func setupNewUI(model:CNLiveVitaeWorksModel){
         self.weizhiRightTitleLabel.text = model.profession
         self.phoneTextFiled.text = model.position
@@ -13,6 +13,7 @@ typealias UpdateAddWorkSecCellHeightBlock = (_ currentCell: CNLiveVitaeAddWorkSe
 class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     var updateAddWorkSecCellHeightBlock:UpdateAddWorkSecCellHeightBlock?
+    var workAwardType:CNLiveViateWorkAwardType = .work
     //简历workModel
     var _workModel : CNLiveVitaeWorksModel?
@@ -25,6 +26,17 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
             setupNewUI(model: _workModel!)
         }
     }
+    //简历awardModel
+    var _awardModel : CNLiveVitaeAwardsModel?
+    var awardModel : CNLiveVitaeAwardsModel? {
+        get{
+            _awardModel
+        }
+        set{
+            _awardModel = newValue!
+            setupNewAwardUI(model: _awardModel!)
+        }
+    }
     lazy var topWhiteView :UIView = {
         let bottomNavView = UIView()
@@ -53,7 +65,7 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
         let p_textView = UITextView.init()
         p_textView.backgroundColor = .clear
         p_textView.font = Font_15
-        p_textView.text = "获奖描述"
+        p_textView.text = "描述"
         p_textView.textColor = HexColor("#B3B3B3")
         p_textView.delegate = self
         return p_textView
@@ -200,6 +212,23 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     }
+    //获奖
+    func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
+        self.huoJiangtextView.text = model.description
+        self.huoJiangNumberLabel.text = "\(model.description.count)/1000"
+        let imgArr =  model.imgs.components(separatedBy: ",")
+        var tempImgArr = Array<String>()
+        var tempVideoUrl = ""
+        for (_,imgUrl) in imgArr.enumerated() {
+            if imgUrl.contains("vitae_video_"){
+                tempVideoUrl = imgUrl
+            }else{
+                tempImgArr.append(imgUrl)
+            }
+        }
+        self.selectUploadImageView?.networkImageArr = tempImgArr
+        self.selectUploadImageView?.networkVideoUrl = tempVideoUrl
+    }
     func setupNewUI(model:CNLiveVitaeWorksModel){
         self.huoJiangtextView.text = model.jobDuties
         self.huoJiangNumberLabel.text = "\(model.jobDuties.count)/1000"
@@ -220,13 +249,13 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
     func textViewDidEndEditing(_ textView: UITextView) {
         if textView.text.lengthOfBytes(using: .utf8) < 1 {
-            textView.text = textView_placeholder
+            textView.text = "描述"
             textView.textColor = HexColor("#B3B3B3")
 //            setupWithSendBtnStatue(statue: false)
         }
     }
     func textViewDidBeginEditing(_ textView: UITextView) {
-        if textView.text == "获奖描述" {
+        if textView.text == "描述" {
             textView.text = ""
             textView.textColor = .black
 //            setupWithSendBtnStatue(statue: true)
@@ -40,6 +40,18 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             setupNewUI(model: _workModel!)
         }
     }
+    //简历awardModel
+    var _awardModel : CNLiveVitaeAwardsModel?
+    var awardModel : CNLiveVitaeAwardsModel? {
+        get{
+            _awardModel
+        }
+        set{
+            _awardModel = newValue!
+            setupNewAwardUI(model: _awardModel!)
+        }
+    }
+
     lazy var whiteBgView :UIView = {
         let whiteBgView = UIView()
@@ -52,7 +64,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         let titleLabel = UILabel()
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
-        titleLabel.text = "职业"
+        titleLabel.text = ""
         titleLabel.font = BoldFont_16
         return titleLabel
     }()
@@ -259,6 +271,91 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         fatalError("init(coder:) has not been implemented")
     }
+    //获奖
+    func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
+        self.whiteBgView.subviews.forEach { view in
+            if view.tag >= 1000{
+                view.removeFromSuperview()
+            }
+        }
+        self.workTitleLabel.text = model.title
+
+        let startDateString = convertTimestampStringToDateString(timestampString: model.time)
+        self.workNameTitleLabel.text = startDateString ?? ""
+
+        self.workPositionTitleLabel.text = model.company
+        
+        self.jianjieLabel.text = model.description//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
+        let lines = jianjieLabel.getRealLabelTextLines()
+        let height = jianjieLabel.qmui_lineHeight
+        if lines <= 2{
+            self.expandBtn.isHidden = true
+        }else{
+            self.expandBtn.isHidden = false
+        }
+        
+        if self.expandBtn.isSelected{
+            //展开状态
+            self.jianjieLabel.height = height*CGFloat(lines)
+
+        }else{
+            //收起状态
+            if lines <= 2{
+                //小于2行,按实际行数
+                self.jianjieLabel.height = CGFloat(lines)*height
+            }else{
+                //大于2行, 显示2行
+                self.jianjieLabel.height = 2*height
+            }
+        }
+        
+        let imgArr =  model.imgs.components(separatedBy: ",")
+        if imgArr.count > 0{
+            for i in 0..<imgArr.count {
+                let imgWH:Float = Float((KSreenWidth-60-15)/3.0)
+                let imgGap:Float = 7.5
+                let imgLeftGap:Float = 15
+                let lie = i%3
+                let hang = i/3
+                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
+                imgView.isUserInteractionEnabled = true
+                imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
+                imgView.tag = 1000+i
+                imgView.contentMode = .center
+                let imgUrl = imgArr[i]
+                imgView.clipsToBounds = true
+                imgView.layer.cornerRadius = 5
+                self.whiteBgView.addSubview(imgView)
+                
+                if imgUrl.contains("vitae_video_"){
+                    //是视频
+                    let thumbailImgUrl = "http://wjjtest.ys2.cnliveimg.com/802/mateCode/img/vitae_photo_0/2024/08/02/3977195366.jpg"
+                    let vm = HeroBrowserVideoViewModule(thumbailImgUrl: thumbailImgUrl, videoUrl: imgUrl, provider: HeroNetworkImageProvider.shared, autoPlay: true)
+                    self.images.append(vm)
+                    imgView.kf.setImage(with: URL(string: thumbailImgUrl),placeholder: UIImage(color: UIColor.lightGray, size: imgView.size))
+                    
+                    let playBtn = UIButton(type: .custom)
+                    playBtn.frame = imgView.bounds
+                    playBtn.setImage(UIImage(named: "short_video_play"), for: .normal)
+                    playBtn.addTarget(self, action: #selector(playBtnAction(btn:)), for: .touchUpInside)
+                    playBtn.clipsToBounds = true
+                    playBtn.layer.cornerRadius = 5
+                    playBtn.tag = 1000+i
+                    imgView.addSubview(playBtn)
+                }else if imgUrl.contains("vitae_photo_"){
+                    //是图片
+                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
+                    imgView.kf.setImage(with: URL(string: imgUrl))
+                }else{
+                    //默认图片
+                    self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
+                    imgView.kf.setImage(with: URL(string: imgUrl))
+                }
+            }
+        }
+        self.workDingWeiTitleLabel.isHidden = true
+    }
+    //工作
     func setupNewUI(model:CNLiveVitaeWorksModel){
         self.whiteBgView.subviews.forEach { view in
             if view.tag >= 1000{
@@ -392,12 +489,28 @@ class CNLiveVitaeWorkCell: UITableViewCell{
     }
     @objc func editBtnAction(){
         let vc = CNLiveVitaeAddWorkController()
-        vc.workModel = self.workModel
+        if self.workModel != nil{
+            vc.workModel = self.workModel
+        }
+        if self.awardModel != nil{
+            vc.awardModel = self.awardModel
+        }
         navigationViewController().pushViewController(vc, animated: true)
     }
     @objc func deleteBtnAction(){
-        
-        CNLiveVitaeViewModel.deleteVitae(id: self.workModel?.id ?? "", vsid: self.workModel?.vsid ?? "", type: "4") { result, status in
+        var type = "4"
+        var id = ""
+        var vsid = ""
+        if self.workModel != nil{
+            type = "4"
+            id = self.workModel?.id ?? ""
+            vsid = self.workModel?.vsid ?? ""
+        }else{
+            type = "5"
+            id = self.awardModel?.id ?? ""
+            vsid = self.workModel?.vsid ?? ""
+        }
+        CNLiveVitaeViewModel.deleteVitae(id: id, vsid: vsid, type: type) { result, status in
             if status == .success{
                 showMessage(message: "删除成功")
                 self.vitaeWorkListBlock?()
@@ -376,6 +376,105 @@ class CNLiveVitaeViewModel:NSObject{
     }
+    /*
+     保存简历-获奖情况(新增获奖情况)
+     参数 vsid 实名对象id
+     */
+    static func saveAward(company:String,description:String,time:String,title:String,imgs:String,vsid:String,vitaeId:String,id:String,resultBlock: @escaping downSlideResultBlock) {
+        let values = NSMutableDictionary()
+        values.addEntries(from: ["company":company])
+        values.addEntries(from: ["description":description])
+        values.addEntries(from: ["time":time])
+        values.addEntries(from: ["title":title])
+        values.addEntries(from: ["imgs":imgs])
+        values.addEntries(from: ["vsid":vsid])
+        values.addEntries(from: ["vitaeId":vitaeId])
+        if id.count > 0{
+            values.addEntries(from: ["id":id])
+        }
+        do {
+            let request = URLRequest.init(url: URL.init(string: APPBaseMCUrl+"/userApi/saveVitaeAwards")!) as! NSMutableURLRequest
+            request.httpMethod = "POST"
+            request.timeoutInterval = 10
+            request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+            let data = try JSONSerialization.data(withJSONObject: values, options: .prettyPrinted)
+            request.httpBody = data
+            showLoading(message: "")
+            let custom_param = NSMutableDictionary()
+            custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+            custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+            
+            CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+            CNLiveNetworking.setAllowRequestDefaultArgument(false)
+            CNLiveNetworking.setupShowDataResult(false)
+            CNLiveNetworking.setBuildCustomUrlRequest(request as URLRequest) { task, result, error in
+                hiddenLoading()
+                if (error == nil) {
+                    let resp = result as! NSDictionary
+                    let errorCode = "\(resp["errorCode"] ?? "0")"
+                    if (errorCode == "0") {
+                        resultBlock(true,.success)
+                    } else {
+                        showMessage(message: resp["errorMessage"] as! String)
+                        resultBlock(NSNull(),.failed)
+                    }
+                } else {
+                    if CNLiveNetworking.isNetworking() {
+                        showMessage(message: "上传失败")
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        showMessage(message: "似乎与网络断开链接")
+                        resultBlock(NSNull(),.noNetwork)
+                    }
+                }
+            }
+        } catch {
+            showMessage(message: "上传失败")
+            resultBlock(NSNull(),.failed)
+        }
+        
+    }
+    /*
+     获取获奖情况列表
+     参数 vsid 实名对象id
+     参数 type 1简历信息 2官方认证 3证书 4工作经历 5获奖情况
+     */
+    static func getAwardList(vsid:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(vsid, forKey: "vsid")
+        param.setValue("5", forKey: "type")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/userApi/getVitae", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                if resp["errorCode"] as! Int == 0{
+                    let dataArr = resp["data"] as! Array<[String : Any]>
+                    var worksArr = Array<CNLiveVitaeAwardsModel>()
+                    for (_,dic) in dataArr.enumerated() {
+                        let model =  newDictionaryToModel(dic, CNLiveVitaeAwardsModel.self) as! CNLiveVitaeAwardsModel
+                        worksArr.append(model)
+                    }
+                    resultBlock(worksArr,.success)
+                }else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+
+
+    }
+
+    
 }
@@ -57,3 +57,48 @@ class CNLiveViateWorkModelLayout:NSObject{
     }
 }
+
+
+//获奖
+class CNLiveViateAwardModelLayout:NSObject{
+    
+    ///cell高度
+    var cellH:CGFloat = 0.0
+//    var descH:Float = 40.0
+    
+    var _awardModel : CNLiveVitaeAwardsModel?
+    var awardModel : CNLiveVitaeAwardsModel? {
+        get{
+            _awardModel
+        }
+        set{
+            _awardModel = newValue
+        }
+    }
+    
+    init(model:CNLiveVitaeAwardsModel,descH:Float){
+        super.init()
+        self.awardModel = model
+        let imgArr = model.imgs.components(separatedBy: ",")
+        var hang:Float = 1
+        if imgArr.count > 0{
+            if imgArr.count <= 3{
+                hang = 1
+            }else if imgArr.count <= 6{
+                hang = 2
+            }else if imgArr.count <= 9{
+                hang = 3
+            }else{
+                hang = 4
+            }
+        }else{
+            hang = 0
+        }
+        let imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
+        _awardModel?.cellH = Float(123)+descH+Float(hang*imgWH)+55
+    }
+    func getCellHModel()->CNLiveVitaeAwardsModel{
+        return _awardModel!
+    }
+    
+}
@@ -137,22 +137,25 @@ class CNLiveVitaeCertificatesModel:BaseModel{
 //简历奖模块
 class CNLiveVitaeAwardsModel:BaseModel{
-    ///
-    var id: Int = 0
-    ///
+    ///获奖id
+    var id:String = ""
+    ///实名sid
     var vsid:String = ""
-    ///
+    ///简历id
     var vitaeId:String = ""
-    ///
+    ///获奖名称
     var title:String = ""
-    ///
+    ///获奖时间-时间戳
     var time:String = ""
-    ///
-    var company:Int = 0
-    ///
+    ///获奖单位
+    var company:String = ""
+    ///获奖经历描述
     var description:String = ""
-    ///
+    ///图片和视频 str,分隔
     var imgs:String = ""
+    
+    ///cell高度
+    var cellH: Float = 0
 }
 /**
  "data": {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_jianli_awardBg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_jianli_awardBg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}