疏文

2026-09-11 17:56:59 +08:00
parent dfb6a8e6a4
commit be5352efed
3 changed files with 27 additions and 15 deletions
@@ -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);