From 4618b4947e33a9d7ebbdc3835e6e2f0d623181e4 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 9 Apr 2025 19:08:37 +0800 Subject: [PATCH 1/4] =?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 --- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 556827c1..285eec39 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true From ad2db6e6f51847639f73a59dc93023f8b11fc226 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 10 Apr 2025 19:04:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=BA=A7=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E7=9C=8B=E6=9D=BF=E6=98=8E=E7=BB=86=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=8F=8C=E5=87=BB=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/DataShow/JD.aspx | 8 +- SGGL/FineUIPro.Web/DataShow/JD.aspx.cs | 67 +++++++++ .../DataShow/JD.aspx.designer.cs | 87 ++++++----- .../FineUIPro.Web/DataShow/JDMonthDetail.aspx | 88 ++++++++++++ .../DataShow/JDMonthDetail.aspx.cs | 135 ++++++++++++++++++ .../DataShow/JDMonthDetail.aspx.designer.cs | 62 ++++++++ SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx | 90 ++++++++++++ .../DataShow/JDWeekDetail.aspx.cs | 130 +++++++++++++++++ .../DataShow/JDWeekDetail.aspx.designer.cs | 62 ++++++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 16 +++ 10 files changed, 705 insertions(+), 40 deletions(-) create mode 100644 SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx create mode 100644 SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx create mode 100644 SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.designer.cs diff --git a/SGGL/FineUIPro.Web/DataShow/JD.aspx b/SGGL/FineUIPro.Web/DataShow/JD.aspx index 0d89ccf9..6b94fdbe 100644 --- a/SGGL/FineUIPro.Web/DataShow/JD.aspx +++ b/SGGL/FineUIPro.Web/DataShow/JD.aspx @@ -86,7 +86,7 @@ @@ -160,7 +160,7 @@ @@ -237,6 +237,10 @@ + + + diff --git a/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.cs b/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.cs new file mode 100644 index 00000000..dac682af --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.cs @@ -0,0 +1,135 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.DataShow +{ + public partial class JDMonthDetail : PageBase + { + #region 项目主键 + /// + /// 项目主键 + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + public string Month + { + get + { + return (string)ViewState["Month"]; + } + set + { + ViewState["Month"] = value; + } + } + #endregion + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + if (!string.IsNullOrEmpty(Request.Params["month"])) + { + this.Month = Request.Params["month"]; + } + else + { + //统计月份信息 + DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01"); + if (DateTime.Now.Day < 26) + { + months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01"); + } + this.Month = months.ToString("yyyy-MM-dd"); + } + BindGrid(); + } + } + + + /// + /// 加载Grid + /// + private void BindGrid() + { + DataTable tb = BindData(); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 加载数据 + /// + /// + private DataTable BindData() + { + string strSql = @"select mp.*,u.UnitName +,DutyPersonName = STUFF((SELECT ',' + p.UserName FROM dbo.Sys_User as p where PATINDEX('%,' + RTRIM(p.UserId) + ',%', ',' + mp.DutyPerson + ',') > 0 FOR XML PATH('')), 1, 1,'') +from [dbo].[JDGL_MonthPlan] mp +left join Base_Unit u on u.UnitId=mp.UnitId +where mp.ProjectId=@ProjectId and mp.Months=@month order by mp.SortIndex"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.ProjectId)); + listStr.Add(new SqlParameter("@month", this.Month)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + return tb; + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox2_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.designer.cs new file mode 100644 index 00000000..c7400f32 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DataShow +{ + + + public partial class JDMonthDetail + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + } +} diff --git a/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx b/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx new file mode 100644 index 00000000..102c3252 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx @@ -0,0 +1,90 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JDWeekDetail.aspx.cs" Inherits="FineUIPro.Web.DataShow.JDWeekDetail" %> + + + + + + 进度情况 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.cs b/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.cs new file mode 100644 index 00000000..5603dcd6 --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.cs @@ -0,0 +1,130 @@ +using BLL; +using NPOI.SS.Formula.Functions; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.DataShow +{ + public partial class JDWeekDetail : PageBase + { + #region 项目主键 + /// + /// 项目主键 + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + public string WeekNo + { + get + { + return (string)ViewState["WeekNo"]; + } + set + { + ViewState["WeekNo"] = value; + } + } + #endregion + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + + Model.SGGLDB db = Funs.DB; + var lastWeek = (from x in db.JDGL_WeekPlan where x.ProjectId == this.ProjectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate select x).FirstOrDefault(); + + this.WeekNo = lastWeek.WeekNo; + + BindGrid(); + } + } + + + /// + /// 加载Grid + /// + private void BindGrid() + { + DataTable tb = BindData(); + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 加载数据 + /// + /// + private DataTable BindData() + { + string strSql = @"select mp.*,u.UnitName,uw.UnitWorkName,cn.ProfessionalName,case mp.IsOK when 1 then '已完成' when 0 then '未完成' else '' end as IsOKStr +,DutyPersonName = STUFF((SELECT ',' + p.UserName FROM dbo.Sys_User as p where PATINDEX('%,' + RTRIM(p.UserId) + ',%', ',' + mp.DutyPerson + ',') > 0 FOR XML PATH('')), 1, 1,'') +from [dbo].[JDGL_WeekPlan] mp +left join Base_Unit u on u.UnitId=mp.UnitId +left join WBS_UnitWork uw on uw.UnitWorkId=mp.UnitWork +left join Base_CNProfessional cn on cn.CNProfessionalId=mp.Major +where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.ProjectId)); + listStr.Add(new SqlParameter("@WeekNo", this.WeekNo)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + return tb; + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox2_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + #endregion + + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.designer.cs new file mode 100644 index 00000000..4c59a6fa --- /dev/null +++ b/SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DataShow +{ + + + public partial class JDWeekDetail + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index f898226a..6ac1f9ec 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -706,6 +706,8 @@ + + @@ -9352,6 +9354,20 @@ InspectionManagementItem.aspx + + JDWeekDetail.aspx + ASPXCodeBehind + + + JDWeekDetail.aspx + + + JDMonthDetail.aspx + ASPXCodeBehind + + + JDMonthDetail.aspx + JD.aspx ASPXCodeBehind From b79df170834aaf31c794533b3016cb905891d041 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 10 Apr 2025 19:37:38 +0800 Subject: [PATCH 3/4] 1 --- SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx | 4 ++-- SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx b/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx index 9fb65541..b8fcff67 100644 --- a/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx +++ b/SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx @@ -24,10 +24,10 @@ - + From 347b2de45e6aea98f5a5944f470e5d8b2404421a Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 11 Apr 2025 15:56:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A8=A1=E5=9D=97=E5=90=8D=E7=A7=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...（角色授权菜单模块名称调整）.sql | 15 +++++++++++++++ SGGL/WebAPI/WebAPI.csproj.user | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2025-04-xiaj（角色授权菜单模块名称调整）.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2025-04-xiaj（角色授权菜单模块名称调整）.sql b/DataBase/版本日志/SGGLDB_WH_2025-04-xiaj（角色授权菜单模块名称调整）.sql new file mode 100644 index 00000000..6a8b0ee9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2025-04-xiaj（角色授权菜单模块名称调整）.sql @@ -0,0 +1,15 @@ +update Sys_Const +set ConstText='ؼЭͨ' +where GroupId='MenuType_P' and ConstText='ؼ' +go +update Sys_Const +set ConstText='Գƽ' +where GroupId='MenuType_P' and ConstText='Գ' +go +update Sys_Const +set ConstText='ʩ' +where GroupId='MenuType_P' and ConstText='ȹ' +go +delete Sys_Const +where GroupId='MenuType_P' and ConstText in('ƽ','Ϲ','Э빵ͨ') +go diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 285eec39..556827c1 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true