* [x] 描述没有的时候，隐藏描述内容

* [x] 工作记录添加好后，应该回到工作记录列表页

* [x] 描述没有的时候，隐藏描述内容
* [x] 工作记录添加好后，应该回到工作记录列表页
“张旭”
1 parent 09410be9
Showing 2 changed files with 57 additions and 17 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Certificate/CNLiveVocationalCertificateFirCell.swift
@@ -253,11 +253,11 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 }
             }else if self.workAwardType == .award && self.isFirstEdit{
                 if self.seleArr?.count ?? 0 <= 1{
-                    self.hangHeight = 15+248+widthHeight+20
+                    self.hangHeight = 15+248+widthHeight+10+20
                     return self.hangHeight
                 }else{
                     let hang:Int = ((self.seleArr?.count ?? 0)-2)/3+2
-                    self.hangHeight = CGFloat(15+248+hang*Int(widthHeight)+(hang-1)*Int(addXSpace)+20)
+                    self.hangHeight = CGFloat(15+248+hang*Int(widthHeight)+(hang-1)*Int(addXSpace)+10+20)
                     return self.hangHeight
                 }
             }else{
@@ -325,8 +325,30 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
  
                 }
             }
-            let danWei = threeCell?.phoneTextFiled.text ?? ""
-            let workDiDian = threeCell?.weizhiRightTitleLabel.text ?? ""
+            var danWei = ""
+            if threeCell?.phoneTextFiled.text?.count ?? 0 <= 0{
+                
+            }else if threeCell?.phoneTextFiled.text == "请填写"{
+                
+            }else{
+                danWei = threeCell?.phoneTextFiled.text ?? ""
+            }
+            var workDiDian = ""
+            if threeCell?.weizhiRightTitleLabel.text?.count ?? 0 <= 0{
+                
+            }else if threeCell?.weizhiRightTitleLabel.text == "请选择"{
+                
+            }else{
+                workDiDian = threeCell?.weizhiRightTitleLabel.text ?? ""
+            }
+            var desc = ""
+            if secCell?.huoJiangtextView.text?.count ?? 0 <= 0{
+                
+            }else if secCell?.huoJiangtextView.text == "描述"{
+                
+            }else{
+                desc = secCell?.huoJiangtextView.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
@@ -337,13 +359,15 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 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
+                
+                CNLiveVitaeViewModel.saveWork(city: workDiDian, companyName: danWei, imgs: newString, jobDuties: desc, 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)
-                            }
-                        })
+                        self.navigationController?.popViewController(animated: true)
+//                        self.navigationController?.viewControllers.forEach({ item in
+//                            if (item.isKind(of: CNLiveDigitalResumeController.self)) {
+//                                self.navigationController?.popToViewController(item, animated: true)
+//                            }
+//                        })
                     }
                 }
             }
@@ -396,13 +420,30 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 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
+                var danWei = ""
+                if firCell?.banfaTextFiled.text?.count ?? 0 <= 0{
+                    
+                }else if firCell?.banfaTextFiled.text == "请输入"{
+                    
+                }else{
+                    danWei = firCell?.banfaTextFiled.text ?? ""
+                }
+                var desc = ""
+                if secCell?.huoJiangtextView.text?.count ?? 0 <= 0{
+                    
+                }else if secCell?.huoJiangtextView.text == "描述"{
+                    
+                }else{
+                    desc = secCell?.huoJiangtextView.text ?? ""
+                }
+                CNLiveVitaeViewModel.saveAward(company: danWei, description: desc, 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)
-                            }
-                        })
+                        self.navigationController?.popViewController(animated: true)
+//                        self.navigationController?.viewControllers.forEach({ item in
+//                            if (item.isKind(of: CNLiveDigitalResumeController.self)) {
+//                                self.navigationController?.popToViewController(item, animated: true)
+//                            }
+//                        })
                     }
  
                 }
@@ -256,7 +256,6 @@ class CNLiveVocationalCertificateFirCell: UITableViewCell, UICollectionViewDataS
         self.cerNumberDetailTitleLabel.snp.makeConstraints { make in
             make.top.equalTo(self.cerNumberTitleLabel.snp.bottom).offset(3)
             make.left.equalTo(self.cerNumberTitleLabel.snp.left)
-//            make.left.greaterThanOrEqualTo(self.cerLevelDetailTitleLabel.snp.right).offset(5)
             make.right.equalToSuperview().offset(-5)
         }
         self.whiteBgView.addSubview(self.cerJiGouTitleLabel)