Commit 9139b92e authored by Steven杜宇's avatar Steven杜宇

// 时间比较

parent dd080e00
...@@ -45,29 +45,41 @@ class YHResignAppointTimeSettingModel: SmartCodable { ...@@ -45,29 +45,41 @@ class YHResignAppointTimeSettingModel: SmartCodable {
func checkSubmitTime() -> Bool { func checkSubmitTime() -> Bool {
if server_submit_deadLine_start.isEmpty || server_submit_deadLine_end.isEmpty {
return true
}
let dateFormatter = DateFormatter() let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd" dateFormatter.dateFormat = "yyyy-MM-dd"
guard let startDate = dateFormatter.date(from: server_submit_deadLine_start) else { guard let startDate = dateFormatter.date(from: server_submit_deadLine_start) else {
return false return true
} }
guard let endDate = dateFormatter.date(from: server_submit_deadLine_end) else { guard let endDate = dateFormatter.date(from: server_submit_deadLine_end) else {
return false return true
} }
// 将结束日期C设置为当天的23:59:59,确保包含整天 // 将结束日期C设置为当天的23:59:59,确保包含整天
let calendar = Calendar.current let calendar = Calendar.current
guard let endOfDay = calendar.date(bySettingHour: 23, minute: 59, second: 59, of: endDate) else { guard let endOfDay = calendar.date(bySettingHour: 23, minute: 59, second: 59, of: endDate) else {
return false return true
} }
let dateTimeFormatter = DateFormatter() let dateTimeFormatter = DateFormatter()
dateTimeFormatter.dateFormat = "yyyy-MM-dd HH:mm" if self.ready_to_submit_at.count == "yyyy-MM-dd HH:mm:ss".count {
dateTimeFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
} else if self.ready_to_submit_at.count == "yyyy-MM-dd HH:mm".count {
dateTimeFormatter.dateFormat = "yyyy-MM-dd HH:mm"
} else {
dateTimeFormatter.dateFormat = "yyyy-MM-dd"
}
guard let targetDate = dateTimeFormatter.date(from: self.ready_to_submit_at) else { guard let targetDate = dateTimeFormatter.date(from: self.ready_to_submit_at) else {
return false return true
} }
// 判断目标日期是否在范围内 (包含边界) // 判断目标日期是否在范围内 (包含边界)
return startDate <= targetDate && targetDate <= endOfDay let result = (startDate <= targetDate && targetDate <= endOfDay)
return result
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment