From 5dee7cecd70159342e6cb13360a7ee7d9c22a8d7 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 15:59:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Welfare/OperationTimeHepler.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/System/Welfare/OperationTimeHepler.cs b/System/Welfare/OperationTimeHepler.cs
index 80bc61a..b62de8c 100644
--- a/System/Welfare/OperationTimeHepler.cs
+++ b/System/Welfare/OperationTimeHepler.cs
@@ -648,7 +648,13 @@
OperationDate start;
OperationDate end;
- public int index = 0;
+ public int index = -1;
+
+ public OperationDateEnumerator(OperationDate _start,OperationDate _end)
+ {
+ this.start = _start;
+ this.end = _end;
+ }
public object Current
{
@@ -668,12 +674,17 @@
public bool MoveNext()
{
index++;
- return index <= (start - end);
+ bool isIn = index <= (start - end);
+ if (!isIn)
+ {
+ GetEnumerator().Reset();
+ }
+ return isIn;
}
public void Reset()
{
- index = 0;
+ index = -1;
}
}
@@ -938,6 +949,7 @@
}
if (seconds > 0)
{
+ dateEnumerator.Reset();
break;
}
}
--
Gitblit v1.8.0