From 99b532728069055b140fc9de5a04d6de8f92870f Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Fri, 15 Dec 2023 15:03:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E7=94=9F=E6=95=88=E5=A4=B1=E6=95=88=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electronicKeyPeriodValidity_page.dart     | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart
index e8cbf9d3..da48df74 100644
--- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart
+++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyPeriodValidity/electronicKeyPeriodValidity_page.dart
@@ -229,11 +229,29 @@ class _ElectronicKeyPeriodValidityPageState
               if ((state.selectIndexList.value.isNotEmpty &&
                   state.isHaveEffectiveDate.value == true &&
                   state.isHaveFailureDate.value == true)) {
-                Map<String, dynamic> resultMap = {};
-                resultMap['validityValue'] = state.selectIndexList.value;
-                resultMap['starDate'] = state.effectiveDateTime.value;
-                resultMap['endDate'] = state.failureDateTime.value;
-                Navigator.pop(context, resultMap);
+                DateTime startDateTime = DateTime(
+                    state.effectiveDateTime.value.year,
+                    state.effectiveDateTime.value.month,
+                    state.effectiveDateTime.value.day,
+                    state.effectiveDateTime.value.hour,
+                    state.effectiveDateTime.value.minute);
+                DateTime endDateTime = DateTime(
+                    state.failureDateTime.value.year,
+                    state.failureDateTime.value.month,
+                    state.failureDateTime.value.day,
+                    state.failureDateTime.value.hour,
+                    state.failureDateTime.value.minute);
+                //时间判断
+                if (!startDateTime.isBefore(endDateTime) ||
+                    startDateTime.isAtSameMomentAs(endDateTime)) {
+                  Toast.show(msg: '失效时间需大于生效时间');
+                } else {
+                  Map<String, dynamic> resultMap = {};
+                  resultMap['validityValue'] = state.selectIndexList.value;
+                  resultMap['starDate'] = state.effectiveDateTime.value;
+                  resultMap['endDate'] = state.failureDateTime.value;
+                  Navigator.pop(context, resultMap);
+                }
               }
             })),
       ],