From 13c9bfaad84fd87b1b886f3f8f5774ab87b618c0 Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Fri, 30 Sep 2022 11:37:06 +0800 Subject: [PATCH] =?UTF-8?q?AMSISF=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/djy.IService/Report/IReportService.cs | 2 +- web/djy.Service/Ams/AmsService.cs | 127 ++++++++--------- web/djy.Service/DjyService/DjyUserService.cs | 6 - web/djy.Service/ISF/IsfService.cs | 131 +++++++++--------- web/djy.Service/Report/ReportService.cs | 74 ++++++---- web/djy.WebApi/Controllers/ApiBase.cs | 11 +- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- .../Controllers/ISF/IsfController.cs | 10 ++ .../PublishProfiles/FolderProfile.pubxml.user | 2 +- .../FolderProfile1.pubxml.user | 2 +- .../Controllers/Report/ReportController.cs | 10 +- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- 12 files changed, 200 insertions(+), 179 deletions(-) diff --git a/web/djy.IService/Report/IReportService.cs b/web/djy.IService/Report/IReportService.cs index 83479c7..da73a19 100644 --- a/web/djy.IService/Report/IReportService.cs +++ b/web/djy.IService/Report/IReportService.cs @@ -29,6 +29,6 @@ namespace djy.IService.Report string SaveInfo(DS_Report dto, User user); - string IsBook(string Gid, string TemplateId, bool isBook, string DJson, User user); + Response IsBook(string Gid, string TemplateId, bool isBook, string DJson, User user); } } diff --git a/web/djy.Service/Ams/AmsService.cs b/web/djy.Service/Ams/AmsService.cs index c272d42..ea499f1 100644 --- a/web/djy.Service/Ams/AmsService.cs +++ b/web/djy.Service/Ams/AmsService.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Dapper; using System.Data; using System.Data.SqlClient; using Common; @@ -34,9 +33,7 @@ namespace djy.Service.Ams /// public class AmsService : ServBase, IAmsService { - #region 查询列表 - public TableData Load(AMSQuery req, User user, UserAuthorityDto aut) { var result = new TableData(); @@ -125,8 +122,8 @@ namespace djy.Service.Ams history.GID = Guid.NewGuid().ToString("N"); history.AM_ID = oid; history.SendTime = DateTime.Now;///此处为删除时间 - history.State = "已删除"; - history.Type = "删除"; + history.State = "删除"; + history.Type = "0"; history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "删除了单据"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -202,8 +199,8 @@ namespace djy.Service.Ams history.GID = Guid.NewGuid().ToString("N"); history.AM_ID = house.GID; history.SendTime = DateTime.Now; - history.State = "已新增"; - history.Type = "新增"; + history.State = "新增"; + history.Type = "0"; history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -271,8 +268,8 @@ namespace djy.Service.Ams history.GID = Guid.NewGuid().ToString("N"); history.AM_ID = house.GID; history.SendTime = DateTime.Now; - history.State = "已新增"; - history.Type = "新增"; + history.State = "新增"; + history.Type = "0"; history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -346,15 +343,15 @@ namespace djy.Service.Ams } } - AMS_MasterHistory history = new AMS_MasterHistory(); - history.GID = Guid.NewGuid().ToString("N"); - history.AM_ID = item.GID; - history.SendTime = DateTime.Now; - history.State = "已修改"; - history.Type = "修改"; - history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "修改了单据"; - DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); + //AMS_MasterHistory history = new AMS_MasterHistory(); + //history.GID = Guid.NewGuid().ToString("N"); + //history.AM_ID = item.GID; + //history.SendTime = DateTime.Now; + //history.State = "修改"; + //history.Type = "0"; + //history.Operator = user.SHOWNAME; + //history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "修改了单据"; + //DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); } else { @@ -384,8 +381,8 @@ namespace djy.Service.Ams history.GID = Guid.NewGuid().ToString("N"); history.AM_ID = house.GID; history.SendTime = DateTime.Now; - history.State = "已新增"; - history.Type = "新增"; + history.State = "新增"; + history.Type = "0"; history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -438,8 +435,7 @@ namespace djy.Service.Ams if (docType == "AMSDOC") { - hodto = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel != true && x.PID == oid && x.State == "0"). - ToList(); + hodto = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel != true && x.PID == oid && x.State == "0").ToList(); #region docContent 新增 var cARRIERIDList = DbBus.Get(DbList.Common).Select().Where(map => map.Module == "AMS").ToList(); @@ -477,7 +473,6 @@ namespace djy.Service.Ams List houseBillInfoListItems = new List(); foreach (var item in hodto) { - var getfinrs = fin.Expend(new CustFee { ETD = master.ETD, @@ -617,12 +612,18 @@ namespace djy.Service.Ams List houseBillInfoListItems = new List(); foreach (var item in hodto) { - if (docType == "AMSAR" && !(item.ReportState == "删单成功" || item.MateState == "接收失败")) + if (docType == "AMSAR" && (item.NewNotice == "删除发送成功" || item.MateState == "匹配失败")) { req.Code = 201; req.Message = "当前状态不能重发！如有疑问，请联系相关客服！"; return req; } + if (docType == "AMSDOC"&&(item.NewNotice== "新增发送成功")) + { + req.Code = 201; + req.Message = "当前单据已经发送，不能再次发送！如有疑问，请联系相关客服！"; + return req; + } if (docType == "AMSAR") @@ -774,7 +775,7 @@ namespace djy.Service.Ams return req; } - if (item.ReportState == "删单成功") + if (item.NewNotice == "删除发送成功") { req.Code = 201; req.Message = "已删除单据不可以再次删除"; @@ -851,26 +852,26 @@ namespace djy.Service.Ams if (docType == "AMSDOC") { history.State = "新增发送失败"; - history.Type = "接收失败"; + history.Type = "0"; } else if (docType == "AMSAR") { history.State = "重发失败"; - history.Type = "接收失败"; + history.Type = "0"; } else if (docType == "AMSM") { history.State = "修改发送失败"; - history.Type = "修改失败"; + history.Type = "0"; } else { history.State = "删除发送失败"; - history.Type = "删单失败"; + history.Type = "0"; } history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg; + history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg + errorInfo; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); } @@ -884,25 +885,26 @@ namespace djy.Service.Ams history.GID = Guid.NewGuid().ToString("N"); history.AM_ID = oid; history.SendTime = DateTime.Now; + history.Type = "0"; if (docType == "AMSDOC") { history.State = "新增发送成功"; - history.Type = "接收成功"; + } else if (docType == "AMSAR") { history.State = "重发成功"; - history.Type = "接收成功"; + } else if (docType == "AMSM") { history.State = "修改发送成功"; - history.Type = "修改成功"; + } else { history.State = "删除发送成功"; - history.Type = "删单成功"; + } history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据"; @@ -1050,33 +1052,33 @@ namespace djy.Service.Ams history.AM_ID = retdto.businessId; history.SendTime = DateTime.Now; history.State = "海关接收成功"; - history.Type = "匹配成功"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关接收成功"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); if (house.NewNotice == "删除发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关接收成功", ReportState = "删单成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else if (house.NewNotice == "修改发送成功") { if (house.MateState.Contains("3Z")) { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "海关接收成功"}).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "海关接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "海关接收成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "海关接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } @@ -1094,32 +1096,32 @@ namespace djy.Service.Ams history.AM_ID = retdto.businessId; history.SendTime = DateTime.Now; history.State = "船司匹配成功"; - history.Type = "匹配成功"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "船司匹配成功"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); if (house.NewNotice == "删除发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "船司匹配成功", ReportState = "删单成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "船司匹配成功"}).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else if (house.NewNotice == "修改发送成功") { if (house.MateState.Contains("3Z")) { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = "3Z," + retdto.status, NewNotice = "船司匹配成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功"}).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "船司匹配成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } } @@ -1136,18 +1138,18 @@ namespace djy.Service.Ams history.AM_ID = retdto.businessId; history.SendTime = DateTime.Now; history.State = "ISF匹配成功"; - history.Type = "匹配成功"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "ISF匹配成功"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); if (house.NewNotice == "删除发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "ISF匹配成功", ReportState = "删单成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "ISF匹配成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "ISF匹配成功", ReportState = "接收成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = house.MateState + "," + retdto.status, NewNotice = "ISF匹配成功" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } } @@ -1160,7 +1162,7 @@ namespace djy.Service.Ams history.AM_ID = retdto.businessId; history.SendTime = DateTime.Now; history.State = "海关拒绝"; - history.Type = "匹配失败"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -1168,24 +1170,24 @@ namespace djy.Service.Ams if (house.NewNotice == "删除发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝", ReportState = "删单失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else if (house.NewNotice == "修改发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝", ReportState = "修改失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "海关拒绝" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } } @@ -1196,7 +1198,7 @@ namespace djy.Service.Ams history.AM_ID = retdto.businessId; history.SendTime = DateTime.Now; history.State = "箱货信息不匹配"; - history.Type = "匹配失败"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "箱货信息不匹配"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -1204,24 +1206,24 @@ namespace djy.Service.Ams if (house.NewNotice == "删除发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配", ReportState = "删单失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配"}).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else if (house.NewNotice == "修改发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配", ReportState = "修改失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "箱货信息不匹配" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } } @@ -1232,7 +1234,7 @@ namespace djy.Service.Ams history.AM_ID = retdto.businessId; history.SendTime = DateTime.Now; history.State = "匹配失败"; - history.Type = "匹配失败"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据" + house.HBLNo + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "匹配失败"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -1240,24 +1242,24 @@ namespace djy.Service.Ams if (house.NewNotice == "删除发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "删单失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else if (house.NewNotice == "修改发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "修改失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else if (house.NewNotice == "重发发送成功" || house.NewNotice == "新增发送成功") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败", ReportState = "接收失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new AMS_House { MateState = retdto.status, NewNotice = "匹配失败" }).Where(w => w.GID == retdto.businessId).ExecuteAffrows(); } } @@ -1689,7 +1691,6 @@ namespace djy.Service.Ams } #endregion - #region 获取模板 diff --git a/web/djy.Service/DjyService/DjyUserService.cs b/web/djy.Service/DjyService/DjyUserService.cs index add2f85..32da18b 100644 --- a/web/djy.Service/DjyService/DjyUserService.cs +++ b/web/djy.Service/DjyService/DjyUserService.cs @@ -80,7 +80,6 @@ namespace djy.Service.DjyService if (list == null || list.Count == 0) { var strSql = new StringBuilder(); - strSql.Append("SELECT * FROM ( "); strSql.Append("SELECT GID,USERID,VISIBLERANGE,OPERATERANGE,AUTHORITYID,DESCRIPTION,NAME as KeyName,ISNULL((case VISIBLERANGE when 0 then '全部' when 1 then '本公司' "); strSql.Append("when 2 then '本部门' when 3 then '本人' when 4 then '无' when 5 then '选择公司' "); strSql.Append("when 6 then '选择人员' when 7 then '注册公司' end),'') VISIBLERANGEREF,ISNULL((case OPERATERANGE when 0 then '全部' when 1 then '本公司' "); @@ -88,11 +87,6 @@ namespace djy.Service.DjyService strSql.Append("when 6 then '选择人员' when 7 then '注册公司' end),'') OPERATERANGEREF "); strSql.Append(" from VW_User_Authority "); strSql.Append(" where USERID='" + userid + "'"); - strSql.Append(" UNION SELECT '' GID,'" + userid + "' USERID, 4 VISIBLERANGE,4 OPERATERANGE,GID AUTHORITYID,DESCRIPTION,NAME, "); - strSql.Append(" '无' VISIBLERANGEREF,'无' OPERATERANGEREF "); - strSql.Append(" from user_authority_info "); - strSql.Append(" where GID NOT IN (SELECT AUTHORITYID FROM user_authority_range WHERE USERID='" + userid + "')"); - strSql.Append(" ) AS DL "); list = DbBus.Get(DbList.djyolddb).Ado.Query(strSql.ToString()); diff --git a/web/djy.Service/ISF/IsfService.cs b/web/djy.Service/ISF/IsfService.cs index 39250c9..c01ad08 100644 --- a/web/djy.Service/ISF/IsfService.cs +++ b/web/djy.Service/ISF/IsfService.cs @@ -27,7 +27,6 @@ namespace djy.Service.Isf string[] ReportStates = null; if (req.ReportState != null) { - ReportStates = req.ReportState.Split(','); } var dto = DbBus.Get(DbList.AMSCenter).Select(). @@ -37,11 +36,11 @@ namespace djy.Service.Isf WhereIf(req.MBLNO != null, x => x.MBLNO.Contains(req.MBLNO)). WhereIf(req.InFoType != null, x => x.InFoType == req.InFoType). WhereIf(req.ReportState != null && req.ReportState != "0" && req.ReportState != "1", x => ReportStates.Contains(x.ReportState)). - WhereIf(req.ReportState == "0", x => x.ReportState == "未申报" || x.ReportState == "删单成功" || x.ReportState == "接收失败"). - WhereIf(req.ReportState == "1", x => !(x.ReportState == "未申报" || x.ReportState == "删单成功" || x.ReportState == "接收失败")). + WhereIf(req.ReportState == "0", x => x.ReportState == "未申报"). + WhereIf(req.ReportState == "1", x => x.ReportState != "未申报"). WhereIf(req.UserName != null, x => x.UserName.Contains(req.UserName.Trim())). WhereIf(req.BDate != null, x => x.CreateTime >= req.BDate). - WhereIf(req.EDate != null, x => x.CreateTime <= req.EDate).OrderByDescending(x => x.CreateTime); ; + WhereIf(req.EDate != null, x => x.CreateTime <= req.EDate).OrderByDescending(x => x.CreateTime); result.count = dto.ToList().Count(); var list = dto.Page(req.Page, req.Limit).ToList(); if (list != null) @@ -61,6 +60,7 @@ namespace djy.Service.Isf #region 新增编辑 + public string SaveInfo(ISFDto dto, User user) { string guid = ""; @@ -84,13 +84,14 @@ namespace djy.Service.Isf master.CompName = user.COMNAME; master.IsDel = false; master.ReportState = "未申报"; + master.NewNotice = "新增"; DbBus.Get(DbList.AMSCenter).Insert(master).ExecuteAffrows(); ISF_MasterHistory history = new ISF_MasterHistory(); history.GID = Guid.NewGuid().ToString("N"); history.ISF_ID = master.GID; history.SendTime = DateTime.Now;/// - history.State = "已新增"; - history.Type = "新增"; + history.State = "新增"; + history.Type = "0"; history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "创建了单据"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -129,18 +130,19 @@ namespace djy.Service.Isf master.HstCode = dto.HstCode; master.BlTypeCode = dto.BlTypeCode; master.BlTypeName = dto.BlTypeName; + master.NewNotice = "修改"; master.LastUpdate = DateTime.Now; DbBus.Get(DbList.AMSCenter).Update().SetSource(master).ExecuteAffrows(); DbBus.Get(DbList.AMSCenter).Delete().Where(w => w.PID == master.GID).ExecuteAffrows(); - ISF_MasterHistory history = new ISF_MasterHistory(); - history.GID = Guid.NewGuid().ToString("N"); - history.ISF_ID = master.GID; - history.SendTime = DateTime.Now; - history.State = "已修改"; - history.Type = "修改"; - history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "修改了单据"; - DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); + //ISF_MasterHistory history = new ISF_MasterHistory(); + //history.GID = Guid.NewGuid().ToString("N"); + //history.ISF_ID = master.GID; + //history.SendTime = DateTime.Now; + //history.State = "修改"; + //history.Type = "0"; + //history.Operator = user.SHOWNAME; + //history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "修改了单据"; + //DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); if (dto.companyList != null && dto.companyList.Count() > 0) { foreach (var item in dto.companyList) @@ -172,15 +174,14 @@ namespace djy.Service.Isf { if (oid != "") { - DbBus.Get(DbList.AMSCenter).Transaction(() => { ISF_MasterHistory history = new ISF_MasterHistory(); history.GID = Guid.NewGuid().ToString("N"); history.ISF_ID = oid; history.SendTime = DateTime.Now;///此处为删除时间 - history.State = "已删除"; - history.Type = "删除"; + history.State = "删除"; + history.Type = "0"; history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "删除了单据"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); @@ -248,10 +249,10 @@ namespace djy.Service.Isf ISF_CompanyTemplate template = dto.MapTo(); - var i= DbBus.Get(DbList.AMSCenter).Update().SetSource(template).ExecuteAffrows(); + var i = DbBus.Get(DbList.AMSCenter).Update().SetSource(template).ExecuteAffrows(); return i.ToString(); } - + } #endregion @@ -295,7 +296,7 @@ namespace djy.Service.Isf var fin = new FinanceService(); var master = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId && x.GID == oid).ToOne(); var comlist = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList(); - if (msgType == "4" && !(master.ReportState == "已删除" || master.MateState == "匹配失败")) + if (msgType == "4" && (master.MateState == "海关删除" || master.MateState != "S1" || master.MateState != "02")) { req.Code = 200; req.Message = "当前状态不能重发！如有疑问，请联系相关客服！"; @@ -303,15 +304,20 @@ namespace djy.Service.Isf } if (master.ReportState == "删单成功" && msgType == "3") { - req.Code = 201; req.Message = "已删除单据不可以再次删除"; return req; - } var gethtml = ""; if (msgType != "3") { + if (msgType == "1" && master.NewNotice == "新增发送") + { + req.Code = 200; + req.Message = "当前单据已经发送，不能再次发送！如有疑问，请联系相关客服！"; + return req; + } + if (msgType == "1" || msgType == "4") { @@ -437,29 +443,30 @@ namespace djy.Service.Isf history.GID = Guid.NewGuid().ToString("N"); history.ISF_ID = oid; history.SendTime = DateTime.Now; + history.Type = "0"; if (msgType == "1") { history.State = "新增发送失败"; - history.Type = "接收失败"; + } else if (msgType == "4") { history.State = "重发失败"; - history.Type = "接收失败"; + } else if (msgType == "2") { history.State = "修改发送失败"; - history.Type = "修改失败"; + } else { history.State = "删除发送失败"; - history.Type = "删单失败"; + } history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg; + history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg+ " "; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); req.Code = 201; req.Message = "操作失败," + msg; @@ -478,59 +485,60 @@ namespace djy.Service.Isf history.GID = Guid.NewGuid().ToString("N"); history.ISF_ID = oid; history.SendTime = DateTime.Now; + history.Type = "0"; if (msgType == "1") { history.State = "新增发送失败"; - history.Type = "接收失败"; + } else if (msgType == "4") { history.State = "重发失败"; - history.Type = "接收失败"; + } else if (msgType == "2") { history.State = "修改发送失败"; - history.Type = "修改失败"; + } else { history.State = "删除发送失败"; - history.Type = "删单失败"; + } history.Operator = user.SHOWNAME; - history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + msg; + history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败，失败原因：" + errorInfo + " "; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); req.Code = 201; req.Message = "操作失败," + msg + errorInfo; return req; - } history.GID = Guid.NewGuid().ToString("N"); history.ISF_ID = oid; history.SendTime = DateTime.Now; + history.Type = "0"; if (msgType == "1") { history.State = "新增发送成功"; - history.Type = "接收成功"; + } else if (msgType == "4") { history.State = "重发成功"; - history.Type = "接收成功"; + } else if (msgType == "2") { history.State = "修改发送成功"; - history.Type = "修改成功"; + } else { history.State = "删除发送成功"; - history.Type = "删单成功"; + } history.Operator = user.SHOWNAME; history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据"; @@ -551,7 +559,7 @@ namespace djy.Service.Isf MBLNO = master.MBLNO.ToString(), } , 1); - DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "新增发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "新增发送" }).Where(w => w.GID == oid).ExecuteAffrows(); } else if (msgType == "4") { @@ -567,17 +575,16 @@ namespace djy.Service.Isf MBLNO = master.MBLNO.ToString(), } , 1); - DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "重发发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "重发发送" }).Where(w => w.GID == oid).ExecuteAffrows(); } else if (msgType == "2") { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "修改发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); - + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "修改发送" }).Where(w => w.GID == oid).ExecuteAffrows(); } else { - DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "删除发送成功" }).Where(w => w.GID == oid).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { ReportState = "已提交", NewNotice = "删除发送" }).Where(w => w.GID == oid).ExecuteAffrows(); } } } @@ -600,15 +607,12 @@ namespace djy.Service.Isf { _LogsAdd("ISFReceipt", "post", $"ISF接口推送{msg}"); Response req = new Response(); - try { - if (msg != null) { ISFReceipt retdto = Json.JsonToObject(msg); var master = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.GID == retdto.businessId).ToOne(); - if (retdto.status == "S1") { ISF_MasterHistory history = new ISF_MasterHistory(); @@ -616,16 +620,13 @@ namespace djy.Service.Isf history.ISF_ID = master.GID; history.SendTime = DateTime.Now; history.State = "ISF和AMS匹配"; - history.Type = "ISF和AMS匹配"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的明细单据" + retdto.businessId + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "ISF和AMS匹配"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); - - - if (master.NewNotice == "重发发送成功" || master.NewNotice == "新增发送成功") + if (master.NewNotice == "重发发送" || master.NewNotice == "新增发送") { - - DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = retdto.status, NewNotice = "ISF和AMS匹配", ReportState = "匹配成功" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = retdto.status }).Where(w => w.GID == master.GID).ExecuteAffrows(); } } else if (retdto.status == "02") @@ -634,12 +635,20 @@ namespace djy.Service.Isf history.GID = Guid.NewGuid().ToString("N"); history.ISF_ID = master.GID; history.SendTime = DateTime.Now; - history.State = "接收成功"; - history.Type = "接收成功"; + history.State = "海关已接受"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关已接受"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); - DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = retdto.status, NewNotice = "海关已接受", ReportState = "接收成功" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + + if (retdto.content.IndexOf("DELETED") != -1) + { + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = "海关删除" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + } + else + { + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = retdto.status }).Where(w => w.GID == master.GID).ExecuteAffrows(); + } } else if (retdto.status == "01") { @@ -648,11 +657,11 @@ namespace djy.Service.Isf history.ISF_ID = master.GID; history.SendTime = DateTime.Now; history.State = "海关拒绝"; - history.Type = "海关拒绝"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "海关拒绝"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); - DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = retdto.status, NewNotice = "海关已拒绝", ReportState = "海关拒绝" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = retdto.status }).Where(w => w.GID == master.GID).ExecuteAffrows(); } else if (retdto.status == "SB" || retdto.status == "S2" || retdto.status == "S3" || retdto.status == "S4" || retdto.status == "S5" || retdto.status == "S6") { @@ -661,20 +670,18 @@ namespace djy.Service.Isf history.ISF_ID = master.GID; history.SendTime = DateTime.Now; history.State = "未匹配AMS"; - history.Type = "未匹配AMS"; + history.Type = "1"; history.Operator = "系统管理员"; history.Remark = "您的单据于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "未匹配AMS"; DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows(); - DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = retdto.status, NewNotice = "未匹配AMS", ReportState = "匹配失败" }).Where(w => w.GID == master.GID).ExecuteAffrows(); + DbBus.Get(DbList.AMSCenter).Update().Set(w => new ISF_Master { MateState = retdto.status }).Where(w => w.GID == master.GID).ExecuteAffrows(); } } else { - req.Code = 200; req.Message = "未收到参数"; return req; - } } @@ -692,8 +699,6 @@ namespace djy.Service.Isf } - - #endregion } } \ No newline at end of file diff --git a/web/djy.Service/Report/ReportService.cs b/web/djy.Service/Report/ReportService.cs index 5e43eca..58ba5fd 100644 --- a/web/djy.Service/Report/ReportService.cs +++ b/web/djy.Service/Report/ReportService.cs @@ -37,31 +37,32 @@ namespace djy.Service.Report var result = new TableData(); var templist = DbBus.Get(DbList.DSDB).Select().ToList(); - - List query = DbBus.Get(DbList.DSDB).Select().LeftJoin((temp, main) => main.TemplateID == temp.GID). - WhereIf(user.CompId != null, x => x.t2.CompID == user.CompId).ToList((temp, main) => new ReportDto + if (user.CompId != null) { + List query = DbBus.Get(DbList.DSDB).Select().LeftJoin((temp, main) => main.TemplateID == temp.GID). + Where(x => x.t2.CompID == user.CompId).ToList((temp, main) => new ReportDto { - GID = main.GID, - UserID = main.UserID, - UserName = main.UserName, - CompID = main.CompID, - CompName = main.CompName, - TemplateID = main.TemplateID, - TemplateName = temp.TemplateName, - TemplateDescribe = temp.TemplateDescribe, - IsBook = main.IsBook, - IsWechat = main.IsWechat, - IsEmail = main.IsEmail, - DJson = main.DJson, - EndTime = main.EndTime, - CreateTime = main.CreateTime, - TemplateType=temp.TemplateType + GID = main.GID, + UserID = main.UserID, + UserName = main.UserName, + CompID = main.CompID, + CompName = main.CompName, + TemplateID = main.TemplateID, + TemplateName = temp.TemplateName, + TemplateDescribe = temp.TemplateDescribe, + IsBook = main.IsBook, + IsWechat = main.IsWechat, + IsEmail = main.IsEmail, + DJson = main.DJson, + EndTime = main.EndTime, + CreateTime = main.CreateTime, + TemplateType = temp.TemplateType }).ToList(); - + foreach (var item in templist) { var it = query.Where(x => x.TemplateID == item.GID).FirstOrDefault(); - if (it==null) { + if (it == null) + { query.Add(new ReportDto { GID = null, @@ -83,8 +84,10 @@ namespace djy.Service.Report } } - result.data = query; - result.count = (int)query.Count(); + result.data = query; + result.count = (int)query.Count(); + } + return result; } #endregion @@ -134,7 +137,8 @@ namespace djy.Service.Report #region 取消订阅/订阅 - public string IsBook(string Gid,string TemplateId, bool isbook,string DJson, User user) { + public Response IsBook(string Gid,string TemplateId, bool isbook,string DJson, User user) { + var result = new Response(); if (isbook) { if (Gid.IsNull()) { @@ -153,8 +157,9 @@ namespace djy.Service.Report } if (DbBus.Get(DbList.DSDB).Select().Where(x => x.GID==Gid).ToOne().IsBook==true) { - - return "该模板已经订阅过了"; + result.Code = 201; + result.Message = "该模板已经订阅过了"; + return result; } var endtime = DbBus.Get(DbList.DSDB).Select().Where(x => x.GID == Gid).ToOne().EndTime; if (endtime != null&& endtime>DateTime.Now) { @@ -167,7 +172,10 @@ namespace djy.Service.Report LastUpdate = DateTime.Now, LastUserId = user.GID }).Where(w => w.GID == Gid).ExecuteAffrows(); - return "订阅成功！"; + + result.Code = 200; + result.Message = "订阅成功！"; + return result; } ////订阅 var fin = new FinanceService(); @@ -186,7 +194,10 @@ namespace djy.Service.Report }, 0); if (!getfinrs.Status) { - return getfinrs.Message; + result.Code = 201; + result.Message = getfinrs.Message; + return result; + } DbBus.Get(DbList.DSDB).Update().Set(w => new DS_Report { @@ -208,7 +219,9 @@ namespace djy.Service.Report SENDTYPE = templist.SendType, BSNO = Gid, }, 1); - return "订阅成功！"; + result.Code = 200; + result.Message = "订阅成功！"; + return result; } else { DbBus.Get(DbList.DSDB).Update().Set(w => new DS_Report @@ -217,8 +230,11 @@ namespace djy.Service.Report LastUpdate = DateTime.Now, LastUserId = user.GID }).Where(w => w.GID == Gid).ExecuteAffrows(); - return "取消成功！"; + result.Code = 200; + result.Message = "取消成功！"; + return result; } + return result; } #endregion diff --git a/web/djy.WebApi/Controllers/ApiBase.cs b/web/djy.WebApi/Controllers/ApiBase.cs index efa8a5f..a059a40 100644 --- a/web/djy.WebApi/Controllers/ApiBase.cs +++ b/web/djy.WebApi/Controllers/ApiBase.cs @@ -131,9 +131,8 @@ namespace djy_AmsApi.Controllers case 4://无权限或或默认权限 //_uerid = notguid; //_companyid = notguid; - RetrunData.UserId = notguid; - RetrunData.CompayId = notguid; - RetrunData.IsPower = false; + RetrunData.UserId = null; + RetrunData.CompayId = null; break; case 7://注册公司 @@ -149,9 +148,9 @@ namespace djy_AmsApi.Controllers } else { - RetrunData.UserId = notguid; - RetrunData.CompayId = notguid; - RetrunData.IsPower = false; + RetrunData.UserId = GetLoginId; + RetrunData.CompayId = null; + RetrunData.IsPower = true; } //if (sysOptionConfig.Webconfig.IsDev) diff --git a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 2d646b0..b55ab7e 100644 --- a/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy.WebApi\bin\publish\net5 - True|2022-08-31T02:01:14.0996702Z;True|2022-08-29T11:10:30.2643117+08:00;True|2022-08-29T10:55:49.0496591+08:00;True|2022-08-16T10:30:57.6816257+08:00;True|2022-08-15T17:50:55.2965000+08:00;True|2022-08-12T18:07:20.4848662+08:00;True|2022-08-12T17:46:41.1829405+08:00;True|2022-08-12T15:08:58.5925841+08:00;True|2022-07-20T16:18:49.1737260+08:00;True|2022-07-14T13:44:55.2043481+08:00;True|2022-07-13T10:21:13.3628429+08:00;True|2022-07-12T15:45:11.4672604+08:00;True|2022-07-12T10:48:29.8013532+08:00;True|2022-07-04T09:32:18.4540585+08:00;True|2022-07-01T17:34:50.7575127+08:00;True|2022-07-01T15:51:14.9076477+08:00;True|2022-06-30T15:06:12.0032112+08:00;True|2022-06-30T15:05:33.2540874+08:00;True|2022-06-30T10:26:41.3365814+08:00;True|2022-06-30T09:56:20.9021741+08:00;True|2022-06-30T08:53:10.0864638+08:00;True|2022-06-29T17:05:03.3034364+08:00;True|2022-06-29T16:50:10.1873653+08:00;True|2022-06-29T16:32:36.1524378+08:00;True|2022-06-29T15:56:09.9746651+08:00;True|2022-06-29T10:56:16.8088978+08:00;True|2022-06-29T08:54:20.5334051+08:00;True|2022-06-28T19:41:08.7023145+08:00;True|2022-06-28T19:26:28.7000486+08:00;True|2022-06-28T19:14:38.4827828+08:00;True|2022-06-28T18:56:21.8997711+08:00;True|2022-06-28T17:46:58.3643830+08:00;True|2022-06-28T17:10:20.1461539+08:00;True|2022-06-28T16:09:53.0805413+08:00;True|2022-06-28T15:52:30.2951989+08:00;True|2022-06-28T11:01:29.3265564+08:00;True|2022-06-28T10:35:04.6353020+08:00;True|2022-06-28T10:25:10.0426356+08:00;True|2022-06-28T10:22:28.8860296+08:00;True|2022-06-28T10:10:33.8758083+08:00;True|2022-06-28T10:03:21.1254163+08:00;True|2022-06-28T09:15:06.8911689+08:00;True|2022-06-27T17:07:03.5262846+08:00;True|2022-06-27T16:51:26.5898864+08:00;True|2022-06-27T16:28:43.2026298+08:00;True|2022-06-27T16:28:18.9494990+08:00;True|2022-06-27T16:27:16.7453474+08:00;True|2022-06-27T16:18:19.4634998+08:00;True|2022-06-27T16:02:41.1823096+08:00;True|2022-06-27T15:43:51.5116456+08:00;True|2022-06-27T15:23:40.6693098+08:00;True|2022-06-27T15:22:19.3671271+08:00;True|2022-06-27T14:41:57.2976612+08:00;True|2022-06-27T14:33:00.0677612+08:00;True|2022-06-27T14:24:08.5216447+08:00;True|2022-06-27T14:02:02.8566739+08:00;True|2022-06-27T09:23:01.1910441+08:00;True|2022-06-24T10:33:51.1549131+08:00;True|2022-06-24T09:59:03.2881122+08:00;True|2022-06-24T09:15:37.5422200+08:00;True|2022-06-23T15:11:47.3175395+08:00;True|2022-06-17T09:45:32.1714267+08:00;True|2022-06-16T17:03:22.3921843+08:00;True|2022-06-16T15:35:33.2295367+08:00;True|2022-06-16T15:21:17.5490522+08:00;True|2022-06-16T14:53:00.4693599+08:00;True|2022-06-10T14:25:18.7355725+08:00;True|2022-06-09T18:13:39.8032757+08:00;True|2022-06-09T17:57:35.8696074+08:00;True|2022-06-01T17:48:15.4107624+08:00;True|2022-05-31T16:09:22.2674554+08:00;True|2022-05-31T14:15:19.3700456+08:00;True|2022-05-18T09:06:11.5118231+08:00;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00;True|2022-01-29T11:06:15.3648999+08:00;True|2022-01-29T11:00:39.8926536+08:00;True|2022-01-28T14:35:21.7742884+08:00;True|2022-01-28T13:44:47.5005402+08:00;True|2021-12-20T11:12:24.1869686+08:00;True|2021-11-26T12:47:48.5784236+08:00;True|2021-11-25T10:09:49.9433864+08:00;True|2021-11-25T09:37:00.6093292+08:00;True|2021-11-25T09:05:31.9387896+08:00;True|2021-11-24T10:06:36.4353299+08:00;True|2021-11-24T10:05:50.0214052+08:00;True|2021-11-24T10:04:55.3930475+08:00;True|2021-11-24T09:54:45.9711710+08:00;True|2021-11-19T17:28:36.8788911+08:00;True|2021-11-11T11:47:53.2238106+08:00;True|2021-10-25T16:41:53.9980026+08:00;True|2021-10-25T16:30:28.1828641+08:00;True|2021-10-25T16:18:43.4003442+08:00;True|2021-10-25T11:56:15.6402921+08:00;True|2021-10-25T11:40:19.5447536+08:00;True|2021-10-25T10:07:48.9805552+08:00;True|2021-10-25T10:04:10.8948265+08:00;True|2021-10-25T09:48:27.3849674+08:00;True|2021-09-29T11:49:51.8683715+08:00;True|2021-09-28T18:32:55.3507925+08:00;True|2021-09-28T18:29:53.9063524+08:00;True|2021-09-28T18:28:36.1979045+08:00;True|2021-09-28T18:27:14.0693618+08:00;True|2021-09-28T12:04:26.3279007+08:00;True|2021-09-28T12:04:10.3945227+08:00;True|2021-09-28T12:03:10.3904100+08:00;True|2021-09-28T11:37:45.0482277+08:00;True|2021-09-28T11:37:12.9467611+08:00;True|2021-09-28T11:35:18.4356807+08:00;True|2021-09-28T11:34:57.5857798+08:00;True|2021-09-28T11:32:07.3952665+08:00;True|2021-09-28T11:31:56.0472675+08:00;True|2021-09-28T11:02:58.7231551+08:00;True|2021-09-28T11:02:24.3314587+08:00;True|2021-09-23T10:33:17.0585227+08:00;True|2021-09-23T10:15:28.5669869+08:00;True|2021-09-22T15:38:36.5949208+08:00;True|2021-09-22T15:37:14.3895150+08:00;True|2021-09-22T15:15:34.1096071+08:00;True|2021-09-22T13:54:04.9092004+08:00;True|2021-09-22T13:51:07.7860433+08:00;True|2021-09-22T13:48:44.1657158+08:00;True|2021-09-22T11:43:23.7675767+08:00;True|2021-09-22T11:39:57.8811307+08:00;True|2021-09-18T17:11:25.8244671+08:00;True|2021-09-18T17:06:57.9615641+08:00;True|2021-09-18T17:06:27.6770090+08:00;True|2021-09-18T15:15:53.6048918+08:00;True|2021-09-18T14:05:32.7398801+08:00;True|2021-09-16T10:50:15.9251386+08:00;True|2021-09-15T14:09:16.0943324+08:00;True|2021-09-15T10:14:47.4423584+08:00;True|2021-09-15T08:59:36.2816348+08:00;True|2021-09-15T08:59:06.0659025+08:00;True|2021-09-14T16:16:01.0927088+08:00;True|2021-09-14T16:05:19.1942230+08:00;True|2021-09-14T15:56:11.9210800+08:00;True|2021-09-14T15:06:22.7913220+08:00;True|2021-09-14T15:02:08.6994309+08:00;True|2021-09-14T13:57:46.5374369+08:00;True|2021-09-03T15:41:55.9346782+08:00;True|2021-09-03T14:42:08.7177144+08:00;True|2021-09-03T14:25:48.3478060+08:00;True|2021-09-01T18:44:04.0108700+08:00;True|2021-09-01T18:29:53.7998254+08:00;True|2021-08-30T18:06:55.0497033+08:00;True|2021-08-30T18:05:30.1878833+08:00;True|2021-08-30T18:01:08.9396673+08:00;True|2021-08-20T16:46:58.8334271+08:00;True|2021-08-20T15:58:15.4685932+08:00;False|2021-08-20T15:57:22.6334777+08:00;True|2021-08-19T09:18:27.4937232+08:00;True|2021-08-18T14:00:51.0789209+08:00;True|2021-08-18T12:49:18.9240148+08:00;True|2021-08-16T19:19:07.4882488+08:00;True|2021-08-16T17:54:03.7980648+08:00;True|2021-08-16T16:42:04.5036000+08:00;True|2021-08-16T16:34:59.3318167+08:00;True|2021-08-16T11:44:06.5450427+08:00;True|2021-08-16T09:39:05.2269990+08:00;True|2021-08-16T09:27:38.2430627+08:00;True|2021-08-16T09:16:32.6871475+08:00;True|2021-08-13T19:05:35.8370416+08:00;True|2021-08-13T17:37:25.5802853+08:00;True|2021-08-13T17:19:17.4059649+08:00;False|2021-08-13T17:15:48.5087232+08:00;True|2021-08-03T16:16:57.5039704+08:00;True|2021-08-03T09:47:15.4422559+08:00;True|2021-08-02T18:03:46.8174207+08:00;True|2021-07-30T18:44:35.7871199+08:00;True|2021-07-30T11:56:15.2793678+08:00;True|2021-07-29T18:16:47.5908488+08:00;True|2021-07-27T19:01:17.3686282+08:00;True|2021-07-27T18:53:15.0096926+08:00;True|2021-07-27T18:21:21.7175389+08:00;True|2021-07-27T18:13:49.7948790+08:00;True|2021-07-27T15:41:28.0096005+08:00;True|2021-07-27T15:17:36.9980637+08:00;True|2021-07-27T15:00:16.3453962+08:00;True|2021-07-27T08:56:31.1152011+08:00;True|2021-07-26T19:39:19.4764644+08:00;True|2021-07-26T16:14:02.0306423+08:00;True|2021-07-26T08:58:05.0743979+08:00;True|2021-07-23T13:52:17.7908297+08:00;True|2021-07-22T15:35:55.8011208+08:00;True|2021-07-22T14:48:57.5607768+08:00;False|2021-07-22T14:46:59.2433604+08:00;True|2021-07-22T11:53:54.1815531+08:00;True|2021-07-22T11:47:55.9402157+08:00;True|2021-07-21T17:07:47.1098636+08:00;False|2021-07-21T17:06:01.8301878+08:00;True|2021-07-21T12:07:33.5528978+08:00;True|2021-07-21T11:58:52.3976494+08:00;True|2021-07-21T11:54:08.4158872+08:00;True|2021-07-21T11:50:06.2472143+08:00;True|2021-07-21T11:36:39.1133844+08:00;True|2021-07-21T11:21:03.0114228+08:00;True|2021-07-21T11:18:17.4408786+08:00;True|2021-07-21T10:36:21.3639256+08:00;True|2021-07-21T10:07:08.7305964+08:00;True|2021-07-21T09:15:25.7452420+08:00;True|2021-07-20T18:30:40.6112889+08:00;True|2021-07-20T18:19:51.3604733+08:00;True|2021-07-20T18:19:32.7342667+08:00;True|2021-07-20T15:49:05.7588163+08:00;True|2021-07-20T11:16:36.9920165+08:00;True|2021-07-20T09:44:44.0514460+08:00;True|2021-07-20T09:38:33.2960380+08:00;True|2021-07-20T09:36:37.6588464+08:00;True|2021-07-19T10:56:12.4079564+08:00;True|2021-07-19T10:54:45.8280558+08:00;True|2021-07-19T09:22:28.3909171+08:00;True|2021-07-16T18:36:35.6023867+08:00;True|2021-07-16T18:16:03.6796336+08:00;True|2021-07-16T18:08:01.0416747+08:00;True|2021-07-16T17:57:30.6066695+08:00;True|2021-07-16T17:53:21.4597207+08:00;True|2021-07-16T16:35:59.3213603+08:00;True|2021-07-16T16:26:27.6700635+08:00;True|2021-07-16T16:14:06.0024712+08:00;True|2021-07-16T15:32:54.4613453+08:00;True|2021-07-16T15:05:27.8158189+08:00;True|2021-07-16T14:24:16.8232207+08:00;True|2021-07-16T14:09:34.4110570+08:00;True|2021-07-16T12:37:38.3718561+08:00;True|2021-07-16T12:34:42.0446442+08:00;True|2021-07-16T12:09:30.6811084+08:00;True|2021-07-16T12:08:25.1323321+08:00;True|2021-07-15T18:21:09.4741333+08:00;True|2021-07-15T16:00:04.2330144+08:00;True|2021-07-15T11:17:10.9557567+08:00;True|2021-07-14T16:23:40.5181594+08:00;True|2021-07-14T16:20:17.1233426+08:00;True|2021-07-14T16:14:59.1470836+08:00;True|2021-07-14T16:04:46.2399479+08:00;True|2021-07-14T16:02:19.2650977+08:00;True|2021-07-13T15:46:35.5148940+08:00;True|2021-07-13T15:19:02.2519981+08:00;True|2021-07-13T15:06:14.1118861+08:00;True|2021-07-13T08:58:19.1590599+08:00;True|2021-07-13T08:58:02.1765233+08:00;True|2021-07-12T19:57:37.5791996+08:00;True|2021-07-12T19:01:26.0226530+08:00;True|2021-07-12T19:00:58.5459964+08:00;True|2021-07-12T18:44:06.2988883+08:00;True|2021-07-12T18:42:53.2208871+08:00;True|2021-07-12T16:20:02.9452975+08:00;True|2021-07-12T16:08:35.4631966+08:00;True|2021-07-12T14:21:19.4579351+08:00;True|2021-07-12T11:59:33.7004439+08:00;True|2021-07-12T10:42:00.9669489+08:00;True|2021-07-09T19:30:48.0460644+08:00;True|2021-07-09T18:56:41.4058881+08:00;True|2021-07-09T18:48:49.6854447+08:00;True|2021-07-09T15:16:44.5457439+08:00;True|2021-07-09T11:42:41.8415232+08:00;False|2021-07-09T11:40:00.5492386+08:00;False|2021-07-09T11:39:47.8261898+08:00;False|2021-07-09T11:39:33.3491518+08:00;True|2021-07-07T18:07:21.3143487+08:00;True|2021-07-07T15:01:52.9270647+08:00;True|2021-07-07T14:57:08.5489994+08:00;True|2021-07-06T15:06:16.9591979+08:00;True|2021-07-06T14:49:44.5144609+08:00;True|2021-07-06T14:41:18.7434877+08:00;True|2021-07-05T18:14:49.0355170+08:00;True|2021-07-05T17:43:08.5712295+08:00;True|2021-07-05T15:47:49.2646754+08:00;True|2021-07-05T11:44:22.5364665+08:00;True|2021-07-05T11:42:03.9579692+08:00;False|2021-07-05T11:41:25.1128083+08:00;True|2021-07-05T11:24:21.1980971+08:00;False|2021-07-05T11:23:17.8024383+08:00;False|2021-07-05T11:22:05.3202914+08:00;False|2021-07-05T11:21:19.3955865+08:00;False|2021-07-05T11:20:46.2006683+08:00;False|2021-07-05T11:12:11.6354737+08:00;True|2021-06-30T16:41:14.2427073+08:00;True|2021-06-30T09:49:43.7585140+08:00;True|2021-06-30T09:38:56.6589900+08:00;True|2021-06-29T15:04:19.4269383+08:00;True|2021-06-29T12:03:02.6003063+08:00;True|2021-06-29T11:59:29.0700912+08:00;True|2021-06-28T19:07:09.6344096+08:00;True|2021-06-28T18:40:56.7729973+08:00;True|2021-06-28T15:07:08.4410491+08:00;True|2021-06-28T15:01:58.1985895+08:00;True|2021-06-28T14:59:46.0509356+08:00;True|2021-06-28T14:53:19.9543052+08:00;True|2021-06-28T14:01:43.2331532+08:00;True|2021-06-25T20:06:38.3250887+08:00;True|2021-06-25T20:05:04.4749130+08:00;True|2021-06-25T20:00:36.7519744+08:00;True|2021-06-25T19:51:29.4909627+08:00;True|2021-06-25T19:49:11.1186471+08:00;True|2021-06-25T19:41:20.5774902+08:00;True|2021-06-25T19:25:44.8011997+08:00;True|2021-06-25T19:12:31.3024305+08:00;True|2021-06-25T19:00:53.4604237+08:00;True|2021-06-25T17:14:22.1867284+08:00;True|2021-06-25T11:51:31.9760987+08:00;True|2021-06-18T15:38:24.8438063+08:00;True|2021-06-17T17:48:16.2507386+08:00;True|2021-06-17T15:27:53.5271385+08:00;True|2021-06-17T14:22:48.1153668+08:00;True|2021-06-16T19:48:54.7395044+08:00;True|2021-06-16T17:46:27.6970936+08:00;True|2021-06-16T17:17:24.5541236+08:00;True|2021-06-12T12:29:11.0670257+08:00;True|2021-06-12T12:13:31.2396353+08:00;True|2021-06-11T20:49:45.8770378+08:00;True|2021-06-11T20:23:35.7345560+08:00;True|2021-06-11T20:10:34.6841746+08:00;True|2021-06-11T20:10:03.8188681+08:00;True|2021-06-11T19:54:05.8278261+08:00;True|2021-06-11T17:54:42.9490044+08:00;True|2021-06-11T17:21:11.7650645+08:00;True|2021-06-11T14:37:24.6531937+08:00;True|2021-06-11T13:42:56.5964775+08:00;True|2021-06-09T12:00:10.0628981+08:00;True|2021-06-09T11:40:36.5754943+08:00;True|2021-06-09T09:14:44.6821751+08:00;True|2021-06-09T09:09:06.9619894+08:00;True|2021-06-07T15:56:56.1351876+08:00;True|2021-06-04T15:14:19.9115059+08:00;True|2021-06-03T17:08:00.6172894+08:00;True|2021-06-03T16:52:05.7356810+08:00;True|2021-06-02T16:13:58.0861859+08:00;True|2021-06-02T16:02:42.0530308+08:00;True|2021-06-02T15:22:59.6255771+08:00;True|2021-06-02T15:13:14.3872212+08:00;True|2021-06-02T13:41:58.0923978+08:00;True|2021-06-02T12:01:40.6200715+08:00;True|2021-06-02T11:55:28.3783673+08:00;True|2021-06-02T11:44:50.4444826+08:00;True|2021-06-02T10:42:05.4504772+08:00;True|2021-06-02T10:40:09.3183688+08:00;True|2021-06-02T10:33:30.9956248+08:00;True|2021-06-01T17:18:04.5340203+08:00;True|2021-06-01T16:01:46.7042467+08:00;True|2021-05-27T15:20:22.1172399+08:00;True|2021-05-27T15:17:25.6282240+08:00;True|2021-05-27T11:23:40.5666700+08:00;True|2021-05-27T11:21:37.4615006+08:00;True|2021-05-26T17:26:09.4150803+08:00;True|2021-05-26T15:56:52.3078548+08:00;True|2021-05-26T12:57:05.6791683+08:00;True|2021-05-26T12:52:55.8456216+08:00;True|2021-05-26T11:52:41.4381234+08:00;True|2021-05-26T10:34:25.1039767+08:00;True|2021-05-25T19:32:45.7536080+08:00;True|2021-05-25T18:57:00.2219334+08:00;True|2021-05-22T19:11:40.6386209+08:00;True|2021-05-22T18:55:54.6950603+08:00;True|2021-05-22T18:52:33.5496260+08:00;True|2021-05-22T18:48:02.8228681+08:00;True|2021-05-22T18:38:35.5427549+08:00;True|2021-05-22T18:29:15.3183375+08:00;True|2021-05-21T16:15:36.2915123+08:00;True|2021-05-20T18:42:10.9502323+08:00;True|2021-05-20T18:29:26.7676948+08:00;True|2021-05-20T12:52:08.9040949+08:00;True|2021-05-18T19:49:14.7589560+08:00;True|2021-05-18T19:45:41.1975778+08:00;True|2021-05-18T17:38:58.7822846+08:00;True|2021-05-18T17:30:55.4408386+08:00;True|2021-05-18T09:59:19.5593712+08:00;True|2021-05-18T09:52:52.2737127+08:00;True|2021-05-18T09:48:53.4093961+08:00;True|2021-05-17T12:45:44.7496366+08:00;True|2021-05-14T15:49:09.7552422+08:00;True|2021-05-12T17:43:57.0007037+08:00;True|2021-05-11T17:56:20.6718351+08:00;True|2021-05-11T09:52:46.7771715+08:00;True|2021-05-11T09:47:59.6677252+08:00;True|2021-05-10T09:20:34.8483836+08:00;True|2021-05-10T09:16:38.9532357+08:00;True|2021-05-08T17:57:58.2859048+08:00;True|2021-05-08T17:42:05.9061123+08:00;True|2021-05-08T15:00:07.8150611+08:00;True|2021-05-08T14:48:31.1810990+08:00;True|2021-05-08T14:44:13.5496714+08:00;True|2021-05-08T14:13:09.0831985+08:00;True|2021-05-08T10:27:05.6731164+08:00;True|2021-05-08T09:40:07.1174765+08:00;True|2021-05-07T17:56:52.4453307+08:00;True|2021-05-07T17:49:29.1426131+08:00;True|2021-05-07T17:48:04.4944047+08:00;True|2021-05-07T11:54:39.3160848+08:00;True|2021-05-07T11:37:44.2078463+08:00;True|2021-05-06T10:15:44.3077632+08:00;False|2021-05-06T09:44:48.6087607+08:00;True|2021-04-30T14:05:04.0635812+08:00;True|2021-04-29T18:12:49.4946496+08:00;True|2021-04-29T18:05:11.3555826+08:00;True|2021-04-29T13:28:14.4016136+08:00;True|2021-04-29T09:49:29.4028858+08:00;True|2021-04-29T09:42:24.9605195+08:00;True|2021-04-29T08:49:42.0809708+08:00;True|2021-04-28T18:20:44.6736811+08:00;True|2021-04-28T16:17:15.1341398+08:00;True|2021-04-28T16:11:29.3588969+08:00;True|2021-04-28T16:07:14.3371000+08:00;True|2021-04-28T15:57:30.5126332+08:00;True|2021-04-28T15:38:50.3339247+08:00;True|2021-04-28T15:34:00.1137165+08:00;True|2021-04-26T18:28:09.2009690+08:00;True|2021-04-26T18:27:09.0671228+08:00;True|2021-04-26T17:37:50.3470017+08:00;True|2021-04-26T16:39:26.1331794+08:00;True|2021-04-26T16:37:55.0874184+08:00;True|2021-04-26T15:00:51.7607134+08:00;True|2021-04-26T13:57:19.6127526+08:00;True|2021-04-26T13:50:31.1704563+08:00;True|2021-04-26T13:26:56.4316438+08:00;True|2021-04-26T13:25:20.3680008+08:00;True|2021-04-26T12:14:01.1219655+08:00;True|2021-04-25T14:17:57.1985553+08:00;True|2021-04-25T09:17:34.5110190+08:00;True|2021-04-23T18:24:24.7539026+08:00;True|2021-04-23T15:11:34.0534044+08:00;True|2021-04-23T15:02:02.8339117+08:00;True|2021-04-23T14:57:30.5567589+08:00;True|2021-04-23T14:06:54.1317500+08:00;True|2021-04-22T17:56:05.1027452+08:00;True|2021-04-22T17:38:24.8160777+08:00;True|2021-04-22T17:04:15.4424275+08:00;True|2021-04-22T14:57:45.6592871+08:00;True|2021-04-22T10:57:56.9824541+08:00;True|2021-04-22T10:10:28.7976942+08:00;True|2021-04-22T09:06:01.1618269+08:00;True|2021-04-22T09:04:39.3001346+08:00;True|2021-04-22T09:03:11.8192098+08:00;True|2021-04-22T09:00:04.8625119+08:00;True|2021-04-21T14:53:13.1270439+08:00;True|2021-04-21T14:22:45.4885992+08:00;True|2021-04-21T12:53:06.1357977+08:00;True|2021-04-21T11:39:19.8279739+08:00;True|2021-04-21T11:27:05.2539879+08:00;True|2021-04-21T11:13:04.9842347+08:00;True|2021-04-21T09:50:20.8545149+08:00;True|2021-04-21T08:57:13.9684906+08:00;True|2021-04-21T08:56:26.6122006+08:00;True|2021-04-20T18:41:54.1939781+08:00;True|2021-04-20T10:42:00.8315845+08:00;True|2021-04-20T10:13:24.3801430+08:00;True|2021-04-20T09:09:27.5545063+08:00;True|2021-04-19T18:14:00.9901563+08:00;True|2021-04-19T16:34:00.7300768+08:00;True|2021-04-19T11:30:55.5776214+08:00;True|2021-04-16T15:35:34.4897823+08:00;True|2021-04-16T15:30:17.9854672+08:00;True|2021-04-16T13:30:55.9691229+08:00;True|2021-04-16T11:41:21.4250764+08:00;True|2021-04-16T10:16:53.9487848+08:00;True|2021-04-15T18:09:42.7678653+08:00;True|2021-04-15T15:32:44.3465906+08:00;True|2021-04-15T15:18:29.9058483+08:00; + True|2022-09-29T01:16:51.0738556Z;True|2022-09-29T09:12:44.1994050+08:00;True|2022-09-29T09:05:28.1343572+08:00;True|2022-09-28T17:22:24.8692737+08:00;True|2022-09-28T16:15:13.4883777+08:00;True|2022-09-28T10:59:23.5270093+08:00;True|2022-08-31T10:01:14.0996702+08:00;True|2022-08-29T11:10:30.2643117+08:00;True|2022-08-29T10:55:49.0496591+08:00;True|2022-08-16T10:30:57.6816257+08:00;True|2022-08-15T17:50:55.2965000+08:00;True|2022-08-12T18:07:20.4848662+08:00;True|2022-08-12T17:46:41.1829405+08:00;True|2022-08-12T15:08:58.5925841+08:00;True|2022-07-20T16:18:49.1737260+08:00;True|2022-07-14T13:44:55.2043481+08:00;True|2022-07-13T10:21:13.3628429+08:00;True|2022-07-12T15:45:11.4672604+08:00;True|2022-07-12T10:48:29.8013532+08:00;True|2022-07-04T09:32:18.4540585+08:00;True|2022-07-01T17:34:50.7575127+08:00;True|2022-07-01T15:51:14.9076477+08:00;True|2022-06-30T15:06:12.0032112+08:00;True|2022-06-30T15:05:33.2540874+08:00;True|2022-06-30T10:26:41.3365814+08:00;True|2022-06-30T09:56:20.9021741+08:00;True|2022-06-30T08:53:10.0864638+08:00;True|2022-06-29T17:05:03.3034364+08:00;True|2022-06-29T16:50:10.1873653+08:00;True|2022-06-29T16:32:36.1524378+08:00;True|2022-06-29T15:56:09.9746651+08:00;True|2022-06-29T10:56:16.8088978+08:00;True|2022-06-29T08:54:20.5334051+08:00;True|2022-06-28T19:41:08.7023145+08:00;True|2022-06-28T19:26:28.7000486+08:00;True|2022-06-28T19:14:38.4827828+08:00;True|2022-06-28T18:56:21.8997711+08:00;True|2022-06-28T17:46:58.3643830+08:00;True|2022-06-28T17:10:20.1461539+08:00;True|2022-06-28T16:09:53.0805413+08:00;True|2022-06-28T15:52:30.2951989+08:00;True|2022-06-28T11:01:29.3265564+08:00;True|2022-06-28T10:35:04.6353020+08:00;True|2022-06-28T10:25:10.0426356+08:00;True|2022-06-28T10:22:28.8860296+08:00;True|2022-06-28T10:10:33.8758083+08:00;True|2022-06-28T10:03:21.1254163+08:00;True|2022-06-28T09:15:06.8911689+08:00;True|2022-06-27T17:07:03.5262846+08:00;True|2022-06-27T16:51:26.5898864+08:00;True|2022-06-27T16:28:43.2026298+08:00;True|2022-06-27T16:28:18.9494990+08:00;True|2022-06-27T16:27:16.7453474+08:00;True|2022-06-27T16:18:19.4634998+08:00;True|2022-06-27T16:02:41.1823096+08:00;True|2022-06-27T15:43:51.5116456+08:00;True|2022-06-27T15:23:40.6693098+08:00;True|2022-06-27T15:22:19.3671271+08:00;True|2022-06-27T14:41:57.2976612+08:00;True|2022-06-27T14:33:00.0677612+08:00;True|2022-06-27T14:24:08.5216447+08:00;True|2022-06-27T14:02:02.8566739+08:00;True|2022-06-27T09:23:01.1910441+08:00;True|2022-06-24T10:33:51.1549131+08:00;True|2022-06-24T09:59:03.2881122+08:00;True|2022-06-24T09:15:37.5422200+08:00;True|2022-06-23T15:11:47.3175395+08:00;True|2022-06-17T09:45:32.1714267+08:00;True|2022-06-16T17:03:22.3921843+08:00;True|2022-06-16T15:35:33.2295367+08:00;True|2022-06-16T15:21:17.5490522+08:00;True|2022-06-16T14:53:00.4693599+08:00;True|2022-06-10T14:25:18.7355725+08:00;True|2022-06-09T18:13:39.8032757+08:00;True|2022-06-09T17:57:35.8696074+08:00;True|2022-06-01T17:48:15.4107624+08:00;True|2022-05-31T16:09:22.2674554+08:00;True|2022-05-31T14:15:19.3700456+08:00;True|2022-05-18T09:06:11.5118231+08:00;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00;True|2022-01-29T11:06:15.3648999+08:00;True|2022-01-29T11:00:39.8926536+08:00;True|2022-01-28T14:35:21.7742884+08:00;True|2022-01-28T13:44:47.5005402+08:00;True|2021-12-20T11:12:24.1869686+08:00;True|2021-11-26T12:47:48.5784236+08:00;True|2021-11-25T10:09:49.9433864+08:00;True|2021-11-25T09:37:00.6093292+08:00;True|2021-11-25T09:05:31.9387896+08:00;True|2021-11-24T10:06:36.4353299+08:00;True|2021-11-24T10:05:50.0214052+08:00;True|2021-11-24T10:04:55.3930475+08:00;True|2021-11-24T09:54:45.9711710+08:00;True|2021-11-19T17:28:36.8788911+08:00;True|2021-11-11T11:47:53.2238106+08:00;True|2021-10-25T16:41:53.9980026+08:00;True|2021-10-25T16:30:28.1828641+08:00;True|2021-10-25T16:18:43.4003442+08:00;True|2021-10-25T11:56:15.6402921+08:00;True|2021-10-25T11:40:19.5447536+08:00;True|2021-10-25T10:07:48.9805552+08:00;True|2021-10-25T10:04:10.8948265+08:00;True|2021-10-25T09:48:27.3849674+08:00;True|2021-09-29T11:49:51.8683715+08:00;True|2021-09-28T18:32:55.3507925+08:00;True|2021-09-28T18:29:53.9063524+08:00;True|2021-09-28T18:28:36.1979045+08:00;True|2021-09-28T18:27:14.0693618+08:00;True|2021-09-28T12:04:26.3279007+08:00;True|2021-09-28T12:04:10.3945227+08:00;True|2021-09-28T12:03:10.3904100+08:00;True|2021-09-28T11:37:45.0482277+08:00;True|2021-09-28T11:37:12.9467611+08:00;True|2021-09-28T11:35:18.4356807+08:00;True|2021-09-28T11:34:57.5857798+08:00;True|2021-09-28T11:32:07.3952665+08:00;True|2021-09-28T11:31:56.0472675+08:00;True|2021-09-28T11:02:58.7231551+08:00;True|2021-09-28T11:02:24.3314587+08:00;True|2021-09-23T10:33:17.0585227+08:00;True|2021-09-23T10:15:28.5669869+08:00;True|2021-09-22T15:38:36.5949208+08:00;True|2021-09-22T15:37:14.3895150+08:00;True|2021-09-22T15:15:34.1096071+08:00;True|2021-09-22T13:54:04.9092004+08:00;True|2021-09-22T13:51:07.7860433+08:00;True|2021-09-22T13:48:44.1657158+08:00;True|2021-09-22T11:43:23.7675767+08:00;True|2021-09-22T11:39:57.8811307+08:00;True|2021-09-18T17:11:25.8244671+08:00;True|2021-09-18T17:06:57.9615641+08:00;True|2021-09-18T17:06:27.6770090+08:00;True|2021-09-18T15:15:53.6048918+08:00;True|2021-09-18T14:05:32.7398801+08:00;True|2021-09-16T10:50:15.9251386+08:00;True|2021-09-15T14:09:16.0943324+08:00;True|2021-09-15T10:14:47.4423584+08:00;True|2021-09-15T08:59:36.2816348+08:00;True|2021-09-15T08:59:06.0659025+08:00;True|2021-09-14T16:16:01.0927088+08:00;True|2021-09-14T16:05:19.1942230+08:00;True|2021-09-14T15:56:11.9210800+08:00;True|2021-09-14T15:06:22.7913220+08:00;True|2021-09-14T15:02:08.6994309+08:00;True|2021-09-14T13:57:46.5374369+08:00;True|2021-09-03T15:41:55.9346782+08:00;True|2021-09-03T14:42:08.7177144+08:00;True|2021-09-03T14:25:48.3478060+08:00;True|2021-09-01T18:44:04.0108700+08:00;True|2021-09-01T18:29:53.7998254+08:00;True|2021-08-30T18:06:55.0497033+08:00;True|2021-08-30T18:05:30.1878833+08:00;True|2021-08-30T18:01:08.9396673+08:00;True|2021-08-20T16:46:58.8334271+08:00;True|2021-08-20T15:58:15.4685932+08:00;False|2021-08-20T15:57:22.6334777+08:00;True|2021-08-19T09:18:27.4937232+08:00;True|2021-08-18T14:00:51.0789209+08:00;True|2021-08-18T12:49:18.9240148+08:00;True|2021-08-16T19:19:07.4882488+08:00;True|2021-08-16T17:54:03.7980648+08:00;True|2021-08-16T16:42:04.5036000+08:00;True|2021-08-16T16:34:59.3318167+08:00;True|2021-08-16T11:44:06.5450427+08:00;True|2021-08-16T09:39:05.2269990+08:00;True|2021-08-16T09:27:38.2430627+08:00;True|2021-08-16T09:16:32.6871475+08:00;True|2021-08-13T19:05:35.8370416+08:00;True|2021-08-13T17:37:25.5802853+08:00;True|2021-08-13T17:19:17.4059649+08:00;False|2021-08-13T17:15:48.5087232+08:00;True|2021-08-03T16:16:57.5039704+08:00;True|2021-08-03T09:47:15.4422559+08:00;True|2021-08-02T18:03:46.8174207+08:00;True|2021-07-30T18:44:35.7871199+08:00;True|2021-07-30T11:56:15.2793678+08:00;True|2021-07-29T18:16:47.5908488+08:00;True|2021-07-27T19:01:17.3686282+08:00;True|2021-07-27T18:53:15.0096926+08:00;True|2021-07-27T18:21:21.7175389+08:00;True|2021-07-27T18:13:49.7948790+08:00;True|2021-07-27T15:41:28.0096005+08:00;True|2021-07-27T15:17:36.9980637+08:00;True|2021-07-27T15:00:16.3453962+08:00;True|2021-07-27T08:56:31.1152011+08:00;True|2021-07-26T19:39:19.4764644+08:00;True|2021-07-26T16:14:02.0306423+08:00;True|2021-07-26T08:58:05.0743979+08:00;True|2021-07-23T13:52:17.7908297+08:00;True|2021-07-22T15:35:55.8011208+08:00;True|2021-07-22T14:48:57.5607768+08:00;False|2021-07-22T14:46:59.2433604+08:00;True|2021-07-22T11:53:54.1815531+08:00;True|2021-07-22T11:47:55.9402157+08:00;True|2021-07-21T17:07:47.1098636+08:00;False|2021-07-21T17:06:01.8301878+08:00;True|2021-07-21T12:07:33.5528978+08:00;True|2021-07-21T11:58:52.3976494+08:00;True|2021-07-21T11:54:08.4158872+08:00;True|2021-07-21T11:50:06.2472143+08:00;True|2021-07-21T11:36:39.1133844+08:00;True|2021-07-21T11:21:03.0114228+08:00;True|2021-07-21T11:18:17.4408786+08:00;True|2021-07-21T10:36:21.3639256+08:00;True|2021-07-21T10:07:08.7305964+08:00;True|2021-07-21T09:15:25.7452420+08:00;True|2021-07-20T18:30:40.6112889+08:00;True|2021-07-20T18:19:51.3604733+08:00;True|2021-07-20T18:19:32.7342667+08:00;True|2021-07-20T15:49:05.7588163+08:00;True|2021-07-20T11:16:36.9920165+08:00;True|2021-07-20T09:44:44.0514460+08:00;True|2021-07-20T09:38:33.2960380+08:00;True|2021-07-20T09:36:37.6588464+08:00;True|2021-07-19T10:56:12.4079564+08:00;True|2021-07-19T10:54:45.8280558+08:00;True|2021-07-19T09:22:28.3909171+08:00;True|2021-07-16T18:36:35.6023867+08:00;True|2021-07-16T18:16:03.6796336+08:00;True|2021-07-16T18:08:01.0416747+08:00;True|2021-07-16T17:57:30.6066695+08:00;True|2021-07-16T17:53:21.4597207+08:00;True|2021-07-16T16:35:59.3213603+08:00;True|2021-07-16T16:26:27.6700635+08:00;True|2021-07-16T16:14:06.0024712+08:00;True|2021-07-16T15:32:54.4613453+08:00;True|2021-07-16T15:05:27.8158189+08:00;True|2021-07-16T14:24:16.8232207+08:00;True|2021-07-16T14:09:34.4110570+08:00;True|2021-07-16T12:37:38.3718561+08:00;True|2021-07-16T12:34:42.0446442+08:00;True|2021-07-16T12:09:30.6811084+08:00;True|2021-07-16T12:08:25.1323321+08:00;True|2021-07-15T18:21:09.4741333+08:00;True|2021-07-15T16:00:04.2330144+08:00;True|2021-07-15T11:17:10.9557567+08:00;True|2021-07-14T16:23:40.5181594+08:00;True|2021-07-14T16:20:17.1233426+08:00;True|2021-07-14T16:14:59.1470836+08:00;True|2021-07-14T16:04:46.2399479+08:00;True|2021-07-14T16:02:19.2650977+08:00;True|2021-07-13T15:46:35.5148940+08:00;True|2021-07-13T15:19:02.2519981+08:00;True|2021-07-13T15:06:14.1118861+08:00;True|2021-07-13T08:58:19.1590599+08:00;True|2021-07-13T08:58:02.1765233+08:00;True|2021-07-12T19:57:37.5791996+08:00;True|2021-07-12T19:01:26.0226530+08:00;True|2021-07-12T19:00:58.5459964+08:00;True|2021-07-12T18:44:06.2988883+08:00;True|2021-07-12T18:42:53.2208871+08:00;True|2021-07-12T16:20:02.9452975+08:00;True|2021-07-12T16:08:35.4631966+08:00;True|2021-07-12T14:21:19.4579351+08:00;True|2021-07-12T11:59:33.7004439+08:00;True|2021-07-12T10:42:00.9669489+08:00;True|2021-07-09T19:30:48.0460644+08:00;True|2021-07-09T18:56:41.4058881+08:00;True|2021-07-09T18:48:49.6854447+08:00;True|2021-07-09T15:16:44.5457439+08:00;True|2021-07-09T11:42:41.8415232+08:00;False|2021-07-09T11:40:00.5492386+08:00;False|2021-07-09T11:39:47.8261898+08:00;False|2021-07-09T11:39:33.3491518+08:00;True|2021-07-07T18:07:21.3143487+08:00;True|2021-07-07T15:01:52.9270647+08:00;True|2021-07-07T14:57:08.5489994+08:00;True|2021-07-06T15:06:16.9591979+08:00;True|2021-07-06T14:49:44.5144609+08:00;True|2021-07-06T14:41:18.7434877+08:00;True|2021-07-05T18:14:49.0355170+08:00;True|2021-07-05T17:43:08.5712295+08:00;True|2021-07-05T15:47:49.2646754+08:00;True|2021-07-05T11:44:22.5364665+08:00;True|2021-07-05T11:42:03.9579692+08:00;False|2021-07-05T11:41:25.1128083+08:00;True|2021-07-05T11:24:21.1980971+08:00;False|2021-07-05T11:23:17.8024383+08:00;False|2021-07-05T11:22:05.3202914+08:00;False|2021-07-05T11:21:19.3955865+08:00;False|2021-07-05T11:20:46.2006683+08:00;False|2021-07-05T11:12:11.6354737+08:00;True|2021-06-30T16:41:14.2427073+08:00;True|2021-06-30T09:49:43.7585140+08:00;True|2021-06-30T09:38:56.6589900+08:00;True|2021-06-29T15:04:19.4269383+08:00;True|2021-06-29T12:03:02.6003063+08:00;True|2021-06-29T11:59:29.0700912+08:00;True|2021-06-28T19:07:09.6344096+08:00;True|2021-06-28T18:40:56.7729973+08:00;True|2021-06-28T15:07:08.4410491+08:00;True|2021-06-28T15:01:58.1985895+08:00;True|2021-06-28T14:59:46.0509356+08:00;True|2021-06-28T14:53:19.9543052+08:00;True|2021-06-28T14:01:43.2331532+08:00;True|2021-06-25T20:06:38.3250887+08:00;True|2021-06-25T20:05:04.4749130+08:00;True|2021-06-25T20:00:36.7519744+08:00;True|2021-06-25T19:51:29.4909627+08:00;True|2021-06-25T19:49:11.1186471+08:00;True|2021-06-25T19:41:20.5774902+08:00;True|2021-06-25T19:25:44.8011997+08:00;True|2021-06-25T19:12:31.3024305+08:00;True|2021-06-25T19:00:53.4604237+08:00;True|2021-06-25T17:14:22.1867284+08:00;True|2021-06-25T11:51:31.9760987+08:00;True|2021-06-18T15:38:24.8438063+08:00;True|2021-06-17T17:48:16.2507386+08:00;True|2021-06-17T15:27:53.5271385+08:00;True|2021-06-17T14:22:48.1153668+08:00;True|2021-06-16T19:48:54.7395044+08:00;True|2021-06-16T17:46:27.6970936+08:00;True|2021-06-16T17:17:24.5541236+08:00;True|2021-06-12T12:29:11.0670257+08:00;True|2021-06-12T12:13:31.2396353+08:00;True|2021-06-11T20:49:45.8770378+08:00;True|2021-06-11T20:23:35.7345560+08:00;True|2021-06-11T20:10:34.6841746+08:00;True|2021-06-11T20:10:03.8188681+08:00;True|2021-06-11T19:54:05.8278261+08:00;True|2021-06-11T17:54:42.9490044+08:00;True|2021-06-11T17:21:11.7650645+08:00;True|2021-06-11T14:37:24.6531937+08:00;True|2021-06-11T13:42:56.5964775+08:00;True|2021-06-09T12:00:10.0628981+08:00;True|2021-06-09T11:40:36.5754943+08:00;True|2021-06-09T09:14:44.6821751+08:00;True|2021-06-09T09:09:06.9619894+08:00;True|2021-06-07T15:56:56.1351876+08:00;True|2021-06-04T15:14:19.9115059+08:00;True|2021-06-03T17:08:00.6172894+08:00;True|2021-06-03T16:52:05.7356810+08:00;True|2021-06-02T16:13:58.0861859+08:00;True|2021-06-02T16:02:42.0530308+08:00;True|2021-06-02T15:22:59.6255771+08:00;True|2021-06-02T15:13:14.3872212+08:00;True|2021-06-02T13:41:58.0923978+08:00;True|2021-06-02T12:01:40.6200715+08:00;True|2021-06-02T11:55:28.3783673+08:00;True|2021-06-02T11:44:50.4444826+08:00;True|2021-06-02T10:42:05.4504772+08:00;True|2021-06-02T10:40:09.3183688+08:00;True|2021-06-02T10:33:30.9956248+08:00;True|2021-06-01T17:18:04.5340203+08:00;True|2021-06-01T16:01:46.7042467+08:00;True|2021-05-27T15:20:22.1172399+08:00;True|2021-05-27T15:17:25.6282240+08:00;True|2021-05-27T11:23:40.5666700+08:00;True|2021-05-27T11:21:37.4615006+08:00;True|2021-05-26T17:26:09.4150803+08:00;True|2021-05-26T15:56:52.3078548+08:00;True|2021-05-26T12:57:05.6791683+08:00;True|2021-05-26T12:52:55.8456216+08:00;True|2021-05-26T11:52:41.4381234+08:00;True|2021-05-26T10:34:25.1039767+08:00;True|2021-05-25T19:32:45.7536080+08:00;True|2021-05-25T18:57:00.2219334+08:00;True|2021-05-22T19:11:40.6386209+08:00;True|2021-05-22T18:55:54.6950603+08:00;True|2021-05-22T18:52:33.5496260+08:00;True|2021-05-22T18:48:02.8228681+08:00;True|2021-05-22T18:38:35.5427549+08:00;True|2021-05-22T18:29:15.3183375+08:00;True|2021-05-21T16:15:36.2915123+08:00;True|2021-05-20T18:42:10.9502323+08:00;True|2021-05-20T18:29:26.7676948+08:00;True|2021-05-20T12:52:08.9040949+08:00;True|2021-05-18T19:49:14.7589560+08:00;True|2021-05-18T19:45:41.1975778+08:00;True|2021-05-18T17:38:58.7822846+08:00;True|2021-05-18T17:30:55.4408386+08:00;True|2021-05-18T09:59:19.5593712+08:00;True|2021-05-18T09:52:52.2737127+08:00;True|2021-05-18T09:48:53.4093961+08:00;True|2021-05-17T12:45:44.7496366+08:00;True|2021-05-14T15:49:09.7552422+08:00;True|2021-05-12T17:43:57.0007037+08:00;True|2021-05-11T17:56:20.6718351+08:00;True|2021-05-11T09:52:46.7771715+08:00;True|2021-05-11T09:47:59.6677252+08:00;True|2021-05-10T09:20:34.8483836+08:00;True|2021-05-10T09:16:38.9532357+08:00;True|2021-05-08T17:57:58.2859048+08:00;True|2021-05-08T17:42:05.9061123+08:00;True|2021-05-08T15:00:07.8150611+08:00;True|2021-05-08T14:48:31.1810990+08:00;True|2021-05-08T14:44:13.5496714+08:00;True|2021-05-08T14:13:09.0831985+08:00;True|2021-05-08T10:27:05.6731164+08:00;True|2021-05-08T09:40:07.1174765+08:00;True|2021-05-07T17:56:52.4453307+08:00;True|2021-05-07T17:49:29.1426131+08:00;True|2021-05-07T17:48:04.4944047+08:00;True|2021-05-07T11:54:39.3160848+08:00;True|2021-05-07T11:37:44.2078463+08:00;True|2021-05-06T10:15:44.3077632+08:00;False|2021-05-06T09:44:48.6087607+08:00;True|2021-04-30T14:05:04.0635812+08:00;True|2021-04-29T18:12:49.4946496+08:00;True|2021-04-29T18:05:11.3555826+08:00;True|2021-04-29T13:28:14.4016136+08:00;True|2021-04-29T09:49:29.4028858+08:00;True|2021-04-29T09:42:24.9605195+08:00;True|2021-04-29T08:49:42.0809708+08:00;True|2021-04-28T18:20:44.6736811+08:00;True|2021-04-28T16:17:15.1341398+08:00;True|2021-04-28T16:11:29.3588969+08:00;True|2021-04-28T16:07:14.3371000+08:00;True|2021-04-28T15:57:30.5126332+08:00;True|2021-04-28T15:38:50.3339247+08:00;True|2021-04-28T15:34:00.1137165+08:00;True|2021-04-26T18:28:09.2009690+08:00;True|2021-04-26T18:27:09.0671228+08:00;True|2021-04-26T17:37:50.3470017+08:00;True|2021-04-26T16:39:26.1331794+08:00;True|2021-04-26T16:37:55.0874184+08:00;True|2021-04-26T15:00:51.7607134+08:00;True|2021-04-26T13:57:19.6127526+08:00;True|2021-04-26T13:50:31.1704563+08:00;True|2021-04-26T13:26:56.4316438+08:00;True|2021-04-26T13:25:20.3680008+08:00;True|2021-04-26T12:14:01.1219655+08:00;True|2021-04-25T14:17:57.1985553+08:00;True|2021-04-25T09:17:34.5110190+08:00;True|2021-04-23T18:24:24.7539026+08:00;True|2021-04-23T15:11:34.0534044+08:00;True|2021-04-23T15:02:02.8339117+08:00;True|2021-04-23T14:57:30.5567589+08:00;True|2021-04-23T14:06:54.1317500+08:00;True|2021-04-22T17:56:05.1027452+08:00;True|2021-04-22T17:38:24.8160777+08:00;True|2021-04-22T17:04:15.4424275+08:00;True|2021-04-22T14:57:45.6592871+08:00;True|2021-04-22T10:57:56.9824541+08:00;True|2021-04-22T10:10:28.7976942+08:00;True|2021-04-22T09:06:01.1618269+08:00;True|2021-04-22T09:04:39.3001346+08:00;True|2021-04-22T09:03:11.8192098+08:00;True|2021-04-22T09:00:04.8625119+08:00;True|2021-04-21T14:53:13.1270439+08:00;True|2021-04-21T14:22:45.4885992+08:00;True|2021-04-21T12:53:06.1357977+08:00;True|2021-04-21T11:39:19.8279739+08:00;True|2021-04-21T11:27:05.2539879+08:00;True|2021-04-21T11:13:04.9842347+08:00;True|2021-04-21T09:50:20.8545149+08:00;True|2021-04-21T08:57:13.9684906+08:00;True|2021-04-21T08:56:26.6122006+08:00;True|2021-04-20T18:41:54.1939781+08:00;True|2021-04-20T10:42:00.8315845+08:00;True|2021-04-20T10:13:24.3801430+08:00;True|2021-04-20T09:09:27.5545063+08:00;True|2021-04-19T18:14:00.9901563+08:00;True|2021-04-19T16:34:00.7300768+08:00;True|2021-04-19T11:30:55.5776214+08:00;True|2021-04-16T15:35:34.4897823+08:00;True|2021-04-16T15:30:17.9854672+08:00;True|2021-04-16T13:30:55.9691229+08:00;True|2021-04-16T11:41:21.4250764+08:00;True|2021-04-16T10:16:53.9487848+08:00;True|2021-04-15T18:09:42.7678653+08:00;True|2021-04-15T15:32:44.3465906+08:00;True|2021-04-15T15:18:29.9058483+08:00; \ No newline at end of file diff --git a/web/djy_IsfApi/Controllers/ISF/IsfController.cs b/web/djy_IsfApi/Controllers/ISF/IsfController.cs index 7192e57..c1ec6cb 100644 --- a/web/djy_IsfApi/Controllers/ISF/IsfController.cs +++ b/web/djy_IsfApi/Controllers/ISF/IsfController.cs @@ -222,6 +222,16 @@ namespace djy_Isfpi.Controllers.ISF } + + + + [AllowAnonymous] + [HttpGet("GetTime")] + public string GetTime() { + + + return DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + } #endregion } } diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user index df206c8..0ab3364 100644 --- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\ - True|2022-08-25T05:52:10.9522475Z;True|2022-08-25T10:41:51.2753305+08:00;True|2022-08-11T14:45:29.1942046+08:00;True|2022-08-11T11:53:01.3573178+08:00;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00; + True|2022-09-29T06:06:18.1120086Z;True|2022-08-25T13:52:10.9522475+08:00;True|2022-08-25T10:41:51.2753305+08:00;True|2022-08-11T14:45:29.1942046+08:00;True|2022-08-11T11:53:01.3573178+08:00;True|2022-08-11T11:45:09.8023314+08:00;True|2022-07-07T11:27:16.6078315+08:00;True|2022-07-05T16:26:03.2409062+08:00;True|2022-07-05T16:24:40.7410506+08:00;True|2022-07-04T17:29:37.9437422+08:00;True|2022-07-04T11:51:52.2386090+08:00;True|2022-07-04T11:51:11.4558393+08:00;True|2022-07-04T09:35:17.7702978+08:00;True|2022-07-01T17:41:17.1936764+08:00;True|2022-07-01T17:32:54.2967210+08:00;True|2022-07-01T16:13:16.7902814+08:00;True|2022-07-01T15:53:11.0569260+08:00;True|2022-07-01T09:54:42.5780181+08:00;True|2022-06-30T15:28:48.8212173+08:00;True|2022-06-30T15:07:27.8048719+08:00;True|2022-06-30T14:23:02.1357807+08:00;True|2022-06-30T14:07:07.8696769+08:00;True|2022-06-30T09:14:19.1360602+08:00;True|2022-06-29T16:34:08.2367476+08:00; \ No newline at end of file diff --git a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user index 755369b..bdfb707 100644 --- a/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/web/djy_IsfApi/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -6,6 +6,6 @@ <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_IsfApi\bin\Release\net5.0\publish\ - True|2022-08-23T06:37:55.9777827Z;True|2022-08-22T15:49:27.7983465+08:00; + True|2022-09-29T01:19:00.7683602Z;True|2022-09-29T09:13:52.5346287+08:00;True|2022-09-28T17:20:00.5132329+08:00;True|2022-09-28T17:12:55.5194328+08:00;True|2022-09-28T17:08:40.9334943+08:00;True|2022-09-28T17:05:05.8696515+08:00;True|2022-09-28T16:31:42.3084773+08:00;True|2022-09-28T09:20:15.3600913+08:00;True|2022-08-31T11:05:06.8122818+08:00;True|2022-08-23T14:37:55.9777827+08:00;True|2022-08-22T15:49:27.7983465+08:00; \ No newline at end of file diff --git a/web/djy_Report/Controllers/Report/ReportController.cs b/web/djy_Report/Controllers/Report/ReportController.cs index aa8f6e7..0535c87 100644 --- a/web/djy_Report/Controllers/Report/ReportController.cs +++ b/web/djy_Report/Controllers/Report/ReportController.cs @@ -92,13 +92,9 @@ namespace djy_Report.Controllers.Report result.Message = "未订阅数据不能取消订阅"; return result; } - result.data = ser.IsBook(Gid, TemplateId,isBook, DJson,user); - if(result.data == "没有找到此业务的计费规则！") - { - result.Code = 201; - result.Message = "没有找到此业务的计费规则！"; - } - return result; + return ser.IsBook(Gid, TemplateId,isBook, DJson,user); + + } #endregion diff --git a/web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user b/web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user index d9adefd..95e7434 100644 --- a/web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_Report\bin\Release\net5.0\publish\ - True|2022-08-16T07:07:48.5795668Z;True|2022-08-12T17:21:59.5918968+08:00;True|2022-08-12T17:20:17.2821998+08:00;True|2022-08-12T16:53:08.4350093+08:00;True|2022-08-12T16:35:32.5083916+08:00;True|2022-08-12T11:37:34.3492640+08:00;True|2022-07-28T17:10:51.7248412+08:00;True|2022-07-28T16:35:31.2753071+08:00;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00; + True|2022-09-26T02:36:28.6725563Z;True|2022-09-26T10:19:28.4063280+08:00;True|2022-09-26T10:15:50.6060906+08:00;True|2022-08-16T15:07:48.5795668+08:00;True|2022-08-12T17:21:59.5918968+08:00;True|2022-08-12T17:20:17.2821998+08:00;True|2022-08-12T16:53:08.4350093+08:00;True|2022-08-12T16:35:32.5083916+08:00;True|2022-08-12T11:37:34.3492640+08:00;True|2022-07-28T17:10:51.7248412+08:00;True|2022-07-28T16:35:31.2753071+08:00;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00; \ No newline at end of file