yiming/17168ERP
1
0 Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

改太多

Browse Source
This commit is contained in:
minom committed 2026-10-30 17:47:01 +08:00
1 parent be5352efed
commit 1cb2a7a35e
48 files changed
+17970 -485
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

web/App_Code/api/statisticsController.cs
+5 -4
View File
@@ -184,6 +184,7 @@ public class statisticsController: ApiController
//{
// query = query.Where(a => a.endDate_solar.Value.ToString("yyyyMMdd").CompareTo(e_date) <= 0);
//}
var data = (from a in _db.activities
join b in _db.pro_order on a.num equals b.activity_num
join c in _db.pro_order_detail on b.order_no equals c.order_no
@@ -200,17 +201,17 @@ public class statisticsController: ApiController
item_subject = f.subject,
c.qty,
c.price,
a.startDate_solar,
a.endDate_solar
startDate_solar=a.startDate_solar==null?DateTime.MinValue:a.startDate_solar,
endDate_solar=a.endDate_solar==null?DateTime.MinValue:a.endDate_solar
}).ToList();
if (!string.IsNullOrEmpty(s_date))
{
data = data.Where(a => a.startDate_solar.Value.ToString("yyyyMMdd").CompareTo(s_date) >= 0).ToList();
data = data.Where(a => a.startDate_solar.Value.ToString("yyyyMMdd").CompareTo(s_date.Replace("-","")) >= 0).ToList();
}
if (!string.IsNullOrEmpty(e_date))
{
data = data.Where(a => a.endDate_solar.Value.ToString("yyyyMMdd").CompareTo(e_date) <= 0).ToList();
data = data.Where(a => a.endDate_solar.Value.ToString("yyyyMMdd").CompareTo(e_date.Replace("-", "")) <= 0).ToList();
}
int i = 0;
i++;