diff --git a/EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx b/EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx index b85bd17..16e8e02 100644 Binary files a/EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx and b/EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx differ diff --git a/EProject/FineUIPro.Web/Global.asax.cs b/EProject/FineUIPro.Web/Global.asax.cs index 02c0209..e459607 100644 --- a/EProject/FineUIPro.Web/Global.asax.cs +++ b/EProject/FineUIPro.Web/Global.asax.cs @@ -332,7 +332,8 @@ #region 1、填写第二张资源时,第一张资源预留一个月的时候填写人工时 2、Cancelled或Hold也预留一个月 /// - /// 填写第二张资源时,第一张资源预留一个月的时候填写人工时 + /// --填写第二张资源时,第一张资源预留一个月的时候填写人工时 + /// MOC和Projects项目,第一张资源Phase为Study/Concept Planning时PM_MA_ProjectApproval+一个月≤当前时间AccountDisabled为1 /// MOC和Projects项目 /// /// @@ -347,10 +348,11 @@ var planLists = (from x in Funs.DB.Resource_Plan join y in Funs.DB.Editor_EProject on x.EProjectId equals y.EProjectId where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC") + && x.Phase == "Study/Concept Planning" orderby x.CreateDate ascending select new { x.ResourcePlanId, y.PM_MA_ProjectApproval }).ToList(); - if (planLists.Count == 2) - { + //if (planLists.Count == 2) + //{ if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now) { string resourcePlanId = planLists[0].ResourcePlanId.ToString(); @@ -361,7 +363,7 @@ Funs.DB.SubmitChanges(); } } - } + //} } } diff --git a/EProject/FineUIPro.Web/Report/ProjectListReport.aspx b/EProject/FineUIPro.Web/Report/ProjectListReport.aspx index eae297b..3389a07 100644 --- a/EProject/FineUIPro.Web/Report/ProjectListReport.aspx +++ b/EProject/FineUIPro.Web/Report/ProjectListReport.aspx @@ -64,17 +64,6 @@ - - - - - - - - - - @@ -458,12 +447,6 @@ - - - - @@ -698,9 +681,6 @@ - - <%-- @@ -728,9 +708,25 @@ + + + + + + + + + + + + @@ -740,9 +736,21 @@ - <%-- - --%> + + + + + + + + + + + + + + diff --git a/EProject/FineUIPro.Web/Report/ProjectListReport.aspx.designer.cs b/EProject/FineUIPro.Web/Report/ProjectListReport.aspx.designer.cs index 6142514..364637f 100644 --- a/EProject/FineUIPro.Web/Report/ProjectListReport.aspx.designer.cs +++ b/EProject/FineUIPro.Web/Report/ProjectListReport.aspx.designer.cs @@ -131,15 +131,6 @@ namespace FineUIPro.Web.Report /// protected global::FineUIPro.DropDownList DropDownList2; - /// - /// DropDownList58 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList DropDownList58; - /// /// DropDownList3 控件。 /// @@ -644,6 +635,15 @@ namespace FineUIPro.Web.Report /// protected global::FineUIPro.DropDownList DropDownList59; + /// + /// DropDownList58 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropDownList58; + /// /// ToolbarSeparator1 控件。 ///