// 修改

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

@@ -216,7 +216,9 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
             var lastLeftUnselectUsers: [YHResignAppointMember] = appAppointUsers.deepCopy()
             
             var groupArr = [YHResignAppointTimeSettingModel]()
+            
             for (index, group) in scheduleArr.enumerated() {
+                
                 let model = YHResignAppointTimeSettingModel()
                 let status = group.getConfirmInHKStatus()
                 model.isHaveAppointed = (status == .haveConfirmHK)
@@ -248,15 +250,23 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
                     lastLeftUnselectUsers = users.filter {
                         return $0.isSelected == false
                     }.deepCopy()
+                    
                 } else { // 已确认在港
                     
+                    let users = group.user_list.map {
+                        return $0.transformToMember()
+                    }
+                    
+                    model.users = users
+                    groupArr.append(model)
+                    
                     lastLeftUnselectUsers = lastLeftUnselectUsers.filter {
                         for model in group.user_list {
                             if model.memberId == $0.id { // 该用户已经选择过
                                 return false
                             }
                         }
-                        return false
+                        return true
                     }.deepCopy()
                 }
             }

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

@@ -347,6 +347,7 @@ extension YHResignAppointTimeModifyViewController {
         var batchs: [[String : Any]] = []
         for group in self.selectGroupArr {
             group.isClickSubmit = false
+            if !group.isHaveAppointed { // 非已确认在港 才加入集合
                 let selectUser = group.users.filter {
                     let item = $0
                     return item.isSelected
@@ -359,7 +360,7 @@ extension YHResignAppointTimeModifyViewController {
                             "leave_hk_at" : group.notleaveHK ? "" : group.leave_hk_at,
                             "users" : allUserInfoArr] as! [String : Any]
                 batchs.append(dict)
-            
+            }
         }
         
         let param: [String : Any] = ["renewal_id" :  renewalId,

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

@@ -61,22 +61,34 @@ class YHResignAppointedScheduleLineView: UIView {
         createUI()
     }
     
+    func getDateOfYYYYMMDD(_ dateString: String) -> String {
+        // dateString格式为yyyy-MM-dd HH:mm:ss 返回yyyy-MM-dd
+        if dateString.count <= 10 {
+            return dateString
+        }
+        return String(dateString.prefix(10))
+    }
+    
     // 已确认在港时间 银河递交续签资料时间 查看递交回执时间
     func updateDates(confirmDate: String, submitDate: String, watchDate: String) {
         
+        let newConfirmDate = getDateOfYYYYMMDD(confirmDate)
+        let newSubmitDate = getDateOfYYYYMMDD(submitDate)
+        let newWatchDate = getDateOfYYYYMMDD(watchDate)
+
         if steps.count >= 2 { // 已确认在港节点
             let confirmModel = steps[1]
-            confirmModel.time = confirmDate
+            confirmModel.time = newConfirmDate
         }
         
         if steps.count >= 3 { // 银河递交续签资料节点
             let submitModel = steps[2]
-            submitModel.time = submitDate
+            submitModel.time = newSubmitDate
         }
         
         if steps.count >= 4 { // 查看递交回执节点
             let watchModel = steps[3]
-            watchModel.time = watchDate
+            watchModel.time = newWatchDate
         }
         self.collectView.reloadData()
     }