From 563d401af65a65beaa0767d4864163005dfb0c67 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 10 May 2024 15:46:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-05-09-gaofei.sql | 2 + SGGL/BLL/Common/Const.cs | 4 + SGGL/BLL/JDGL/Check/MonthPlanService.cs | 29 +- SGGL/BLL/ProjectData/ProjectUnitService.cs | 26 + .../Excel/DataIn/月度计划情况导入模板.xls | Bin 0 -> 25088 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 24 + SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx | 8 +- .../JDGL/Check/MonthPlan.aspx.cs | 48 +- .../JDGL/Check/MonthPlan.aspx.designer.cs | 9 + .../JDGL/Check/MonthPlanEdit.aspx | 104 +++ .../JDGL/Check/MonthPlanEdit.aspx.cs | 188 ++++++ .../JDGL/Check/MonthPlanEdit.aspx.designer.cs | 168 +++++ .../FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx | 105 +++ .../JDGL/Check/MonthPlanIn.aspx.cs | 615 ++++++++++++++++++ .../JDGL/Check/MonthPlanIn.aspx.designer.cs | 159 +++++ .../JDGL/Check/MonthPlanStatisc.aspx | 83 +++ .../JDGL/Check/MonthPlanStatisc.aspx.cs | 280 ++++++++ .../Check/MonthPlanStatisc.aspx.designer.cs | 132 ++++ .../JDGL/Check/QuantityCompletion.aspx.cs | 2 +- .../JDGL/Check/QuantityCompletionEdit.aspx | 55 -- .../JDGL/Check/QuantityCompletionIn.aspx | 2 +- SGGL/FineUIPro.Web/Web.config | 2 +- SGGL/FineUIPro.Web/common/Menu_JDGL.xml | 1 + SGGL/FineUIPro.Web/common/Menu_Personal.xml | 3 + SGGL/FineUIPro.Web/common/Menu_TestRun.xml | 13 +- SGGL/FineUIPro.Web/common/Menu_Transfer.xml | 18 + SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 4 + SGGL/Model/Model.cs | 24 + SGGL/WebAPI/WebAPI.csproj.user | 2 +- 30 files changed, 2014 insertions(+), 98 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-05-09-gaofei.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/月度计划情况导入模板.xls create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.cs create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs create mode 100644 SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-09-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-09-gaofei.sql new file mode 100644 index 00000000..9b651638 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-09-gaofei.sql @@ -0,0 +1,2 @@ +alter table [dbo].[JDGL_MonthPlan] add SortIndex int null +GO \ No newline at end of file diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index fefebab6..1aa5cf7a 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3148,6 +3148,10 @@ namespace BLL /// public const string QuantityCompletionTemplateUrl = "File\\Excel\\DataIn\\项目进度完成情况导入模板.xls"; /// + /// 月度计划情况导入模版文件原始的虚拟路径 + /// + public const string MonthPlanTemplateUrl = "File\\Excel\\DataIn\\月度计划情况导入模板.xls"; + /// /// 仪表索引 /// public const string InstrumentUrl = "File\\Excel\\TestRun\\仪表索引模板.xlsx"; diff --git a/SGGL/BLL/JDGL/Check/MonthPlanService.cs b/SGGL/BLL/JDGL/Check/MonthPlanService.cs index 9b21c6f6..e4977356 100644 --- a/SGGL/BLL/JDGL/Check/MonthPlanService.cs +++ b/SGGL/BLL/JDGL/Check/MonthPlanService.cs @@ -22,6 +22,16 @@ namespace BLL return Funs.DB.JDGL_MonthPlan.FirstOrDefault(e => e.MonthPlanId == MonthPlanId); } + /// + /// 根据主键获取月度计划情况 + /// + /// + /// + public static List GetMonthPlansByMonths(string projectId, DateTime months) + { + return (from x in Funs.DB.JDGL_MonthPlan where x.ProjectId == projectId && x.Months == months select x).ToList(); + } + /// /// 添加月度计划情况 /// @@ -42,6 +52,7 @@ namespace BLL Remark = MonthPlan.Remark, CompileMan = MonthPlan.CompileMan, CompileDate = MonthPlan.CompileDate, + SortIndex = MonthPlan.SortIndex, }; db.JDGL_MonthPlan.InsertOnSubmit(newMonthPlan); db.SubmitChanges(); @@ -65,7 +76,8 @@ namespace BLL newMonthPlan.Remark = MonthPlan.Remark; newMonthPlan.CompileMan = MonthPlan.CompileMan; newMonthPlan.CompileDate = MonthPlan.CompileDate; - + newMonthPlan.SortIndex = MonthPlan.SortIndex; + db.SubmitChanges(); } } @@ -84,5 +96,20 @@ namespace BLL db.SubmitChanges(); } } + + /// + /// 根据主键删除月度计划情况 + /// + /// + public static void DeleteAllMonthPlan(string projectId, DateTime months) + { + Model.SGGLDB db = Funs.DB; + var q = from x in db.JDGL_MonthPlan where x.ProjectId == projectId && x.Months == months select x; + if (q != null) + { + db.JDGL_MonthPlan.DeleteAllOnSubmit(q); + db.SubmitChanges(); + } + } } } diff --git a/SGGL/BLL/ProjectData/ProjectUnitService.cs b/SGGL/BLL/ProjectData/ProjectUnitService.cs index b923eeee..64850236 100644 --- a/SGGL/BLL/ProjectData/ProjectUnitService.cs +++ b/SGGL/BLL/ProjectData/ProjectUnitService.cs @@ -169,6 +169,32 @@ } } } + + /// + /// 项目类型单位表下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitUnitDropDownList2(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var pUnit = (from x in db.Project_ProjectUnit + join y in db.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == projectId && x.UnitType == unitType + orderby y.UnitCode + select y).ToList(); + + dropName.DataValueField = "UnitName"; + dropName.DataTextField = "UnitName"; + dropName.DataSource = pUnit; + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + } #endregion /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/月度计划情况导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/月度计划情况导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..53b08121b5e68ea2e6c221bbaee9fda4da314a96 GIT binary patch literal 25088 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 + + + @@ -13751,6 +13754,27 @@ MonthPlan.aspx + + MonthPlanEdit.aspx + ASPXCodeBehind + + + MonthPlanEdit.aspx + + + MonthPlanIn.aspx + ASPXCodeBehind + + + MonthPlanIn.aspx + + + MonthPlanStatisc.aspx + ASPXCodeBehind + + + MonthPlanStatisc.aspx + PipelineCompletion.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63ca13cc..9e91deff 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx index 82708f7a..921a15fd 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx @@ -16,7 +16,7 @@ @@ -30,6 +30,8 @@ OnClick="btnSave_Click"> + + @@ -53,7 +55,7 @@ SortField="UnitName" FieldType="String" HeaderText="责任单位" TextAlign="center" HeaderTextAlign="Center"> - @@ -78,7 +80,7 @@ - diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs index 86941399..594d2512 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.cs @@ -19,7 +19,7 @@ namespace FineUIPro.Web.JDGL.Check { GetButtonPower(); btnNew.OnClientClick = Window1.GetShowReference("MonthPlanEdit.aspx") + "return false;"; - this.txtMonths.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.txtMonths.Text = string.Format("{0:yyyy-MM}", DateTime.Now); BindGrid(); } } @@ -51,6 +51,7 @@ namespace FineUIPro.Web.JDGL.Check protected void btnModify_Click(object sender, EventArgs e) { + Window1.Title = "录入"; PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanEdit.aspx?Months={0}", this.txtMonths.Text, "编辑 - "))); } @@ -59,34 +60,9 @@ namespace FineUIPro.Web.JDGL.Check /// private void BindGrid() { - string strSql = @"select qc.MonthPlanId,(select PlanNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as PlanNum, - (select RealNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as RealNum, - (select NextNum from JDGL_MonthPlan where QuantityListId=ql.QuantityListId and Months=@month) as NextNum,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex, - CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalPlanNum, - CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalRealNum, - CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(qc.PlanNum, 0) WHEN 0 THEN 0 - - ELSE 100 * ISNULL(qc.RealNum, 0) / (1.0 * qc.PlanNum) END AS DECIMAL(9, 2))))) + '%' - - AS Rate, - CONVERT(NVARCHAR(10), ((CAST(CASE(select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) WHEN 0 THEN 0 - - ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) END AS DECIMAL(9, 2)))))+'%' - - AS TotalRate, - CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(ql.DesignNum, 0) WHEN 0 THEN 0 - - ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * ql.DesignNum) END AS DECIMAL(9, 2)))))+'%' - - AS SumRate, - CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalPlanNum, - CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_MonthPlan where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalRealNum - from[dbo].JDGL_QuantityList ql - left join dbo.[JDGL_MonthPlan] qc on ql.QuantityListId=qc.QuantityListId -where qc.MonthPlanId=(select top 1 MonthPlanId from[JDGL_MonthPlan] q where q.QuantityListId=qc.QuantityListId and q.Months<=@month order by q.Months desc) and qc.ProjectId=@ProjectId order by ql.SortIndex, ql.Name"; - //string strSql = @"select * - // from dbo.View_JDGL_MonthPlan qc - // where qc.ProjectId=@ProjectId order by qc.SortIndex, qc.Name"; + string strSql = @"select mp.*,u.UnitName,us.UserName as DutyPersonName from [dbo].[JDGL_MonthPlan] mp +left join Base_Unit u on u.UnitId=mp.UnitId +left join Sys_User us on us.UserId=mp.DutyPerson where mp.ProjectId=@ProjectId and mp.Months=@month order by mp.SortIndex"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@month", string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01")))); @@ -167,6 +143,7 @@ where qc.MonthPlanId=(select top 1 MonthPlanId from[JDGL_MonthPlan] q where q.Qu /// protected void btnImport_Click(object sender, EventArgs e) { + Window1.Title = "导入"; PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanIn.aspx?ProjectId={0}", this.CurrUser.LoginProjectId, "导入 - "))); } @@ -180,5 +157,18 @@ where qc.MonthPlanId=(select top 1 MonthPlanId from[JDGL_MonthPlan] q where q.Qu BindGrid(); } #endregion + + #region 统计 + /// + /// 统计分析 + /// + /// + /// + protected void BtnAnalyse_Click(object sender, EventArgs e) + { + Window1.Title = "统计"; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthPlanStatisc.aspx", "统计 - "))); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs index 48d93b0d..4f1d79dd 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlan.aspx.designer.cs @@ -75,6 +75,15 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.Button btnSave; + /// + /// BtnAnalyse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button BtnAnalyse; + /// /// btnNew 控件。 /// diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx new file mode 100644 index 00000000..33096eb3 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx @@ -0,0 +1,104 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthPlanEdit.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.MonthPlanEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs new file mode 100644 index 00000000..e9d081c9 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.cs @@ -0,0 +1,188 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.JDGL.Check +{ + public partial class MonthPlanEdit : PageBase + { + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01"); + if (!string.IsNullOrEmpty(Request.Params["Months"])) + { + months = Convert.ToDateTime(Request.Params["Months"] + "-01"); + } + BLL.ProjectUnitService.InitUnitDropDownList2(drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); + UserService.Init(drpDutyPerson, CurrUser.LoginProjectId, false); + this.txtMonth.Text = string.Format("{0:yyyy-MM}", months); + BindGrid(); + } + } + + /// + /// 加载Grid + /// + private void BindGrid() + { + DateTime months = Convert.ToDateTime(this.txtMonth.Text + "-01"); + Model.SGGLDB db = Funs.DB; + Grid1.DataSource = from x in db.JDGL_MonthPlan + where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months + orderby x.SortIndex + select new + { + x.MonthPlanId, + x.ProjectId, + x.Months, + UnitId = db.Base_Unit.First(y => y.UnitId == x.UnitId).UnitName, + x.NodeContent, + x.PlanDate, + DutyPerson = db.Sys_User.First(y => y.UserId == x.DutyPerson).UserName, + x.RealDate, + x.Remark, + }; + Grid1.DataBind(); + } + + #region 月份选择事件 + /// + /// 月份选择事件 + /// + /// + /// + protected void txtMonths_TextChanged(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + protected void btnSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.txtMonth.Text)) + { + ShowNotify("请选择月份！", MessageBoxIcon.Warning); + } + SaveData(true); + } + + private void SaveData(bool bl) + { + DateTime months = Convert.ToDateTime(this.txtMonth.Text + "-01"); + var list = GetDetails(); + var units = from x in Funs.DB.Base_Unit select x; + var users = from x in Funs.DB.Sys_User select x; + BLL.MonthPlanService.DeleteAllMonthPlan(this.CurrUser.LoginProjectId, months); + Model.SGGLDB db = Funs.DB; + int i = 1; + foreach (var item in list) + { + Model.JDGL_MonthPlan MonthPlan = new Model.JDGL_MonthPlan(); + MonthPlan.MonthPlanId = SQLHelper.GetNewID(typeof(Model.JDGL_MonthPlan)); + MonthPlan.ProjectId = this.CurrUser.LoginProjectId; + MonthPlan.Months = months; + var unit = units.FirstOrDefault(x => x.UnitName == item.UnitId); + if (unit != null) + { + MonthPlan.UnitId = unit.UnitId; + } + MonthPlan.NodeContent = item.NodeContent; + MonthPlan.PlanDate = item.PlanDate; + var user = users.FirstOrDefault(x => x.UserName == item.DutyPerson); + if (user != null) + { + MonthPlan.DutyPerson = user.UserId; + } + MonthPlan.RealDate = item.RealDate; + MonthPlan.Remark = item.Remark; + MonthPlan.CompileMan = this.CurrUser.UserId; + MonthPlan.CompileDate = DateTime.Now; + MonthPlan.SortIndex = i; + BLL.MonthPlanService.AddMonthPlan(MonthPlan); + i++; + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + #region 增加按钮事件 + /// + /// 增加按钮事件 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + var list = GetDetails(); + Model.JDGL_MonthPlan ql = new Model.JDGL_MonthPlan(); + ql.MonthPlanId = SQLHelper.GetNewID(); + list.Add(ql); + Grid1.DataSource = list; + Grid1.DataBind(); + } + private List GetDetails() + { + List list = new List(); + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + Model.JDGL_MonthPlan ql = new Model.JDGL_MonthPlan(); + ql.MonthPlanId = Grid1.Rows[i].RowID; + ql.UnitId = values.Value("UnitId"); + ql.NodeContent = values.Value("NodeContent"); + ql.PlanDate = Funs.GetNewDateTime(values.Value("PlanDate")); + ql.DutyPerson = values.Value("DutyPerson"); + ql.RealDate = Funs.GetNewDateTime(values.Value("RealDate")); + ql.Remark = values.Value("Remark"); + list.Add(ql); + } + return list; + } + #endregion + + #region 行点击事件 + /// + /// Grid行点击事件 + /// + /// + /// + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + string monthPlanId = Grid1.DataKeys[e.RowIndex][0].ToString(); + var list = GetDetails(); + if (e.CommandName == "del")//删除 + { + var Report = list.FirstOrDefault(x => x.MonthPlanId == monthPlanId); + if (Report != null) + { + list.Remove(Report); + } + this.Grid1.DataSource = list; + this.Grid1.DataBind(); + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs new file mode 100644 index 00000000..92339b8d --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanEdit.aspx.designer.cs @@ -0,0 +1,168 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JDGL.Check { + + + public partial class MonthPlanEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel17; + + /// + /// Toolbar5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// txtMonth 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtMonth; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// Form15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form15; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// drpUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// txtNodeContent 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtNodeContent; + + /// + /// txtPlanDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtPlanDate; + + /// + /// drpDutyPerson 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpDutyPerson; + + /// + /// txtRealDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRealDate; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark; + } +} diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx new file mode 100644 index 00000000..c0373daa --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx @@ -0,0 +1,105 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthPlanIn.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.MonthPlanIn" %> + + + + + + 导入信息 + + + +
+ + + + + + + + + + + + + + + + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + --%> + + + + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.cs new file mode 100644 index 00000000..2b868129 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.cs @@ -0,0 +1,615 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.OleDb; +using System.IO; +using System.Linq; +using System.Web.UI; + +namespace FineUIPro.Web.JDGL.Check +{ + public partial class MonthPlanIn : PageBase + { + #region 定义变量 + /// + /// 上传预设的虚拟路径 + /// + private string initPath = Const.ExcelUrl; + + /// + /// 人员集合 + /// + public static List MonthPlans = new List(); + + /// + /// 错误集合 + /// + public static string errorInfos = string.Empty; + + /// + /// 项目ID + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.hdFileName.Text = string.Empty; + this.hdCheckResult.Text = string.Empty; + if (MonthPlans != null) + { + MonthPlans.Clear(); + } + errorInfos = string.Empty; + this.ProjectId = Request.Params["ProjectId"]; + } + } + #endregion + + #region 审核 + /// + /// 审核 + /// + /// + /// + protected void btnAudit_Click(object sender, EventArgs e) + { + try + { + if (this.fuAttachUrl.HasFile == false) + { + ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning); + return; + } + string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower(); + if (IsXls != ".xls") + { + ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning); + return; + } + if (MonthPlans != null) + { + MonthPlans.Clear(); + } + if (!string.IsNullOrEmpty(errorInfos)) + { + errorInfos = string.Empty; + } + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + if (!Directory.Exists(initFullPath)) + { + Directory.CreateDirectory(initFullPath); + } + + this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls; + string filePath = initFullPath + this.hdFileName.Text; + this.fuAttachUrl.PostedFile.SaveAs(filePath); + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PersonDataAudit.aspx?FileName={0}&ProjectId={1}", this.hdFileName.Text, Request.Params["ProjectId"], "审核 - "))); + ImportXlsToData(rootPath + initPath + this.hdFileName.Text); + } + catch (Exception ex) + { + ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + } + } + + #region 读Excel提取数据 + /// + /// 从Excel提取数据--》Dataset + /// + /// Excel文件路径名 + private void ImportXlsToData(string fileName) + { + try + { + string oleDBConnString = String.Empty; + oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + oleDBConnString += "Data Source="; + oleDBConnString += fileName; + oleDBConnString += ";Extended Properties=Excel 8.0;"; + OleDbConnection oleDBConn = null; + OleDbDataAdapter oleAdMaster = null; + DataTable m_tableName = new DataTable(); + DataSet ds = new DataSet(); + + oleDBConn = new OleDbConnection(oleDBConnString); + oleDBConn.Open(); + m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + + if (m_tableName != null && m_tableName.Rows.Count > 0) + { + + m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + + } + string sqlMaster; + sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + oleAdMaster.Fill(ds, "m_tableName"); + oleAdMaster.Dispose(); + oleDBConn.Close(); + oleDBConn.Dispose(); + + AddDatasetToSQL(ds.Tables[0], 6); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 将Dataset的数据导入数据库 + /// + /// 将Dataset的数据导入数据库 + /// + /// 数据集 + /// 数据集行数 + /// + private bool AddDatasetToSQL(DataTable pds, int Cols) + { + string result = string.Empty; + int ic, ir; + ic = pds.Columns.Count; + if (ic < Cols) + { + Alert.ShowInTop("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "行", MessageBoxIcon.Warning); + } + ir = pds.Rows.Count; + Model.SGGLDB db = Funs.DB; + var projectUnits = from x in db.Project_ProjectUnit + join y in db.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId + select new { x.UnitId, y.UnitName }; + var projectUsers = from x in db.Project_ProjectUser + join y in db.Sys_User on x.UserId equals y.UserId + where x.ProjectId == this.CurrUser.LoginProjectId + select new { x.UserId, y.UserName }; + if (pds != null && ir > 0) + { + for (int i = 0; i < ir; i++) + { + string col0 = pds.Rows[i][0].ToString().Trim(); + if (string.IsNullOrEmpty(col0)) + { + result += "第" + (i + 2).ToString() + "行," + "责任单位" + "," + "此项为必填项！" + "|"; + } + else + { + var unit = projectUnits.FirstOrDefault(e => e.UnitName == col0); + if (unit == null) + { + result += "第" + (i + 2).ToString() + "行," + "责任单位" + "," + "[" + col0 + "]不在项目单位中！" + "|"; + } + } + + string col1 = pds.Rows[i][1].ToString().Trim(); + if (string.IsNullOrEmpty(col1)) + { + result += "第" + (i + 2).ToString() + "行," + "节点内容" + "," + "此项为必填项！" + "|"; + } + + string col2 = pds.Rows[i][2].ToString().Trim(); + if (!string.IsNullOrEmpty(col2)) + { + try + { + DateTime dec = Convert.ToDateTime(col2); + } + catch (Exception) + { + result += "第" + (i + 2).ToString() + "行," + "计划完成时间" + "," + "[" + col2 + "]错误！" + "|"; + } + } + else + { + result += "第" + (i + 2).ToString() + "行," + "计划完成时间" + "," + "此项为必填项！" + "|"; + } + + string col3 = pds.Rows[i][3].ToString().Trim(); + if (string.IsNullOrEmpty(col3)) + { + result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "此项为必填项！" + "|"; + } + else + { + var user = projectUsers.FirstOrDefault(e => e.UserName == col3); + if (user == null) + { + result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + col3 + "]不在项目用户信息中！" + "|"; + } + } + + string col4 = pds.Rows[i][4].ToString().Trim(); + if (!string.IsNullOrEmpty(col4)) + { + try + { + DateTime dec = Convert.ToDateTime(col4); + } + catch (Exception) + { + result += "第" + (i + 2).ToString() + "行," + "实际完成时间" + "," + "[" + col4 + "]错误！" + "|"; + } + } + } + if (!string.IsNullOrEmpty(result)) + { + result = result.Substring(0, result.LastIndexOf("|")); + errorInfos = result; + Alert alert = new Alert + { + Message = result, + Target = Target.Self + }; + alert.Show(); + + + } + else + { + errorInfos = string.Empty; + ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success); + } + } + else + { + ShowNotify("导入数据为空！", MessageBoxIcon.Warning); + } + return true; + } + #endregion + #endregion + + #region 导入 + /// + /// 导入 + /// + /// + /// + protected void btnImport_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(errorInfos)) + { + if (!string.IsNullOrEmpty(this.hdFileName.Text)) + { + string rootPath = Server.MapPath("~/"); + ImportXlsToData2(rootPath + initPath + this.hdFileName.Text); + } + else + { + ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning); + } + } + else + { + Alert.ShowInTop("请先将错误数据修正，再重新导入保存！", MessageBoxIcon.Warning); + } + } + + #region Excel提取数据 + /// + /// 从Excel提取数据--》Dataset + /// + /// Excel文件路径名 + private void ImportXlsToData2(string fileName) + { + try + { + string oleDBConnString = String.Empty; + oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + oleDBConnString += "Data Source="; + oleDBConnString += fileName; + oleDBConnString += ";Extended Properties=Excel 8.0;"; + OleDbConnection oleDBConn = null; + OleDbDataAdapter oleAdMaster = null; + DataTable m_tableName = new DataTable(); + DataSet ds = new DataSet(); + + oleDBConn = new OleDbConnection(oleDBConnString); + oleDBConn.Open(); + m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + + if (m_tableName != null && m_tableName.Rows.Count > 0) + { + + m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + + } + string sqlMaster; + sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + oleAdMaster.Fill(ds, "m_tableName"); + oleAdMaster.Dispose(); + oleDBConn.Close(); + oleDBConn.Dispose(); + + AddDatasetToSQL2(ds.Tables[0], 6); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 将Dataset的数据导入数据库 + /// + /// 将Dataset的数据导入数据库 + /// + /// 数据集 + /// 数据集列数 + /// + private bool AddDatasetToSQL2(DataTable pds, int Cols) + { + int ic, ir; + MonthPlans.Clear(); + ic = pds.Columns.Count; + if (ic < Cols) + { + Alert.ShowInTop("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning); + } + + ir = pds.Rows.Count; + Model.SGGLDB db = Funs.DB; + var projectUnits = from x in db.Project_ProjectUnit + join y in db.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId select new { x.UnitId,y.UnitName}; + var projectUsers = from x in db.Project_ProjectUser + join y in db.Sys_User on x.UserId equals y.UserId + where x.ProjectId == this.CurrUser.LoginProjectId select new { x.UserId,y.UserName}; + DateTime month = Convert.ToDateTime(this.txtMonth.Text.Trim()); + if (pds != null && ir > 0) + { + for (int i = 0; i < ir; i++) + { + Model.JDGL_MonthPlan MonthPlan = new Model.JDGL_MonthPlan(); + string col0 = pds.Rows[i][0].ToString().Trim(); + string col1 = pds.Rows[i][1].ToString().Trim(); + string col2 = pds.Rows[i][2].ToString().Trim(); + string col3 = pds.Rows[i][3].ToString().Trim(); + string col4 = pds.Rows[i][4].ToString().Trim(); + string col5 = pds.Rows[i][5].ToString().Trim(); + if (!string.IsNullOrEmpty(col0))//责任单位 + { + var projectUnit = projectUnits.FirstOrDefault(x=>x.UnitName==col0); + if (projectUnit != null) + { + MonthPlan.UnitId = projectUnit.UnitId; + } + } + if (!string.IsNullOrEmpty(col1))//节点内容 + { + MonthPlan.NodeContent = col1; + } + + if (!string.IsNullOrEmpty(col2))//计划完成时间 + { + MonthPlan.PlanDate = Funs.GetNewDateTime(col2); + + } + if (!string.IsNullOrEmpty(col3))//计划完成 + { + var projectUser = projectUsers.FirstOrDefault(x => x.UserName == col3); + if (projectUser != null) + { + MonthPlan.DutyPerson = projectUser.UserId; + } + } + if (!string.IsNullOrEmpty(col4))//实际完成时间 + { + MonthPlan.RealDate = Funs.GetNewDateTime(col4); + } + if (!string.IsNullOrEmpty(col5))//备注 + { + MonthPlan.Remark = col5; + } + int num = (from x in Funs.DB.JDGL_MonthPlan where x.Months == month && x.ProjectId == this.CurrUser.LoginProjectId select x).Count(); + MonthPlan.SortIndex = num + 1; + MonthPlan.MonthPlanId = SQLHelper.GetNewID(typeof(Model.JDGL_MonthPlan)); + MonthPlans.Add(MonthPlan); + } + if (MonthPlans.Count > 0) + { + this.Grid1.Hidden = false; + this.Grid1.DataSource = MonthPlans; + this.Grid1.DataBind(); + } + } + else + { + ShowNotify("导入数据为空！", MessageBoxIcon.Warning); + } + return true; + } + #endregion + #endregion + + #region 保存 + /// + /// 保存 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.txtMonth.Text.Trim())) + { + ShowNotify("请选择月份！", MessageBoxIcon.Warning); + return; + } + if (string.IsNullOrEmpty(errorInfos)) + { + var monthPlanLists = from x in Funs.DB.JDGL_MonthPlan where x.ProjectId == this.ProjectId select x; + string quantityListId = string.Empty; + int a = MonthPlans.Count(); + DateTime month = Convert.ToDateTime(this.txtMonth.Text.Trim()); + for (int i = 0; i < a; i++) + { + var oldMonthPlan = monthPlanLists.FirstOrDefault(x => x.ProjectId == this.ProjectId && x.Months == month && x.UnitId == MonthPlans[i].UnitId && x.NodeContent== MonthPlans[i].NodeContent); + if (oldMonthPlan == null) + { + Model.JDGL_MonthPlan newMonthPlan = new Model.JDGL_MonthPlan(); + newMonthPlan.MonthPlanId = SQLHelper.GetNewID(typeof(Model.JDGL_MonthPlan)); + newMonthPlan.ProjectId = this.ProjectId; + newMonthPlan.Months = month; + newMonthPlan.UnitId = MonthPlans[i].UnitId; + newMonthPlan.NodeContent = MonthPlans[i].NodeContent; + newMonthPlan.PlanDate = MonthPlans[i].PlanDate; + newMonthPlan.DutyPerson = MonthPlans[i].DutyPerson; + newMonthPlan.RealDate = MonthPlans[i].RealDate; + newMonthPlan.Remark = MonthPlans[i].Remark; + newMonthPlan.SortIndex= MonthPlans[i].SortIndex; + newMonthPlan.CompileMan = this.CurrUser.UserId; + newMonthPlan.CompileDate = DateTime.Now; + BLL.MonthPlanService.AddMonthPlan(newMonthPlan); + } + else + { + oldMonthPlan.NodeContent = MonthPlans[i].NodeContent; + oldMonthPlan.PlanDate = MonthPlans[i].PlanDate; + oldMonthPlan.DutyPerson = MonthPlans[i].DutyPerson; + oldMonthPlan.RealDate = MonthPlans[i].RealDate; + oldMonthPlan.Remark = MonthPlans[i].Remark; + BLL.MonthPlanService.UpdateMonthPlan(oldMonthPlan); + } + } + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + string filePath = initFullPath + this.hdFileName.Text; + if (filePath != string.Empty && System.IO.File.Exists(filePath)) + { + System.IO.File.Delete(filePath);//删除上传的XLS文件 + } + ShowNotify("导入成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInTop("请先将错误数据修正，再重新导入保存！", MessageBoxIcon.Warning); + } + } + #endregion + + #region 导出错误提示 + /// + /// 导出错误提示 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + //string strFileName = DateTime.Now.ToString("yyyyMMdd-hhmmss"); + //System.Web.HttpContext HC = System.Web.HttpContext.Current; + //HC.Response.Clear(); + //HC.Response.Buffer = true; + //HC.Response.ContentEncoding = System.Text.Encoding.UTF8;//设置输出流为简体中文 + + ////---导出为Excel文件 + //HC.Response.AddHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(strFileName, System.Text.Encoding.UTF8) + ".xls"); + //HC.Response.ContentType = "application/ms-excel";//设置输出文件类型为excel文件。 + + //System.IO.StringWriter sw = new System.IO.StringWriter(); + //System.Web.UI.HtmlTextWriter htw = new System.Web.UI.HtmlTextWriter(sw); + //this.gvErrorInfo.RenderControl(htw); + //HC.Response.Write(sw.ToString()); + //HC.Response.End(); + } + + /// + /// 重载VerifyRenderingInServerForm方法，否则运行的时候会出现如下错误提示：“类型“GridView”的控件“GridView1”必须放在具有 runat=server 的窗体标记内” + /// + /// + public override void VerifyRenderingInServerForm(Control control) + { + } + #endregion + + #region 下载模板 + /// + /// 下载模板按钮 + /// + /// + /// + protected void btnDownLoad_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel"))); + } + + /// + /// 下载导入模板 + /// + /// + /// + protected void PageManager1_CustomEvent(object sender, CustomEventArgs e) + { + if (e.EventArgument == "Confirm_OK") + { + string rootPath = Server.MapPath("~/"); + string uploadfilepath = rootPath + Const.MonthPlanTemplateUrl; + string filePath = Const.MonthPlanTemplateUrl; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + } + } + #endregion + + /// + /// + /// + /// + /// + protected string ConvertUnitName(object UnitId) + { + string name = string.Empty; + if (UnitId != null) + { + name = BLL.UnitService.GetUnitNameByUnitId(UnitId.ToString()); + } + return name; + } + + /// + /// + /// + /// + /// + protected string ConvertDutyPersonName(object DutyPerson) + { + string name = string.Empty; + if (DutyPerson != null) + { + name = BLL.UserService.GetUserNameByUserId(DutyPerson.ToString()); + } + return name; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.designer.cs new file mode 100644 index 00000000..5f589525 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.designer.cs @@ -0,0 +1,159 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JDGL.Check { + + + public partial class MonthPlanIn { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtMonth 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtMonth; + + /// + /// btnAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAudit; + + /// + /// btnImport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnDownLoad 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDownLoad; + + /// + /// fuAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FileUpload fuAttachUrl; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// lbImageUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbImageUrl; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// hdFileName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdFileName; + + /// + /// hdCheckResult 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdCheckResult; + } +} diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx new file mode 100644 index 00000000..e2b41974 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx @@ -0,0 +1,83 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthPlanStatisc.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.MonthPlanStatisc" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs new file mode 100644 index 00000000..faf76327 --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.cs @@ -0,0 +1,280 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using BLL; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.JDGL.Check +{ + public partial class MonthPlanStatisc : PageBase + { + private static List StatisticsList = new List(); + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.txtMonths.Text = string.Format("{0:yyyy-MM}", DateTime.Now); + BindStatisc(); + } + } + protected void btnSearch_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.txtMonths.Text.Trim())) + { + Alert.ShowInTop("月份不能为空！", MessageBoxIcon.Warning); + return; + } + BindStatisc(); + } + #region 绑定GridView + /// + /// 绑定 + /// + /// + public void BindStatisc() + { + DateTime months = Convert.ToDateTime(this.txtMonths.Text + "-01"); + StatisticsList = new List(); + int i = 1; + Model.SGGLDB db = Funs.DB; + //所有集合 + var totalList = from x in db.JDGL_MonthPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months select x; + if (this.ckType.SelectedValue == "1") //按责任单位 + { + var pUnit = from x in db.Project_ProjectUnit + join y in db.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2 + orderby y.UnitCode + select y; + foreach (var item in pUnit) + { + //当期集合 + var list = totalList.Where(x => x.UnitId == item.UnitId); + Model.JDGL_MonthPlan JDGL_MonthPlan = new Model.JDGL_MonthPlan(); + JDGL_MonthPlan.NodeContent = item.UnitName; + int a = list.Count(); + int b = list.Count(x => x.RealDate.HasValue); + JDGL_MonthPlan.UnitId = a.ToString(); + JDGL_MonthPlan.DutyPerson = b.ToString(); + if (a != 0)//被除数不能为零 + { + JDGL_MonthPlan.Remark = Math.Round((double)b / (double)a * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + JDGL_MonthPlan.Remark = "0%"; + } + StatisticsList.Add(JDGL_MonthPlan); + i++; + } + } + else //按五环责任人 + { + var user = (from x in db.Sys_User + join y in db.JDGL_MonthPlan on x.UserId equals y.DutyPerson + where y.ProjectId == this.CurrUser.LoginProjectId + orderby x.UserId + select x).Distinct().ToList(); + foreach (var item in user) + { + //所有集合 + var list = totalList.Where(x => x.DutyPerson == item.UserId); + Model.JDGL_MonthPlan JDGL_MonthPlan = new Model.JDGL_MonthPlan(); + JDGL_MonthPlan.NodeContent = item.UserName; + int a = list.Count(); + int b = list.Count(x => x.RealDate.HasValue); + JDGL_MonthPlan.UnitId = a.ToString(); + JDGL_MonthPlan.DutyPerson = b.ToString(); + if (a != 0)//被除数不能为零 + { + JDGL_MonthPlan.Remark = Math.Round((double)b / (double)a * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + JDGL_MonthPlan.Remark = "0%"; + } + StatisticsList.Add(JDGL_MonthPlan); + i++; + } + } + if (StatisticsList.Count() > 0) //增加总计 + { + Model.JDGL_MonthPlan StatisticsLast = new Model.JDGL_MonthPlan(); + StatisticsLast.NodeContent = "合计"; + int a = totalList.Count(); + int b = totalList.Count(x => x.RealDate.HasValue); + StatisticsLast.UnitId = a.ToString(); + StatisticsLast.DutyPerson = b.ToString(); + if (a != 0)//被除数不能为零 + { + StatisticsLast.Remark = Math.Round((double)b / (double)a * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + StatisticsLast.Remark = "0%"; + } + StatisticsList.Add(StatisticsLast); + } + this.Grid1.DataSource = StatisticsList; + this.Grid1.DataBind(); + } + #endregion + protected void ckType_SelectedIndexChanged(object sender, EventArgs e) + { + if (this.ckType.SelectedValue == "1") + { + this.Grid1.Columns[1].HeaderText = "责任单位"; + } + else + { + this.Grid1.Columns[1].HeaderText = "五环责任人"; + } + BindStatisc(); + } + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + BindStatisc(); + } + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + //string rootPath = Server.MapPath("~/"); + //string initTemplatePath = Const.JDGL_MonthPlanTemlUrl; + //string uploadfilepath = string.Empty; + //string newUrl = string.Empty; + //uploadfilepath = rootPath + initTemplatePath; + + //if (StatisticsList != null) + //{ + // string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); + // newUrl = uploadfilepath.Replace("NCR统计模板", "NCR统计（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）"); + // File.Copy(uploadfilepath, newUrl); + // // 第一步：读取文件流 + // NPOI.SS.UserModel.IWorkbook workbook; + // using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) + // { + // //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream); + // workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream); + // } + // // 创建单元格样式 + // NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle(); + // cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin; + // cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin; + // cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin; + // cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin; + // cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center; + // cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center; + // cellStyle.WrapText = true;//自动换行 + // var font = workbook.CreateFont(); + // font.FontHeightInPoints = 11; + // cellStyle.SetFont(font); + // // 第二步：创建新数据行 + // NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0); + // NPOI.SS.UserModel.IRow row = sheet.GetRow(0); + // NPOI.SS.UserModel.ICell cell; + // int i = 2; + // foreach (var item in StatisticsList) + // { + // // 第二步：创建新数据行 + // row = sheet.CreateRow(i); + // // 添加数据 + // cell = row.CreateCell(0); + // cell.CellStyle = cellStyle; + // cell.SetCellValue(item.WorkName);//工作名称 + + // cell = row.CreateCell(1); + // cell.CellStyle = cellStyle; + // cell.SetCellValue(item.CheckNum); + + // cell = row.CreateCell(2); + // cell.CellStyle = cellStyle; + // cell.SetCellValue(item.OKNum); + + // cell = row.CreateCell(3); + // cell.CellStyle = cellStyle; + // cell.SetCellValue(item.NotOKNum); + + // cell = row.CreateCell(4); + // cell.CellStyle = cellStyle; + // cell.SetCellValue(item.OKRate); + + // cell = row.CreateCell(5); + // cell.CellStyle = cellStyle; + // cell.SetCellValue(item.Remark); + // i++; + // } + // // 第三步：写入文件流 + // using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write)) + // { + // workbook.Write(stream); + // workbook.Close(); + // } + // string fileName = Path.GetFileName(newUrl); + // FileInfo info = new FileInfo(newUrl); + // long fileSize = info.Length; + // Response.Clear(); + // Response.ContentType = "application/x-zip-compressed"; + // Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + // Response.AddHeader("Content-Length", fileSize.ToString()); + // Response.TransmitFile(newUrl, 0, fileSize); + // Response.Flush(); + // Response.Close(); + // File.Delete(newUrl); + //} + //else + //{ + // Alert.ShowInTop("当前无记录，无法导出！", MessageBoxIcon.Warning); + //} + } + + /// + /// 导出方法 + /// + /// + /// + //private string GetGridTableHtml(Grid grid) + //{ + // StringBuilder sb = new StringBuilder(); + // sb.Append(""); + // sb.Append(""); + // sb.Append(""); + // grid.PageSize = 10000; + // BindStatisc(); + // foreach (GridColumn column in grid.Columns) + // { + // sb.AppendFormat("", column.HeaderText); + // } + // sb.Append(""); + // foreach (GridRow row in grid.Rows) + // { + // sb.Append(""); + // foreach (GridColumn column in grid.Columns) + // { + // string html = row.Values[column.ColumnIndex].ToString(); + // if (column.ColumnID == "tfNumber") + // { + // html = (row.FindControl("labNumber") as AspNet.Label).Text; + // } + // sb.AppendFormat("", html); + // } + + // sb.Append(""); + // } + + // sb.Append("
{0}
{0}
"); + + // return sb.ToString(); + //} + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.designer.cs new file mode 100644 index 00000000..92ad596d --- /dev/null +++ b/SGGL/FineUIPro.Web/JDGL/Check/MonthPlanStatisc.aspx.designer.cs @@ -0,0 +1,132 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JDGL.Check { + + + public partial class MonthPlanStatisc { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtMonths 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtMonths; + + /// + /// ckType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList ckType; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs index 95013fdc..2aed0b93 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs @@ -19,7 +19,7 @@ namespace FineUIPro.Web.JDGL.Check { GetButtonPower(); btnNew.OnClientClick = Window1.GetShowReference("QuantityCompletionEdit.aspx") + "return false;"; - this.txtMonths.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.txtMonths.Text = string.Format("{0:yyyy-MM}", DateTime.Now); BindGrid(); } } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx index c37ac7fd..dc35fa11 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionEdit.aspx @@ -95,61 +95,6 @@ - <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --%> diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx index 0b91d671..a733a780 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletionIn.aspx @@ -15,7 +15,7 @@ - diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 7c94e245..f50b26d3 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index e83a527e..2fac288a 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -10,6 +10,7 @@ + diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml index 2854ffd9..a9d07855 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml @@ -6,4 +6,7 @@ + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index b1a26ee1..68f5e44c 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -46,12 +46,12 @@ - - - + + + + - @@ -69,9 +69,11 @@ + + @@ -119,7 +121,8 @@ - + + diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 91d9fd84..4d3b9e97 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -1,3 +1,21 @@  + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index ed44c8fe..69859890 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -83,4 +83,8 @@ + + + + \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 31e60f74..3cc446d4 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -212319,6 +212319,8 @@ namespace Model private System.Nullable _CompileDate; + private System.Nullable _SortIndex; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -212353,6 +212355,8 @@ namespace Model partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); partial void OnCompileDateChanged(); + partial void OnSortIndexChanging(System.Nullable value); + partial void OnSortIndexChanged(); #endregion public JDGL_MonthPlan() @@ -212600,6 +212604,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] + public System.Nullable SortIndex + { + get + { + return this._SortIndex; + } + set + { + if ((this._SortIndex != value)) + { + this.OnSortIndexChanging(value); + this.SendPropertyChanging(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JDGL_MonthPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From c57b03d6654a7e46a617fd8967c7855106cf4e6d Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 27 May 2024 16:39:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2024-05-09-gaofei.sql | 338 +++++++++++++++++- SGGL/FineUIPro.Web/Web.config | 2 +- 2 files changed, 338 insertions(+), 2 deletions(-) diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-09-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-09-gaofei.sql index 9b651638..99a52678 100644 --- a/DataBase/版本日志/SGGLDB_WH_2024-05-09-gaofei.sql +++ b/DataBase/版本日志/SGGLDB_WH_2024-05-09-gaofei.sql @@ -1,2 +1,338 @@ alter table [dbo].[JDGL_MonthPlan] add SortIndex int null -GO \ No newline at end of file +GO + + +--ȡǰ˴ +ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems] + @projectId NVARCHAR(50)=NULL, + @userId NVARCHAR(200)=NULL +AS +/*ȡǰ˴*/ +BEGIN +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲ' AS MenuName + ,register.RegisterDef AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'../HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) +) +UNION ALL + +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲȷ' AS MenuName + ,register.RegisterDef AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'../HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +register.states = '2' AND register.CheckManId =@userId + +UNION ALL +SELECT CheckControlCode AS DataId + ,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId + ,'Ѳ' AS MenuName + ,checkControl.QuestionDef AS Content + ,UserId + ,users.UserName + ,checkControl.CheckDate AS DataTime + ,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr + ,'../CQMS/Check/ChecklistEdit.aspx?ToDo=ToDo&CheckControlCode='+checkControl.CheckControlCode AS PCUrl +FROM Check_CheckControl AS checkControl +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE checkControl.ProjectId=@projectId AND +checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) + +UNION ALL +SELECT GJSXID AS DataId + ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId + ,'ؼ' AS MenuName + ,GJSX.Detail AS Content + ,users.UserId + ,users.UserName + ,GJSX.CreateDate AS DataTime + ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr + ,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl +FROM GJSX +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE GJSX.ProjectId=@projectId AND +GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0 +and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0) +or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID)) +) + +UNION ALL +SELECT InspectionEquipmentId AS DataId + ,'6c2c1e5e-1812-4e1c-a683-7125518e28c7' AS MenuId + ,'豸ϱȷ' AS MenuName + ,Equipment.InspectionName AS Content + ,UserId + ,users.UserName + ,Equipment.InspectionDate AS DataTime + ,CONVERT(varchar(100),Equipment.InspectionDate, 23) AS DataTimeStr + ,'../CQMS/Comprehensive/InspectionEquipmentEdit.aspx?ToDo=ToDo&InspectionEquipmentId='+Equipment.InspectionEquipmentId AS PCUrl +FROM Comprehensive_InspectionEquipment AS Equipment +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Equipment.ProjectId=@projectId and +Equipment.Status!='3' AND Equipment.InspectionEquipmentId in (select InspectionEquipmentId from Comprehensive_InspectionEquipmentApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +UNION ALL +SELECT InspectionPersonId AS DataId + ,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId + ,'Աȷ' AS MenuName + ,Person.PersonName AS Content + ,UserId + ,users.UserName + ,Person.CompileDate AS DataTime + ,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr + ,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl +FROM Comprehensive_InspectionPerson AS Person +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Person.ProjectId=@projectId and +Person.Status!='3' AND Person.InspectionPersonId in (select InspectionPersonId from Comprehensive_InspectionPersonApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +UNION ALL +SELECT InspectionMachineId AS DataId + ,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId + ,'߱ȷ' AS MenuName + ,Machine.InspectionMachineName AS Content + ,UserId + ,users.UserName + ,Machine.CompileDate AS DataTime + ,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr + ,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl +FROM Comprehensive_InspectionMachine AS Machine +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Machine.ProjectId=@projectId and +Machine.Status!='3' AND Machine.InspectionMachineId in (select InspectionMachineId from Comprehensive_InspectionMachineApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null ) +UNION ALL +SELECT ConstructSolutionId AS DataId + ,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId + ,'ʩ' AS MenuName + ,Solution.SolutionName AS Content + ,UserId + ,users.UserName + ,Solution.CompileDate AS DataTime + ,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr + ,'../CQMS/Solution/EditConstructSolution.aspx?ToDo=ToDo&ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl +FROM Solution_CQMSConstructSolution AS Solution +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Solution.ProjectId=@projectId and +Solution.State!='3' +AND Solution.ConstructSolutionId in +(select top 1 ConstructSolutionId from ( +SELECT Solution_CQMSConstructSolutionApprove.* +FROM Solution_CQMSConstructSolutionApprove, +(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and ApproveDate is null GROUP BY ConstructSolutionId )b +WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId + ) approve +where approve.ApproveMan=@userId ) + +UNION ALL +SELECT InspectionId AS DataId + ,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId + ,'֪ͨ' AS MenuName + ,InspectionManagement.AcceptanceSite AS Content + ,UserId + ,users.UserName + ,InspectionManagement.CompileDate AS DataTime + ,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr + ,'../CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl +FROM ProcessControl_InspectionManagement AS InspectionManagement +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE InspectionManagement.ProjectId=@projectId and +dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%' +UNION ALL +SELECT CheckSpecialId AS DataId + ,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId + ,'ר' AS MenuName + ,CheckItemSet.CheckItemName AS Content + ,UserId + ,users.UserName + ,CheckSpecial.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr + ,'../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl +FROM Check_CheckSpecial AS CheckSpecial +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId +WHERE CheckSpecial.ProjectId=@projectId and +dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%' +UNION ALL +SELECT CheckColligationId AS DataId + ,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId + ,'ۺϼ' AS MenuName + ,case CheckType when '0' then 'ܼ' when '1' then '¼' else '' end AS Content + ,users.UserId + ,users.UserName + ,CheckColligation.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr + ,'../HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl +FROM Check_CheckColligation AS CheckColligation +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId +LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId +WHERE CheckColligation.ProjectId=@projectId and FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId +UNION ALL +SELECT PatrolPlanId AS DataId + ,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId + ,'Ѳ' AS MenuName + ,HazardListItem.HazardItems AS Content + ,UserId + ,users.UserName + ,PatrolPlan.LimitCheckDate AS DataTime + ,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr + ,'../HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl +FROM Hazard_PatrolPlan AS PatrolPlan +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId +WHERE HazardListItem.ProjectId=@projectId and +dateadd(day,-3,PatrolPlan.LimitCheckDate)=22 and (select COUNT(*) from JDGL_QuantityCompletion WHERE ProjectId=@projectId and DATENAME(year,GETDATE())=DATENAME(year,EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0) +or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))=22 and +DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate) + + +ORDER BY DataTime DESC +END + + + + + + + + + + + + + + +GO + + diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 9fc55c34..f50b26d3 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - +