|
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
|
|
|
using Newtonsoft.Json;
|
|
|
using CP.Common;
|
|
|
using System.Dynamic;
|
|
|
+using System.Threading;
|
|
|
|
|
|
namespace CP.Model
|
|
|
{
|
|
@@ -2286,26 +2287,29 @@ namespace CP.Model
|
|
|
|
|
|
#region gp 只支持查询 今天 昨天 前天
|
|
|
|
|
|
- DateTime sqi = TypeConverter.ObjectToDateTime(gpdate(ename));
|
|
|
+ DateTime sqi = DateTime.Now;
|
|
|
if (n.ToString().Count() == 8)
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- if (n == TypeConverter.ObjectToInt(sqi.AddDays(-1).ToString("yyyyMMdd")))
|
|
|
- {
|
|
|
- sqi = TypeConverter.ObjectToDateTime(sqi.AddDays(-1).ToString("yyyy-MM-dd"));
|
|
|
- }
|
|
|
- else if (n == TypeConverter.ObjectToInt(sqi.AddDays(-2).ToString("yyyyMMdd")))
|
|
|
- {
|
|
|
- sqi = TypeConverter.ObjectToDateTime(sqi.AddDays(-2).ToString("yyyy-MM-dd"));
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ sqi = TypeConverter.ObjectToDateTime(DateTime.ParseExact(n.ToString(), "yyyyMMdd", Thread.CurrentThread.CurrentCulture).ToString("yyyy-MM-dd "));
|
|
|
+
|
|
|
}
|
|
|
catch
|
|
|
{
|
|
|
sqi = DateTime.Now;
|
|
|
}
|
|
|
}
|
|
|
- DateTime eqi = sqi.AddDays(1);
|
|
|
+ DateTime eqi = TypeConverter.ObjectToDateTime(sqi.ToString("yyyy-MM-dd 23:59:59"));
|
|
|
+ sqi = TypeConverter.ObjectToDateTime(sqi.ToString("yyyy-MM-dd 00:00:00"));
|
|
|
if (ename == GPEnum.tcah11x5.ToString())
|
|
|
{
|
|
|
var ilist = Tcah11x5Data.GetOneDayKjList(sqi, eqi);
|