// 预约

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

@@ -264,7 +264,9 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
                         }
                     }
                     model.users = users
-                    groupArr.append(model)
+                    if users.count > 0 {
+                        groupArr.append(model)
+                    }
                     
                     lastLeftUnselectUsers = users.filter {
                         return $0.isSelected == false

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

@@ -299,6 +299,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
                 isNoSelectTime = true
             }
         }
+        
         if isNoSelectTime { // 有分组没有选择时间
             self.tableView.reloadData()
             return
@@ -322,6 +323,12 @@ class YHResignAppointTimeViewController: YHBaseViewController {
                             "users" : allUserInfoArr] as! [String : Any]
                 batchs.append(dict)
                 
+                if allAppointUsers.count <= 0 {
+                    // 人员列表不可为空
+                    YHHUD.flash(message: "预约人员列表不可为空")
+                    return
+                }
+                
             } else { // 说明是分批递交
                 let selectUser = group.users.filter {
                     let item = $0
@@ -335,6 +342,11 @@ class YHResignAppointTimeViewController: YHBaseViewController {
                             "leave_hk_at" : group.notleaveHK ? "" : group.getLeaveHKTime(),
                             "users" : allUserInfoArr] as! [String : Any]
                 batchs.append(dict)
+                if allUserInfoArr.count <= 0 {
+                    // 人员列表不可为空
+                    YHHUD.flash(message: "预约人员列表不可为空")
+                    return
+                }
             }
         }
         

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

@@ -375,7 +375,6 @@ class YHResignAppointTimeMultipleCell: UITableViewCell {
         result?(startTimeStr, endTimeStr)
     }
     
-    // dateStr1 >= dateStr2 return true 否则 return false
     func compareDates(_ dateStr1: String, _ dateStr2: String) -> YHDateCompareResult {
         
         let dateFormatter = DateFormatter()

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

@@ -236,8 +236,13 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
     }
     
     func getDateInfo(_ result: ((_ startTime: String, _ endTime: String)->())?) {
+        
+        // 开始时间和结束时间 都有则都取服务器model时间
+        // 若开始时间为空则取当前时间
+        // 若结束时间为空则取当前时间+28天的时间
+        
         let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd HH:mm"
+        formatter.dateFormat = "yyyy-MM-dd"
         var startTimeStr = formatter.string(from: Date())
         var endTimeStr = ""
         if let date = formatter.date(from: startTimeStr) {
@@ -268,7 +273,6 @@ class YHResignAppointTimeSingleCell: UITableViewCell {
         result?(startTimeStr, endTimeStr)
     }
     
-    // dateStr1 >= dateStr2 return true 否则 return false
     func compareDates(_ dateStr1: String, _ dateStr2: String) -> YHDateCompareResult {
         
         let dateFormatter = DateFormatter()