导入补充选择周计划

SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx

@@ -15,11 +15,12 @@
             <Toolbars>
                 <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
                     <Items>
-                        <f:TextBox runat="server" ID="txtWeekNo" ShowRedStar="true" Required="true" Label="周号" LabelAlign="Right"></f:TextBox>
+                        <%--<f:TextBox runat="server" ID="txtWeekNo" ShowRedStar="true" Required="true" Label="周号" LabelAlign="Right"></f:TextBox>--%>
-                        <f:DatePicker ID="txtStartDate" runat="server" ShowRedStar="true" Required="true" Label="开始日期" LabelAlign="Right"
+                       <f:DropDownList runat="server" ID="drpWeekNo" Label="周号" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="drpWeekNo_SelectedIndexChanged"></f:DropDownList>
+                        <f:DatePicker ID="txtStartDate" runat="server" ShowRedStar="true" Readonly="true" Label="开始日期" LabelAlign="Right"
                                                 EnableEdit="true" >
                                             </f:DatePicker>
-                    <f:DatePicker ID="txtEndDate" runat="server" ShowRedStar="true" Required="true" Label="结束日期" LabelAlign="Right"
+                    <f:DatePicker ID="txtEndDate" runat="server" ShowRedStar="true" Readonly="true" Label="结束日期" LabelAlign="Right"
                                                 EnableEdit="true" >
                                             </f:DatePicker>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>

SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx.cs

@@ -1,4 +1,5 @@
 using BLL;
+using FineUIPro.Web.ProjectData;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -55,6 +56,7 @@ namespace FineUIPro.Web.JDGL.Check
             {
                 this.hdFileName.Text = string.Empty;
                 this.hdCheckResult.Text = string.Empty;
+                this.InitDropDownList();
                 if (WeekPlans != null)
                 {
                     WeekPlans.Clear();
@@ -63,8 +65,52 @@ namespace FineUIPro.Web.JDGL.Check
                 this.ProjectId = Request.Params["ProjectId"];
             }
         }
+        /// <summary>
+        ///  初始化下拉框
+        /// </summary>
+        private void InitDropDownList()
+        {
+            WeekItemService.InitWeekItemDropDownList(this.drpWeekNo, this.CurrUser.LoginProjectId, false);
+
+            //获取当前时间所在周号，存在默认选中当前时间点所在周，否则选择最后一个周
+            var item = WeekItemService.GetWeekItemByDateNow(this.CurrUser.LoginProjectId);
+            if (item != null)
+            {//存在默认选中当前时间点所在周
+                this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
+                this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
+                this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
+            }
+            else
+            {
+                var items = WeekItemService.GetWeekItemList(this.CurrUser.LoginProjectId);
+                if (items.Any())
+                {//否则选择最后一个周
+                    item = items.First();
+                    this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
+                    this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
+                    this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
+                }
+            }
+        }
         #endregion
 
+        /// <summary>
+        /// 周号选择触发事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpWeekNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            var weekNo = this.drpWeekNo.SelectedValue;
+            var item = BLL.WeekItemService.GetWeekItemByProjectIdAndWeekNo(this.CurrUser.LoginProjectId, int.Parse(weekNo));
+            if (item != null)
+            {
+                this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
+                this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
+                this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
+            }
+        }
+
         #region 审核
         /// <summary>
         /// 审核
@@ -246,10 +292,14 @@ namespace FineUIPro.Web.JDGL.Check
                     }
                     else
                     {
-                        var user = projectUsers.FirstOrDefault(e => e.UserName == col4);
+                        var lstUser = col4.Split(',');
+                        foreach (var obj in lstUser)
+                        {
+                            var user = projectUsers.FirstOrDefault(x => x.UserName == obj);
                             if (user == null)
                             {
-                            result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + col4 + "]不在项目用户信息中！" + "|";
+                                result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + obj + "]不在项目用户信息中！" + "|";
+                            }
                         }
                     }
 
@@ -408,7 +458,7 @@ namespace FineUIPro.Web.JDGL.Check
                                select new { x.UserId, y.UserName };
             var cns = from x in db.Base_CNProfessional select x;
             var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x;
-            string weekNo = this.txtWeekNo.Text.Trim();
+            string weekNo = this.drpWeekNo.SelectedValue.Trim();
             DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
             DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
             if (pds != null && ir > 0)
@@ -457,12 +507,18 @@ namespace FineUIPro.Web.JDGL.Check
                     }
                     if (!string.IsNullOrEmpty(col4))//五环责任人
                     {
-                        var projectUser = projectUsers.FirstOrDefault(x => x.UserName == col4);
+                        var lstUser = col4.Split(',');
+                        var lstUserIds = string.Empty;
+                        foreach (var obj in lstUser)
+                        {
+                            var projectUser = projectUsers.FirstOrDefault(x => x.UserName == obj);
                             if (projectUser != null)
                             {
-                            WeekPlan.DutyPerson = projectUser.UserId;
+                                lstUserIds = !string.IsNullOrWhiteSpace(lstUserIds) ? $"{lstUserIds},{projectUser.UserId}" : projectUser.UserId;
                             }
                         }
+                        WeekPlan.DutyPerson = lstUserIds;
+                    }
                     if (!string.IsNullOrEmpty(col5))//计划完成时间
                     {
                         WeekPlan.PlanDate = Funs.GetNewDateTime(col5);
@@ -504,7 +560,7 @@ namespace FineUIPro.Web.JDGL.Check
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(this.txtWeekNo.Text.Trim()))
+            if (string.IsNullOrEmpty(this.drpWeekNo.SelectedValue.Trim()))
             {
                 ShowNotify("请选择周号！", MessageBoxIcon.Warning);
                 return;
@@ -514,7 +570,7 @@ namespace FineUIPro.Web.JDGL.Check
                 var WeekPlanLists = from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.ProjectId select x;
                 string quantityListId = string.Empty;
                 int a = WeekPlans.Count();
-                string weekNo = this.txtWeekNo.Text.Trim();
+                string weekNo = this.drpWeekNo.SelectedValue.Trim();
 
                 for (int i = 0; i < a; i++)
                 {
@@ -666,7 +722,16 @@ namespace FineUIPro.Web.JDGL.Check
             string name = string.Empty;
             if (DutyPerson != null)
             {
-                name = BLL.UserService.GetUserNameByUserId(DutyPerson.ToString());
+                var lstUser = DutyPerson.ToString().Split(',');
+                var lstUserIds = string.Empty;
+                foreach (var obj in lstUser)
+                {
+                    var username = BLL.UserService.GetUserNameByUserId(obj);
+                    if (username != null)
+                    {
+                        name = !string.IsNullOrWhiteSpace(name) ? $"{name},{username}" : username;
+                    }
+                }
             }
             return name;
         }

SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.JDGL.Check {
+namespace FineUIPro.Web.JDGL.Check
+{
 
 
-    public partial class WeekPlanIn {
+    public partial class WeekPlanIn
+    {
 
         /// <summary>
         /// form1 控件。
@@ -49,13 +51,13 @@ namespace FineUIPro.Web.JDGL.Check {
         protected global::FineUIPro.Toolbar Toolbar2;
 
         /// <summary>
-        /// txtWeekNo 控件。
+        /// drpWeekNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtWeekNo;
+        protected global::FineUIPro.DropDownList drpWeekNo;
 
         /// <summary>
         /// txtStartDate 控件。