// 递交

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointSubmitScheduleViewController.swift

@@ -123,8 +123,17 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
     }
     
     @objc func didGuideBtnClicked() {
+        
+        let key = "resignGuideLine_watch_\(renewalId)"
+        
         let view = YHResignAppointGuideLineView.sheetView()
-        view.ischeckBeforeFlag = false
+        if let isWatched = UserDefaults.standard.value(forKey: key) as? Bool, isWatched == true {
+            view.ischeckBeforeFlag = true
+        } else {
+            view.ischeckBeforeFlag = false
+            UserDefaults.standard.set(true, forKey: key)
+            UserDefaults.standard.synchronize()
+        }
         view.block = {
             
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointTimeModifyViewController.swift

@@ -237,7 +237,7 @@ extension YHResignAppointTimeModifyViewController {
                 var nextGroupIndex = groupLevel+1
                 let newMember = currentMember.copy() as! YHResignAppointMember
                 newMember.isSelected = true
-                while 0 <= groupLevel, groupLevel < selectGroupArr.count {
+                while 0 <= nextGroupIndex, nextGroupIndex < selectGroupArr.count {
                     let item = selectGroupArr[nextGroupIndex]
                     if !item.isHaveAppointed { // 不是已确认在港
                         var members = item.users
@@ -336,6 +336,7 @@ extension YHResignAppointTimeModifyViewController {
         }
         if isNoSelectTime { // 有分组没有选择时间
             self.tableView.reloadData()
+            YHHUD.flash(message: "有分批未选择时间")
             return
         }
         
@@ -356,8 +357,8 @@ extension YHResignAppointTimeModifyViewController {
                     let dict = ["member_id" : "\($0.id)"]
                     return dict
                 }
-                let dict = ["ready_to_submit_at" : group.ready_to_submit_at,
-                            "leave_hk_at" : group.notleaveHK ? "" : group.leave_hk_at,
+                let dict = ["ready_to_submit_at" : group.getSubmitHKTime(),
+                            "leave_hk_at" : group.notleaveHK ? "" : group.getLeaveHKTime(),
                             "users" : allUserInfoArr] as! [String : Any]
                 batchs.append(dict)
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointTimeViewController.swift

@@ -303,8 +303,8 @@ class YHResignAppointTimeViewController: YHBaseViewController {
                     let dict = ["member_id" : "\($0.id)"]
                     return dict
                 }
-                let dict = ["ready_to_submit_at" : group.ready_to_submit_at,
-                            "leave_hk_at" : group.notleaveHK ? "" : group.leave_hk_at,
+                let dict = ["ready_to_submit_at" : group.getSubmitHKTime(),
+                            "leave_hk_at" : group.notleaveHK ? "" : group.getLeaveHKTime(),
                             "users" : allUserInfoArr] as! [String : Any]
                 batchs.append(dict)
                 
@@ -317,8 +317,8 @@ class YHResignAppointTimeViewController: YHBaseViewController {
                     let dict = ["member_id" : "\($0.id)"]
                     return dict
                 }
-                let dict = ["ready_to_submit_at" : group.ready_to_submit_at,
-                            "leave_hk_at" : group.notleaveHK ? "" : group.leave_hk_at,
+                let dict = ["ready_to_submit_at" : group.getSubmitHKTime(),
+                            "leave_hk_at" : group.notleaveHK ? "" : group.getLeaveHKTime(),
                             "users" : allUserInfoArr] as! [String : Any]
                 batchs.append(dict)
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/M/YHResignAppointTimeSettingModel.swift

@@ -17,7 +17,23 @@ class YHResignAppointTimeSettingModel: SmartCodable {
     var users: [YHResignAppointMember] = []
     var itemIndex: Int = 0 // 第几批 从0开始
     var isClickSubmit: Bool = false
-    var isHaveAppointed: Bool = false 
+    var isHaveAppointed: Bool = false
+    
+    func getLeaveHKTime() -> String {
+        let format = "yyyy-MM-dd HH:mm"
+        if leave_hk_at.count <= format.count {
+            return leave_hk_at
+        }
+        return String(leave_hk_at.prefix(format.count))
+    }
+    
+    func getSubmitHKTime() -> String {
+        let format = "yyyy-MM-dd HH:mm"
+        if ready_to_submit_at.count <= format.count {
+            return ready_to_submit_at
+        }
+        return String(ready_to_submit_at.prefix(format.count))
+    }
     
     required init() {
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointApplicantInfoCell.swift

@@ -92,8 +92,8 @@ class YHResignAppointApplicantInfoCell: UITableViewCell {
             }
         }
         applicantNamesLabel.text = names
-        submitTimeView.detail = model.ready_to_submit_at
-        leaveHKTimeView.detail = model.leave_hk_at
+        submitTimeView.detail = model.getSubmitHKTime()
+        leaveHKTimeView.detail = model.getLeaveHKTime()
     }
     
     func setupUI() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTimeMultipleCell.swift

@@ -102,7 +102,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
             self.selectDetailDate(title: "选择在港递交时间") {
                 [weak self] dateStr in
                 guard let self = self else { return }
-                self.model.ready_to_submit_at = "2024-11-04 17:44"
+                self.model.ready_to_submit_at = "2024-11-04 14:00"
                 self.refreshBlock?()
             }
         }
@@ -122,7 +122,7 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
             self.selectDetailDate(title: "选择离港时间") {
                 [weak self] dateStr in
                 guard let self = self else { return }
-                self.model.leave_hk_at = "2024-12-04 17:44"
+                self.model.leave_hk_at = "2024-12-04 17:00"
                 self.refreshBlock?()
             }
         }
@@ -167,8 +167,8 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
         let isHiddenLeaveHKTime = self.model.notleaveHK
         
         // 时间控件显示
-        submitTimeItemView.detail = model.ready_to_submit_at
-        leaveTimeItemView.detail = model.leave_hk_at
+        submitTimeItemView.detail = model.getSubmitHKTime()
+        leaveTimeItemView.detail = model.getLeaveHKTime()
         
         // 时间控件红色提示显示
         submitTimeItemView.isNeedShowErrorTips = (model.isClickSubmit && model.ready_to_submit_at.isEmpty)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTimeSingleCell.swift

@@ -47,7 +47,7 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
             self.selectDetailDate(title: "选择在港递交时间") {
                 [weak self] dateStr in
                 guard let self = self else { return }
-                self.model.ready_to_submit_at = "2024-11-04 17:44"
+                self.model.ready_to_submit_at = "2024-11-04 17:00"
                 self.refreshBlock?()
             }
         }
@@ -67,7 +67,7 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
             self.selectDetailDate(title: "选择离港时间") {
                 [weak self] dateStr in
                 guard let self = self else { return }
-                self.model.leave_hk_at = "2024-12-04 17:44"
+                self.model.leave_hk_at = "2024-12-04 17:00"
                 self.refreshBlock?()
             }
         }
@@ -100,8 +100,8 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
         let isHiddenLeaveHKTime = self.model.notleaveHK
         
         // 时间控件显示
-        submitTimeItemView.detail = model.ready_to_submit_at
-        leaveTimeItemView.detail = model.leave_hk_at
+        submitTimeItemView.detail = model.getSubmitHKTime()
+        leaveTimeItemView.detail = model.getLeaveHKTime()
         
         // 时间控件红色提示显示
         submitTimeItemView.isNeedShowErrorTips = (model.isClickSubmit && model.ready_to_submit_at.isEmpty)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleLineView.swift

@@ -63,10 +63,11 @@ class YHResignAppointedScheduleLineView: UIView {
     
     func getDateOfYYYYMMDD(_ dateString: String) -> String {
         // dateString格式为yyyy-MM-dd HH:mm:ss 返回yyyy-MM-dd
-        if dateString.count <= 10 {
+        let format = "yyyy-MM-dd"
+        if dateString.count <= format.count {
             return dateString
         }
-        return String(dateString.prefix(10))
+        return String(dateString.prefix(format.count))
     }
     
     // 已确认在港时间 银河递交续签资料时间 查看递交回执时间