* [x] 数字简历-省市区只保留省

* [x] 数字简历-工作经验不足1年时换成几个月

* [x] 数字简历-省市区只保留省
* [x] 数字简历-工作经验不足1年时换成几个月
“张旭”
1 parent 13df4a5f
Showing 3 changed files with 202 additions and 64 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumeInfoController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreViewFirCell.swift
@@ -381,12 +381,13 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
             if let seDay = userDic["jianli_workTime"]{
                 //设置过工作日期
                 let seleDay = seDay as! String
-                var yearStr = ""
-                if let workExperience = self.calculateWorkExperience(fromDateString: seleDay){
-                    yearStr = "\(seleDay)(\(workExperience)年经验)"
-                }else{
-                    yearStr = seleDay
-                }
+                var yearStr = self.calculateWorkExperience(fromDateString: seleDay)
+                yearStr = "\(seleDay)(\(yearStr))"
+//                if let workExperience = self.calculateWorkExperience(fromDateString: seleDay){
+//                    yearStr = "\(seleDay)(\(workExperience)年经验)"
+//                }else{
+//                    yearStr = seleDay
+//                }
                 self.canjiaRightTitleLabel.text = yearStr
             }else{
@@ -442,33 +443,67 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
             }
         }
     }
-    
-    //计算工作年限
-    func calculateWorkExperience(fromDateString: String) -> Int? {
+    //计算工作年限 "2023.07.03"
+    func calculateWorkExperience(fromDateString: String) -> String {
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy-MM-dd"
         formatter.timeZone = TimeZone(abbreviation: "UTC")! // 确保时区一致，或者根据需要调整
         guard let startDate = formatter.date(from: fromDateString) else {
-            return nil
+            return ""
         }
         let calendar = Calendar.current
         let currentDate = Date()
         // 计算年份差，这里我们不需要精确的月份和日期，所以只需要年份组件
-        let components = calendar.dateComponents([.year], from: startDate, to: currentDate)
-        guard let yearDifference = components.year else {
-            return nil
+        let components = calendar.dateComponents([.year, .month], from: startDate, to: currentDate)
+        // 提取年和月
+        let years = components.year ?? 0
+        let months = components.month ?? 0
+          
+        // 格式化输出
+        if years > 0 {
+            return "\(years)年经验"
+        } else if months > 0 {
+            return "\(months)个月经验"
+        } else {
+            return "0个月经验"
         }
-      
-        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
-        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
-        let roundedYearDifference = round(Double(yearDifference))
-      
-        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
-        return Int(roundedYearDifference)
+        
+//        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
+//        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
+//        let roundedYearDifference = round(Double(yearDifference))
+//
+//        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
+//        return Int(roundedYearDifference)
     }
+//    //计算工作年限
+//    func calculateWorkExperience(fromDateString: String) -> Int? {
+//        let formatter = DateFormatter()
+//        formatter.dateFormat = "yyyy-MM-dd"
+//        formatter.timeZone = TimeZone(abbreviation: "UTC")! // 确保时区一致，或者根据需要调整
+//      
+//        guard let startDate = formatter.date(from: fromDateString) else {
+//            return nil
+//        }
+//      
+//        let calendar = Calendar.current
+//        let currentDate = Date()
+//      
+//        // 计算年份差，这里我们不需要精确的月份和日期，所以只需要年份组件
+//        let components = calendar.dateComponents([.year], from: startDate, to: currentDate)
+//        guard let yearDifference = components.year else {
+//            return nil
+//        }
+//      
+//        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
+//        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
+//        let roundedYearDifference = round(Double(yearDifference))
+//      
+//        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
+//        return Int(roundedYearDifference)
+//    }
     deinit {
@@ -609,11 +644,12 @@ class CNLiveDigitalResumeInfoController:CNLiveBaseViewController, UITextFieldDel
                 var yearStr = ""//UI展示str
                 var textstr = ""//接口传"2024-06-18"
                 if let textStr = text as? String{
-                    if let workExperience = self?.calculateWorkExperience(fromDateString: textStr){
-                        yearStr = "\(textStr)(\(workExperience)年经验)"
-                    }else{
-                        yearStr = textStr
-                    }
+                    yearStr = self?.calculateWorkExperience(fromDateString: textStr) ?? ""
+//                    if let workExperience = self?.calculateWorkExperience(fromDateString: textStr){
+//                        yearStr = "\(textStr)(\(workExperience)年经验)"
+//                    }else{
+//                        yearStr = textStr
+//                    }
                     textstr = textStr
                 }else{
                     yearStr = "请选择"
@@ -817,7 +817,13 @@ class CNLiveDigitalResumeCell: UITableViewCell {
             self.hangyeImgView.isHidden = true
         }
         if model.vitae?.city.count ?? 0 > 0 && model.vitae?.showAddress == true{
-            self.weizhiTitleLabel.text = " | "+model.vitae!.city
+            let shengStr = self.extractProvinceOrMunicipalityFromAddress(address: model.vitae!.city)
+            if shengStr?.count ?? 0 > 0{
+                self.weizhiTitleLabel.text = " | "+shengStr!
+            }else{
+                self.weizhiTitleLabel.text = " | "+(shengStr ?? "")
+            }
+//            self.weizhiTitleLabel.text = " | "+shengStr//model.vitae!.city
         }else{
             self.weizhiTitleLabel.text = ""//" | 位置未授权"
         }
@@ -830,12 +836,13 @@ class CNLiveDigitalResumeCell: UITableViewCell {
             }else{
                 workTimeStr = model.vitae!.workTime
             }
-                        
-            if let workExperience = self.calculateWorkExperience(fromDateString: workTimeStr){
-                yearStr = "\(workExperience)年经验"
-            }else{
-                yearStr = ""
-            }
+                   
+            yearStr = self.calculateWorkExperience(fromDateString: workTimeStr)
+//            if let workExperience = self.calculateWorkExperience(fromDateString: workTimeStr){
+//                yearStr = "\(workExperience)年经验"
+//            }else{
+//                yearStr = ""
+//            }
             self.workTitleLabel.text = yearStr//model.vitae!.workTime
@@ -853,31 +860,61 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         self.huojiangDetailNumberTitleLabel.text = "\(model.awards.count)"
     }
-    //计算工作年限
-    func calculateWorkExperience(fromDateString: String) -> Int? {
+    let municipalities = Set(["北京市", "上海市", "天津市", "重庆市", "香港特别行政区", "澳门特别行政区"])
+    func extractProvinceOrMunicipalityFromAddress(address: String) -> String? {
+        for zhixia in municipalities {//直辖市
+            if address.contains(zhixia){
+                return zhixia
+            }
+        }
+        //省
+        let components = address.components(separatedBy: "省")
+        if components.count > 0{
+            var retSheng = ""
+            if let shengStr = components.first{
+                retSheng = shengStr+"省"
+                return retSheng
+            }else{
+                return ""
+            }
+        }else{
+            return ""
+        }
+    }
+    //计算工作年限 "2023.07.03"
+    func calculateWorkExperience(fromDateString: String) -> String {
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy-MM-dd"
         formatter.timeZone = TimeZone(abbreviation: "UTC")! // 确保时区一致，或者根据需要调整
         guard let startDate = formatter.date(from: fromDateString) else {
-            return nil
+            return ""
         }
         let calendar = Calendar.current
         let currentDate = Date()
         // 计算年份差，这里我们不需要精确的月份和日期，所以只需要年份组件
-        let components = calendar.dateComponents([.year], from: startDate, to: currentDate)
-        guard let yearDifference = components.year else {
-            return nil
+        let components = calendar.dateComponents([.year, .month], from: startDate, to: currentDate)
+        // 提取年和月
+        let years = components.year ?? 0
+        let months = components.month ?? 0
+          
+        // 格式化输出
+        if years > 0 {
+            return "\(years)年经验"
+        } else if months > 0 {
+            return "\(months)个月经验"
+        } else {
+            return "0个月经验"
         }
-      
-        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
-        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
-        let roundedYearDifference = round(Double(yearDifference))
-      
-        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
-        return Int(roundedYearDifference)
+        
+//        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
+//        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
+//        let roundedYearDifference = round(Double(yearDifference))
+//      
+//        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
+//        return Int(roundedYearDifference)
     }
 }
@@ -265,7 +265,13 @@ class CNLiveDigitalResumePreViewFirCell: UITableViewCell {
             self.hangyeTitleLabel.text = model.vitae?.profession
         }
         if model.vitae?.city.count ?? 0 > 0 && model.vitae?.showAddress == true{
-            self.weizhiTitleLabel.text = " | "+model.vitae!.city
+            let shengStr = self.extractProvinceOrMunicipalityFromAddress(address: model.vitae!.city)
+            if shengStr?.count ?? 0 > 0{
+                self.weizhiTitleLabel.text = " | "+shengStr!
+            }else{
+                self.weizhiTitleLabel.text = " | "+(shengStr ?? "")
+            }
+//            self.weizhiTitleLabel.text = " | "+model.vitae!.city
         }else{
             self.weizhiTitleLabel.text = " | 位置未授权"
         }
@@ -285,11 +291,12 @@ class CNLiveDigitalResumePreViewFirCell: UITableViewCell {
                 workTimeStr = model.vitae!.workTime
             }
-            if let workExperience = self.calculateWorkExperience(fromDateString: workTimeStr){
-                yearStr = "\(workExperience)年经验"
-            }else{
-                yearStr = ""
-            }
+            yearStr = self.calculateWorkExperience(fromDateString: workTimeStr)
+//            if let workExperience = self.calculateWorkExperience(fromDateString: workTimeStr){
+//                yearStr = "\(workExperience)年经验"
+//            }else{
+//                yearStr = ""
+//            }
             self.workTitleLabel.text = yearStr//model.vitae!.workTime
@@ -298,32 +305,90 @@ class CNLiveDigitalResumePreViewFirCell: UITableViewCell {
         }
     }
-    //计算工作年限
-    func calculateWorkExperience(fromDateString: String) -> Int? {
+    let municipalities = Set(["北京市", "上海市", "天津市", "重庆市", "香港特别行政区", "澳门特别行政区"])
+    func extractProvinceOrMunicipalityFromAddress(address: String) -> String? {
+        for zhixia in municipalities {//直辖市
+            if address.contains(zhixia){
+                return zhixia
+            }
+        }
+        //省
+        let components = address.components(separatedBy: "省")
+        if components.count > 0{
+            var retSheng = ""
+            if let shengStr = components.first{
+                retSheng = shengStr+"省"
+                return retSheng
+            }else{
+                return ""
+            }
+        }else{
+            return ""
+        }
+    }
+
+    //计算工作年限 "2023.07.03"
+    func calculateWorkExperience(fromDateString: String) -> String {
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy-MM-dd"
         formatter.timeZone = TimeZone(abbreviation: "UTC")! // 确保时区一致，或者根据需要调整
         guard let startDate = formatter.date(from: fromDateString) else {
-            return nil
+            return ""
         }
         let calendar = Calendar.current
         let currentDate = Date()
         // 计算年份差，这里我们不需要精确的月份和日期，所以只需要年份组件
-        let components = calendar.dateComponents([.year], from: startDate, to: currentDate)
-        guard let yearDifference = components.year else {
-            return nil
+        let components = calendar.dateComponents([.year, .month], from: startDate, to: currentDate)
+        // 提取年和月
+        let years = components.year ?? 0
+        let months = components.month ?? 0
+          
+        // 格式化输出
+        if years > 0 {
+            return "\(years)年经验"
+        } else if months > 0 {
+            return "\(months)个月经验"
+        } else {
+            return "0个月经验"
         }
-      
-        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
-        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
-        let roundedYearDifference = round(Double(yearDifference))
-      
-        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
-        return Int(roundedYearDifference)
+        
+//        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
+//        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
+//        let roundedYearDifference = round(Double(yearDifference))
+//
+//        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
+//        return Int(roundedYearDifference)
     }
+
+//    //计算工作年限
+//    func calculateWorkExperience(fromDateString: String) -> Int? {
+//        let formatter = DateFormatter()
+//        formatter.dateFormat = "yyyy-MM-dd"
+//        formatter.timeZone = TimeZone(abbreviation: "UTC")! // 确保时区一致，或者根据需要调整
+//      
+//        guard let startDate = formatter.date(from: fromDateString) else {
+//            return nil
+//        }
+//      
+//        let calendar = Calendar.current
+//        let currentDate = Date()
+//      
+//        // 计算年份差，这里我们不需要精确的月份和日期，所以只需要年份组件
+//        let components = calendar.dateComponents([.year], from: startDate, to: currentDate)
+//        guard let yearDifference = components.year else {
+//            return nil
+//        }
+//      
+//        // 如果需要，可以对年份差进行四舍五入（但在这个场景下，由于我们只计算整年，所以四舍五入可能不是必需的）
+//        // 但为了完整性，我还是展示了如何四舍五入到最近的整数
+//        let roundedYearDifference = round(Double(yearDifference))
+//      
+//        // 返回工作经验年数（已经是整数了，因为round函数的结果会被隐式转换为Int）
+//        return Int(roundedYearDifference)
+//    }
     func convertTimestampStringToDateString(timestampString: String) -> String? {
         // 首先，将毫秒时间戳字符串转换为TimeInterval（秒）
         guard let timestampMilliseconds = Double(timestampString) else {