diff --git a/FCL/FineUIPro.Web/File/Excel/Punishment.xlsx b/FCL/FineUIPro.Web/File/Excel/Punishment.xlsx index 85543ba..80cb3fd 100644 Binary files a/FCL/FineUIPro.Web/File/Excel/Punishment.xlsx and b/FCL/FineUIPro.Web/File/Excel/Punishment.xlsx differ diff --git a/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs b/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs index 1488ad2..00848de 100644 --- a/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs +++ b/FCL/FineUIPro.Web/SES/CSafePunish.aspx.cs @@ -180,8 +180,8 @@ namespace FineUIPro.Web.SES protected void btnEmail_Click(object sender, EventArgs e) { List pList = (from x in Funs.DB.View_EMC_Punishment - where x.Flag == "1" && x.EmailIsSend == "否" - && (x.PunishDate.Value.Year + x.PunishDate.Value.Month) == (DateTime.Now.Year + DateTime.Now.Month) + where x.Flag == "1" && x.EmailIsSend == "否" + && x.CreateDate <= DateTime.Now //(x.PunishDate.Value.Year + x.PunishDate.Value.Month) == (DateTime.Now.Year + DateTime.Now.Month) select x).ToList(); if (pList.Count()>0) { diff --git a/FCL/Model/Model.cs b/FCL/Model/Model.cs index 4d2b06a..61582a8 100644 --- a/FCL/Model/Model.cs +++ b/FCL/Model/Model.cs @@ -29,11 +29,7 @@ namespace Model #region 可扩展性方法定义 partial void OnCreated(); - partial void OnCreated() - { - this.CommandTimeout = 600; - } - partial void InsertAttachFile(AttachFile instance); + partial void InsertAttachFile(AttachFile instance); partial void UpdateAttachFile(AttachFile instance); partial void DeleteAttachFile(AttachFile instance); partial void InsertAudiFlow(AudiFlow instance); @@ -28626,6 +28622,8 @@ namespace Model private string _EmailIsSend; + private System.Nullable _CreateDate; + public View_EMC_Punishment() { } @@ -29205,6 +29203,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateDate", DbType="DateTime")] + public System.Nullable CreateDate + { + get + { + return this._CreateDate; + } + set + { + if ((this._CreateDate != value)) + { + this._CreateDate = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_EMC_Que_Punishment")] @@ -29291,6 +29305,12 @@ namespace Model private string _EmailIsSend; + private string _AuditMan; + + private string _Main_CoordinatorId; + + private System.Nullable _IsAudit; + public View_EMC_Que_Punishment() { } @@ -29934,6 +29954,54 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")] + public string AuditMan + { + get + { + return this._AuditMan; + } + set + { + if ((this._AuditMan != value)) + { + this._AuditMan = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Main_CoordinatorId", DbType="NVarChar(50)")] + public string Main_CoordinatorId + { + get + { + return this._Main_CoordinatorId; + } + set + { + if ((this._Main_CoordinatorId != value)) + { + this._Main_CoordinatorId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAudit", DbType="Bit")] + public System.Nullable IsAudit + { + get + { + return this._IsAudit; + } + set + { + if ((this._IsAudit != value)) + { + this._IsAudit = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_ExtremeScoresReport")]