日历备忘修改

foundergc · Aug 27, 2020 · 641fdbc · 641fdbc
1 parent 93c5d1c
commit 641fdbc
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 112 deletions.
diff --git a/HZH_Controls/HZH_Controls/Controls/DateTime/UCCalendarNotes.Designer.cs b/HZH_Controls/HZH_Controls/Controls/DateTime/UCCalendarNotes.Designer.cs
diff --git a/HZH_Controls/HZH_Controls/Controls/Step/UCStep.cs b/HZH_Controls/HZH_Controls/Controls/Step/UCStep.cs
@@ -131,7 +131,7 @@ public string[] Steps
 			get { return m_steps; }
 			set
 			{
-				if (m_steps == null || m_steps.Length < 1)
+                if (value == null || value.Length < 1)
 					return;
 				m_steps = value;
 				Refresh();

diff --git a/HZH_Controls/Test/UC/UCTestCalendarNotes.Designer.cs b/HZH_Controls/Test/UC/UCTestCalendarNotes.Designer.cs
diff --git a/HZH_Controls/Test/UC/UCTestCalendarNotes.cs b/HZH_Controls/Test/UC/UCTestCalendarNotes.cs
@@ -94,6 +94,20 @@ private List<NoteEntity> GetShowData(List<TestEntity> dbSource)
                         thisDt = thisDt.AddDays(7);
                     }
                 }
+                else if (item.LoopType == 3)
+                {
+                    DateTime thisDt = item.BeginDateTime;
+                    while (thisDt <= item.EndDateTime)
+                    {
+                        DateTime noteBeginTime = DateTime.Parse(thisDt.ToString("yyyy-MM-dd") + " " + item.LoopBeginTime.ToString("HH:mm:ss"));
+                        DateTime noteEndTime = noteBeginTime.Add(item.LoopDuration);
+                        if (noteBeginTime >= item.BeginDateTime && noteEndTime < item.EndDateTime)//是否在整个计划范围时间内
+                        {
+                            lst.Add(new NoteEntity() { Title = item.Title, Note = item.Msg, BeginTime = noteBeginTime, EndTime = noteEndTime, DataSource = item });
+                        }
+                        thisDt = thisDt.AddMonths(1);
+                    }
+                }
                 //月，年类似周
             }
 
@@ -103,6 +117,7 @@ private List<NoteEntity> GetShowData(List<TestEntity> dbSource)
         private bool ucCalendarNotes1_ClickNote(NoteEntity note)
         {
             TestEntity entity = (TestEntity)note.DataSource;
+
             //对entity进行修改、删除操作
             entity.Title += "修改1次；";
             //加载数据
@@ -113,6 +128,7 @@ private bool ucCalendarNotes1_ClickNote(NoteEntity note)
             MessageBox.Show("修改成功");
             return true;
         }
+
 
         private void ucCalendarNotes1_AddClick(DateTime beginTime)
         {