* [x] 数字简历-展示的手机号,设置手机号优先级>sid的手机号

* [x] 数字简历-工作时间设置不上

* [x] 数字简历-展示的手机号,设置手机号优先级>sid的手机号
* [x] 数字简历-工作时间设置不上
“张旭”
1 parent 55bc4736
Showing 4 changed files with 42 additions and 13 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumeInfoController.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/证书相关页面/CNLiveVitaeAddCertificateController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreViewFirCell.swift
@@ -476,9 +476,9 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
     // MARK: - UITextFieldDelegate
     func textFieldDidEndEditing(_ textField: UITextField) {
         self.view.endEditing(true)
-        if textField.text?.count ?? 0 > 0{
+//        if textField.text?.count ?? 0 > 0{
             self.savePhone()
-        }
+//        }
     }
     func savePhone(){
@@ -606,16 +606,15 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
         MineInfoAlertView.showSelectView(showType: .selectDay) { [weak self] text in
             print("刷新之后的数据是=>\(text)")//"2024-06-18"
             if (text as! String).count > 0{
-                var yearStr = ""
+                var yearStr = ""//UI展示str
+                var textstr = ""//接口传"2024-06-18"
                 if let textStr = text as? String{
-                    
-                    var yearStr = ""
                     if let workExperience = self?.calculateWorkExperience(fromDateString: textStr){
                         yearStr = "\(textStr)(\(workExperience)年经验)"
                     }else{
                         yearStr = textStr
                     }
-                    yearStr = textStr
+                    textstr = textStr
                 }else{
                     yearStr = "请选择"
                 }
@@ -624,10 +623,10 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
                 self?.canjiaRightTitleLabel.textColor = HexColor("#333333")
                 if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
-                    userDic.updateValue(yearStr, forKey: "jianli_workTime")
+                    userDic.updateValue(textstr, forKey: "jianli_workTime")
                     UserDefaults.standard.setValue(userDic, forKey: UserInfoManager.shared.userInfo.uid)
                     UserDefaults.standard.synchronize()
-                    self!.updateViate(key: "jianli_workTime", value: yearStr)
+                    self!.updateViate(key: "jianli_workTime", value: textstr)
                 }else{
                     let tempDic = NSMutableDictionary()
                     UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
@@ -82,6 +82,7 @@ class CNLiveVitaeAddCertificateController:CNLiveBaseViewController,UITableViewDa
             make.right.equalToSuperview().offset(-15)
             make.bottom.equalToSuperview().offset(-75)
         }
+        self.chengNuoTitleLabel.isHidden = true
         self.view.addSubview(self.bottomZhiNanWhiteView)
         self.bottomZhiNanWhiteView.snp.makeConstraints { make in
@@ -119,6 +120,7 @@ class CNLiveVitaeAddCertificateController:CNLiveBaseViewController,UITableViewDa
                     self.seleImage = image
                     self.seleImageUrl = url
                     self.bottomZhiNanWhiteView.isHidden = false
+                    self.chengNuoTitleLabel.isHidden = false
                 }
             }
             return cell
@@ -172,11 +174,20 @@ class CNLiveVitaeAddCertificateController:CNLiveBaseViewController,UITableViewDa
         //提交证书
         CNLiveVitaeViewModel.saveCertificate(img: self.seleImageUrl, lv: cell.cerLevelTF.text ?? "", number: cell.cerNumberTF.text ?? "", organization: cell.cerJiGouTF.text ?? "", time: cell.cerTimeTF.text ?? "", title: cell.cerNameTF.text ?? "", uploadTime: "", validity: cell.cerYouXiaoTF.text ?? "", vsid: vsid){result, respStatue in
             if respStatue == .success{
+                var ishaveResume = false
                 self.navigationController?.viewControllers.forEach({ item in
-                    if (item.isKind(of: CNLiveVitaeVocationalCertificateController.self)) {
+                    if (item.isKind(of: CNLiveDigitalResumeController.self)) {
                         self.navigationController?.popToViewController(item, animated: true)
+                        ishaveResume = true
                     }
+//                    else if (item.isKind(of: CNLiveVitaeVocationalCertificateController.self)) {
+//                        self.navigationController?.popToViewController(item, animated: true)
+//                        ishaveResume = true
+//                    }
                 })
+                if ishaveResume == false{
+                    self.navigationController?.popViewController(animated: true)
+                }
             }
         }
@@ -726,8 +726,8 @@ class CNLiveDigitalResumeCell: UITableViewCell {
             navigationViewController().pushViewController(CNLiveVitaeVocationalCertificateController(), animated: true)
         }else{
-            //跳转上传示意图页面
-            navigationViewController().pushViewController(CNLiveVitaeCerAddPhotoController(), animated: true)
+            //跳转个人证书上传页面
+            navigationViewController().pushViewController(CNLiveVitaeAddCertificateController(), animated: true)
         }
     }
     @objc func gongzuoDetailTitleLabelAciton(){
@@ -823,7 +823,15 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         }
         if model.vitae?.workTime.count ?? 0 > 0{
             var yearStr = ""
-            if let workExperience = self.calculateWorkExperience(fromDateString: model.vitae!.workTime){
+            var workTimeStr = ""
+            let arr = model.vitae!.workTime.components(separatedBy: "(")
+            if arr.count > 0{
+                workTimeStr = arr.first! as String
+            }else{
+                workTimeStr = model.vitae!.workTime
+            }
+                        
+            if let workExperience = self.calculateWorkExperience(fromDateString: workTimeStr){
                 yearStr = "\(workExperience)年经验"
             }else{
                 yearStr = ""
@@ -242,7 +242,18 @@ class CNLiveDigitalResumePreViewFirCell: UITableViewCell {
         let idNo = UserInfoManager.shared.userInfo.currentUser?.idNo ?? ""
         let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: idNo)
         let ageStr = String(format: "%d", age ?? 0)
-        self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile
+        var phoneTitleLabelStr = gender
+        if (model.vitae?.showAge ?? false) == true{
+            phoneTitleLabelStr = phoneTitleLabelStr+" | "+ageStr+"岁"
+        }
+        if (model.vitae?.showPhone ?? false) == true{
+            let tempStr = (model.vitae?.phone.count ?? 0 > 0 ? model.vitae!.phone : UserInfoManager.shared.userInfo.mobile)
+            if tempStr.count > 0{
+                phoneTitleLabelStr = phoneTitleLabelStr+" | "+tempStr
+            }
+        }
+        self.phoneTitleLabel.text = phoneTitleLabelStr
+        
         if model.vitae?.profession.count ?? 0 > 0{
             self.hangyeTitleLabel.text = model.vitae?.profession