疏文

web/App_Code/Model/ViewModel/activity.cs

@@ -35,7 +35,8 @@ namespace Model.ViewModel
         public string up_time1 {  get; set; }
         public string up_time2 { get; set; }
         public string deadline { get; set; }
-      
+        public string startDate_solar { get; set; }
+        public string endDate_solar { get; set; }
     }
 
     public class actItem

web/App_Code/api/activityController.cs

@@ -311,6 +311,21 @@ public class activityController : ApiController
             qry = qry.Where(o => o.startDate_solar <=s&&o.endDate_solar>=s);
         }
 
+        if (!string.IsNullOrEmpty(q.startDate_solar)&& !string.IsNullOrEmpty(q.endDate_solar))
+        {
+            var sDate = DateTime.Parse(q.startDate_solar);
+            var eDate = DateTime.Parse(q.endDate_solar);
+            qry = qry.Where(o => o.startDate_solar <= eDate && o.endDate_solar >= sDate);
+        }else if (!string.IsNullOrEmpty(q.startDate_solar))
+        {
+            var s = DateTime.Parse(q.startDate_solar);
+            qry = qry.Where(o => o.startDate_solar <= s && o.endDate_solar >= s);
+        }
+        else if (!string.IsNullOrEmpty(q.endDate_solar))
+        {
+            var s = DateTime.Parse(q.endDate_solar);
+            qry = qry.Where(o => o.startDate_solar <= s && o.endDate_solar >= s);
+        }
         //if (!string.IsNullOrEmpty(q.up_time2))
         //{
         //    var end = DateTime.Parse(q.up_time2);