签注有效期

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/M/YHResignCertificateModel.swift

@@ -36,6 +36,7 @@ class YHResignCertificateModel: SmartCodable {
     var user_id: Int = 0
     var user_type: String = ""
     var valid_date: String = ""
+    var sign_valid_date: String = "" // 签注有效期
     var cert_info: YHResignCertificateInfoModel = YHResignCertificateInfoModel()
     
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift

@@ -136,7 +136,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                     if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
                         failString = ""
                     } else {
-                        failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                        failString = "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后"
                     }
                 }
                 if item.id == .id3 {
@@ -165,7 +165,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                     if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
                         failString = ""
                     } else {
-                        failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                        failString = "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
                     }
                 }
             }
@@ -431,7 +431,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.valid_date) {
                     failString = ""
                 } else {
-                    failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                    failString = "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后"
                 }
             }
         }
@@ -484,6 +484,11 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
             guard let self = self else { return }
             if let block = self.block {
                 block(model)
+                if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.sign_valid_date) {
+                    failString = ""
+                } else {
+                    failString = "签注卡片有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
+                }
             }
         }
         centerView.addSubview(signEndView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceCenterStepThreeTableHeadView.swift

@@ -149,7 +149,7 @@ extension YHServiceCenterStepThreeTableHeadView: UICollectionViewDelegate, UICol
         selectIndex = indexPath.row
         if dataSource.count > selectIndex {
             let model = dataSource[selectIndex]
-            explainLabel.text = model.personStr
+            explainLabel.text = "本期人员：" + model.personStr
             if model.personStr.count > 20 {
                 moreButton.isHidden = false
             } else {