From 3a3a9a66f51981ef8133244096eb91d4f0d0960a Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 2 Sep 2024 16:26:13 +0800 Subject: [PATCH 1/3] =?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 --- DataBase/版本日志/SGGLDB_V2024-09-02.sql | 40 ++++ .../0-5综合管理（Menu_ZHGL）.sql | 3 + .../1-2质量管理（Menu_CQMS）.sql | 13 ++ SGGL/BLL/BLL.csproj | 1 + .../CQMS_TechnicalProposalReviewService.cs | 68 ++++++ SGGL/BLL/Common/Const.cs | 5 + .../BLL/HJGL/WeldingManage/PipelineService.cs | 64 +++--- .../CQMS/Plan/TechnicalProposalReview.aspx | 115 ++++++++++ .../CQMS/Plan/TechnicalProposalReview.aspx.cs | 206 ++++++++++++++++++ .../TechnicalProposalReview.aspx.designer.cs | 159 ++++++++++++++ .../Plan/TechnicalProposalReviewEdit.aspx | 95 ++++++++ .../Plan/TechnicalProposalReviewEdit.aspx.cs | 122 +++++++++++ ...chnicalProposalReviewEdit.aspx.designer.cs | 177 +++++++++++++++ .../Plan/TechnicalProposalReviewView.aspx | 93 ++++++++ .../Plan/TechnicalProposalReviewView.aspx.cs | 77 +++++++ ...chnicalProposalReviewView.aspx.designer.cs | 168 ++++++++++++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 40 ++++ .../ZHGL/Plan/TechnicalProposalReview.aspx | 109 +++++++++ .../ZHGL/Plan/TechnicalProposalReview.aspx.cs | 183 ++++++++++++++++ .../TechnicalProposalReview.aspx.designer.cs | 141 ++++++++++++ .../Plan/TechnicalProposalReviewView.aspx | 94 ++++++++ .../Plan/TechnicalProposalReviewView.aspx.cs | 75 +++++++ ...chnicalProposalReviewView.aspx.designer.cs | 168 ++++++++++++++ SGGL/Model/Model.cs | 193 ++++++++++++++++ 24 files changed, 2378 insertions(+), 31 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2024-09-02.sql create mode 100644 SGGL/BLL/CQMS/Plan/CQMS_TechnicalProposalReviewService.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx create mode 100644 SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx.cs create mode 100644 SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx create mode 100644 SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx.cs create mode 100644 SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_V2024-09-02.sql b/DataBase/版本日志/SGGLDB_V2024-09-02.sql new file mode 100644 index 00000000..c4fbe180 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2024-09-02.sql @@ -0,0 +1,40 @@ + +CREATE TABLE [dbo].[Plan_TechnicalProposalReview]( + [TechnicalProposalReviewId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [Code] [nvarchar](100) NULL, + [Name] [nvarchar](200) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_Plan_TechnicalProposalReview] PRIMARY KEY CLUSTERED +( + [TechnicalProposalReviewId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_TechnicalProposalReview', @level2type=N'COLUMN',@level2name=N'TechnicalProposalReviewId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_TechnicalProposalReview' +GO + + + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','Ŀ','CQMS/Plan/TechnicalProposalReview.aspx',30,'34A3DBD0-1472-4D99-B2A4-21F0AF3227BD','Menu_CQMS',0,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('88F31A70-0B22-42CC-A934-7F7A91616EC3','D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('B351E87A-0A02-4F89-9E07-C741A1981C41','D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('FF7757F6-CAB3-4796-AAF4-4240B38321C7','D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('E41C1F6D-8206-4248-953F-5FBD1FAD41BC','D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','',4) +GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('0E6C41F0-3231-4030-BCBC-0872E7C41383','Ŀ','ZHGL/Plan/TechnicalProposalReview.aspx',60,'76E236DA-DDFC-4CE8-8CB8-02F8A27A8535','Menu_ZHGL',1,1,1) + GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/0-5综合管理（Menu_ZHGL）.sql b/DataBase/菜单初始化脚本/0-5综合管理（Menu_ZHGL）.sql index 2bfe0c1a..1ebf6792 100644 --- a/DataBase/菜单初始化脚本/0-5综合管理（Menu_ZHGL）.sql +++ b/DataBase/菜单初始化脚本/0-5综合管理（Menu_ZHGL）.sql @@ -247,6 +247,9 @@ GO VALUES('6E09E93F-ECB8-444F-ADD5-D11E64BE1300','D36E568B-54A3-4E86-919E-407C605B7BFC','保存',4) GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('0E6C41F0-3231-4030-BCBC-0872E7C41383','项目技术方案评审','ZHGL/Plan/TechnicalProposalReview.aspx',60,'76E236DA-DDFC-4CE8-8CB8-02F8A27A8535','Menu_ZHGL',1,1,1) + GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('ABB667AF-2C50-40A6-9FC9-FC34A96582E3','文件柜','',40,'0','Menu_ZHGL',0,1,1) diff --git a/DataBase/菜单初始化脚本/1-2质量管理（Menu_CQMS）.sql b/DataBase/菜单初始化脚本/1-2质量管理（Menu_CQMS）.sql index b65a32a6..b8af0b31 100644 --- a/DataBase/菜单初始化脚本/1-2质量管理（Menu_CQMS）.sql +++ b/DataBase/菜单初始化脚本/1-2质量管理（Menu_CQMS）.sql @@ -71,6 +71,19 @@ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('17C413D8-0A84-4E6B-A222-A47750A62DA1','68DA6E87-1016-4225-AA80-117E788EEE9B','保存',4) GO +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','项目技术方案评审','CQMS/Plan/TechnicalProposalReview.aspx',30,'34A3DBD0-1472-4D99-B2A4-21F0AF3227BD','Menu_CQMS',0,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('88F31A70-0B22-42CC-A934-7F7A91616EC3','D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','增加',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('B351E87A-0A02-4F89-9E07-C741A1981C41','D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','修改',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('FF7757F6-CAB3-4796-AAF4-4240B38321C7','D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','删除',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('E41C1F6D-8206-4248-953F-5FBD1FAD41BC','D438ADBD-5A1C-44F5-A6D7-E4270469DE0F','保存',4) +GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('7E19D4B2-190A-4707-A72B-1161F2BB3261','人员管理','',30,'0','Menu_CQMS',0,0,1) GO diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index da781075..c3a2baf8 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -320,6 +320,7 @@ + diff --git a/SGGL/BLL/CQMS/Plan/CQMS_TechnicalProposalReviewService.cs b/SGGL/BLL/CQMS/Plan/CQMS_TechnicalProposalReviewService.cs new file mode 100644 index 00000000..3388deb7 --- /dev/null +++ b/SGGL/BLL/CQMS/Plan/CQMS_TechnicalProposalReviewService.cs @@ -0,0 +1,68 @@ +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; + +namespace BLL +{ + public class CQMS_TechnicalProposalReviewService + { + /// + /// 获取项目技术方案评审信息 + /// + /// + /// + public static Model.Plan_TechnicalProposalReview GetTechnicalProposalReviewByTechnicalProposalReviewId(string TechnicalProposalReviewId) + { + return Funs.DB.Plan_TechnicalProposalReview.FirstOrDefault(e => e.TechnicalProposalReviewId == TechnicalProposalReviewId); + } + /// + /// 添加项目技术方案评审信息 + /// + /// + public static void AddTechnicalProposalReview(Model.Plan_TechnicalProposalReview TechnicalProposalReview) + { + Model.SGGLDB db = Funs.DB; + Model.Plan_TechnicalProposalReview newTechnicalProposalReview = new Model.Plan_TechnicalProposalReview(); + newTechnicalProposalReview.TechnicalProposalReviewId = TechnicalProposalReview.TechnicalProposalReviewId; + newTechnicalProposalReview.ProjectId = TechnicalProposalReview.ProjectId; + newTechnicalProposalReview.Code = TechnicalProposalReview.Code; + newTechnicalProposalReview.Name = TechnicalProposalReview.Name; + newTechnicalProposalReview.CompileMan = TechnicalProposalReview.CompileMan; + newTechnicalProposalReview.CompileDate = TechnicalProposalReview.CompileDate; + db.Plan_TechnicalProposalReview.InsertOnSubmit(newTechnicalProposalReview); + db.SubmitChanges(); + } + + /// + /// 修改项目技术方案评审信息 + /// + /// + public static void UpdateTechnicalProposalReview(Model.Plan_TechnicalProposalReview TechnicalProposalReview) + { + Model.SGGLDB db = Funs.DB; + Model.Plan_TechnicalProposalReview newTechnicalProposalReview = db.Plan_TechnicalProposalReview.FirstOrDefault(e => e.TechnicalProposalReviewId == TechnicalProposalReview.TechnicalProposalReviewId); + if (newTechnicalProposalReview != null) + { + newTechnicalProposalReview.Code = TechnicalProposalReview.Code; + newTechnicalProposalReview.Name = TechnicalProposalReview.Name; + newTechnicalProposalReview.CompileMan = TechnicalProposalReview.CompileMan; + newTechnicalProposalReview.CompileDate = TechnicalProposalReview.CompileDate; + db.SubmitChanges(); + } + } + /// + /// 根据主键删除项目技术方案评审信息 + /// + /// + public static void DeleteTechnicalProposalReviewById(string TechnicalProposalReviewId) + { + Model.SGGLDB db = Funs.DB; + Model.Plan_TechnicalProposalReview TechnicalProposalReview = db.Plan_TechnicalProposalReview.FirstOrDefault(e => e.TechnicalProposalReviewId == TechnicalProposalReviewId); + if (TechnicalProposalReview != null) + { + db.Plan_TechnicalProposalReview.DeleteOnSubmit(TechnicalProposalReview); + db.SubmitChanges(); + } + } + } +} diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 05bfc034..e4398241 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3818,6 +3818,11 @@ namespace BLL /// 分包施工质量计划 /// public const string SubPlanMenuId = "68DA6E87-1016-4225-AA80-117E788EEE9B"; + + /// + /// 项目技术方案评审 + /// + public const string TechnicalProposalReviewMenuId = "D438ADBD-5A1C-44F5-A6D7-E4270469DE0F"; #endregion #region 材料设备验收管理 diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs index b066eee5..d9b24d48 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs @@ -567,37 +567,39 @@ namespace BLL /// public static void AddPipeline(Model.HJGL_Pipeline pipeline) { - Model.SGGLDB db = Funs.DB; - Model.HJGL_Pipeline newPipeline = new Model.HJGL_Pipeline(); - newPipeline.PipelineId = pipeline.PipelineId; - newPipeline.ProjectId = pipeline.ProjectId; - //newPipeline.InstallationId = pipeline.InstallationId; - newPipeline.UnitId = pipeline.UnitId; - newPipeline.UnitWorkId = pipeline.UnitWorkId; - newPipeline.PipelineCode = pipeline.PipelineCode; - newPipeline.SingleName = pipeline.SingleName; - newPipeline.SingleNumber = pipeline.SingleNumber; - newPipeline.PipingClassId = pipeline.PipingClassId; - newPipeline.MediumId = pipeline.MediumId; - newPipeline.DetectionRateId = pipeline.DetectionRateId; - newPipeline.DetectionType = pipeline.DetectionType; - newPipeline.DesignPress = pipeline.DesignPress; - newPipeline.DesignTemperature = pipeline.DesignTemperature; - newPipeline.TestPressure = pipeline.TestPressure; - newPipeline.TestMedium = pipeline.TestMedium; - newPipeline.PipeLenth = pipeline.PipeLenth; - newPipeline.PressurePipingClassId = pipeline.PressurePipingClassId; - newPipeline.Remark = pipeline.Remark; - newPipeline.LeakPressure = pipeline.LeakPressure; - newPipeline.LeakMedium = pipeline.LeakMedium; - newPipeline.VacuumPressure = pipeline.VacuumPressure; - newPipeline.PCMedium = pipeline.PCMedium; - newPipeline.PCtype = pipeline.PCtype; - newPipeline.MaterialId = pipeline.MaterialId; - newPipeline.State = pipeline.State; - newPipeline.FlowingSection = pipeline.FlowingSection; - db.HJGL_Pipeline.InsertOnSubmit(newPipeline); - db.SubmitChanges(); + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HJGL_Pipeline newPipeline = new Model.HJGL_Pipeline(); + newPipeline.PipelineId = pipeline.PipelineId; + newPipeline.ProjectId = pipeline.ProjectId; + //newPipeline.InstallationId = pipeline.InstallationId; + newPipeline.UnitId = pipeline.UnitId; + newPipeline.UnitWorkId = pipeline.UnitWorkId; + newPipeline.PipelineCode = pipeline.PipelineCode; + newPipeline.SingleName = pipeline.SingleName; + newPipeline.SingleNumber = pipeline.SingleNumber; + newPipeline.PipingClassId = pipeline.PipingClassId; + newPipeline.MediumId = pipeline.MediumId; + newPipeline.DetectionRateId = pipeline.DetectionRateId; + newPipeline.DetectionType = pipeline.DetectionType; + newPipeline.DesignPress = pipeline.DesignPress; + newPipeline.DesignTemperature = pipeline.DesignTemperature; + newPipeline.TestPressure = pipeline.TestPressure; + newPipeline.TestMedium = pipeline.TestMedium; + newPipeline.PipeLenth = pipeline.PipeLenth; + newPipeline.PressurePipingClassId = pipeline.PressurePipingClassId; + newPipeline.Remark = pipeline.Remark; + newPipeline.LeakPressure = pipeline.LeakPressure; + newPipeline.LeakMedium = pipeline.LeakMedium; + newPipeline.VacuumPressure = pipeline.VacuumPressure; + newPipeline.PCMedium = pipeline.PCMedium; + newPipeline.PCtype = pipeline.PCtype; + newPipeline.MaterialId = pipeline.MaterialId; + newPipeline.State = pipeline.State; + newPipeline.FlowingSection = pipeline.FlowingSection; + db.HJGL_Pipeline.InsertOnSubmit(newPipeline); + db.SubmitChanges(); + } } /// diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx new file mode 100644 index 00000000..a818f5b7 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx @@ -0,0 +1,115 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TechnicalProposalReview.aspx.cs" Inherits="FineUIPro.Web.CQMS.Plan.TechnicalProposalReview" %> + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx.cs new file mode 100644 index 00000000..b1ffc3b2 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx.cs @@ -0,0 +1,206 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.CQMS.Plan +{ + public partial class TechnicalProposalReview : PageBase + { + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + btnNew.OnClientClick = Window1.GetShowReference("TechnicalProposalReviewEdit.aspx") + "return false;"; + GetButtonPower(); + BindGrid(); + } + } + /// + /// 绑定数据 + /// + + public void BindGrid() + { + DataTable tb = ChecklistData(); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + protected DataTable ChecklistData() + { + string strSql = @"select C.*,p.PersonName from [dbo].[Plan_TechnicalProposalReview] C left join Person_Persons p on p.PersonId=C.CompileMan + where 1=1"; + List listStr = new List(); + strSql += " AND C.ProjectId = @ProjectId"; + listStr.Add(new SqlParameter("@ProjectId", this.ProjectId)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + return tb; + } + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + /// + /// 窗体关闭 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + //右键编辑 + protected void btnMenuModify_Click(object sender, EventArgs e) + { + EditData(); + } + //双击编辑 + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + EditData(); + } + //分页 + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + /// + /// 编辑数据方法 + /// + private void EditData() + { + + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TechnicalProposalReviewEdit.aspx?TechnicalProposalReviewId={0}", Grid1.SelectedRowID, "编辑 - "))); + + } + //右键查看 + protected void btnMenuView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TechnicalProposalReviewView.aspx?TechnicalProposalReviewId={0}", Grid1.SelectedRowID, "查看 - "))); + } + //右键删除 + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + ////删除附件表 + BLL.CommonService.DeleteAttachFileById(rowID); + BLL.CQMS_TechnicalProposalReviewService.DeleteTechnicalProposalReviewById(rowID); + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + /// + /// 搜索 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + /// + /// 重置 + /// + /// + /// + protected void btnRset_Click(object sender, EventArgs e) + { + BindGrid(); + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.PersonId, BLL.Const.TechnicalProposalReviewMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuModify.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDel.Hidden = false; + } + } + } + #endregion + + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + object[] keys = Grid1.DataKeys[e.RowIndex]; + string fileId = string.Empty; + if (keys == null) + { + return; + } + else + { + fileId = keys[0].ToString(); + } + if (e.CommandName.Equals("download")) + { + string menuId = Const.TechnicalProposalReviewMenuId; + PageContext.RegisterStartupScript(WindowAtt.GetShowReference( + String.Format("../../AttachFile/webuploader.aspx?type=-1&source=1&toKeyId={0}&path=FileUpload/CQMS/Plan&menuId={1}", fileId, menuId))); + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx.designer.cs new file mode 100644 index 00000000..d5c301ca --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReview.aspx.designer.cs @@ -0,0 +1,159 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.Plan { + + + public partial class TechnicalProposalReview { + + /// + /// 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; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// 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; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuView; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx new file mode 100644 index 00000000..3ca5e6b0 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx @@ -0,0 +1,95 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TechnicalProposalReviewEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Plan.TechnicalProposalReviewEdit" %> + + + + + + 项目技术方案评审 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.cs new file mode 100644 index 00000000..be04714c --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.cs @@ -0,0 +1,122 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Data; +using System.Data.SqlClient; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.CQMS.Plan +{ + public partial class TechnicalProposalReviewEdit : PageBase + { + /// + /// 主键 + /// + public string TechnicalProposalReviewId + { + get + { + return (string)ViewState["TechnicalProposalReviewId"]; + } + set + { + ViewState["TechnicalProposalReviewId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + TechnicalProposalReviewId = Request.Params["TechnicalProposalReviewId"]; + SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(drpCompileMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1, true); + if (!string.IsNullOrEmpty(TechnicalProposalReviewId)) + { + hdId.Text = this.TechnicalProposalReviewId; + Model.Plan_TechnicalProposalReview TechnicalProposalReview = BLL.CQMS_TechnicalProposalReviewService.GetTechnicalProposalReviewByTechnicalProposalReviewId(TechnicalProposalReviewId); + this.txtCode.Text = TechnicalProposalReview.Code; + this.txtName.Text = TechnicalProposalReview.Name; + if (!string.IsNullOrEmpty(TechnicalProposalReview.CompileMan)) + { + this.drpCompileMan.SelectedValue = TechnicalProposalReview.CompileMan; + } + if (TechnicalProposalReview.CompileDate != null) + { + txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", TechnicalProposalReview.CompileDate); + } + } + else + { + this.drpCompileMan.SelectedValue = this.CurrUser.PersonId; + txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + } + } + } + + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + + } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + + protected void imgBtnFile_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(hdId.Text)) + { + hdId.Text = SQLHelper.GetNewID(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=1&toKeyId={0}&path=FileUpload/CQMS/Plan&menuId={1}", hdId.Text, BLL.Const.TechnicalProposalReviewMenuId))); + } + + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.drpCompileMan.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择编制人！", MessageBoxIcon.Warning); + return; + } + Saveinspection("save"); + } + + /// + /// 保存 + /// + public void Saveinspection(string saveType) + { + Model.Plan_TechnicalProposalReview TechnicalProposalReview = new Model.Plan_TechnicalProposalReview(); + TechnicalProposalReview.ProjectId = this.CurrUser.LoginProjectId; + TechnicalProposalReview.Code = this.txtCode.Text.Trim(); + TechnicalProposalReview.Name = this.txtName.Text.Trim(); + TechnicalProposalReview.CompileMan = this.drpCompileMan.SelectedValue; + TechnicalProposalReview.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim()); + if (!string.IsNullOrEmpty(this.TechnicalProposalReviewId)) + { + TechnicalProposalReview.TechnicalProposalReviewId = this.TechnicalProposalReviewId; + CQMS_TechnicalProposalReviewService.UpdateTechnicalProposalReview(TechnicalProposalReview); + BLL.NoticeService.DeleteUserRead(this.TechnicalProposalReviewId); + LogService.AddSys_Log(CurrUser, TechnicalProposalReview.Code, TechnicalProposalReview.TechnicalProposalReviewId, Const.TechnicalProposalReviewMenuId, "修改项目技术方案评审"); + } + else + { + if (string.IsNullOrEmpty(hdId.Text)) + { + TechnicalProposalReview.TechnicalProposalReviewId = SQLHelper.GetNewID(); + TechnicalProposalReviewId = TechnicalProposalReview.TechnicalProposalReviewId; + } + else + { + TechnicalProposalReview.TechnicalProposalReviewId = hdId.Text; + } + CQMS_TechnicalProposalReviewService.AddTechnicalProposalReview(TechnicalProposalReview); + LogService.AddSys_Log(CurrUser, TechnicalProposalReview.Code, TechnicalProposalReview.TechnicalProposalReviewId, Const.TechnicalProposalReviewMenuId, "增加项目技术方案评审"); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.designer.cs new file mode 100644 index 00000000..3d9fcc79 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.designer.cs @@ -0,0 +1,177 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.Plan { + + + public partial class TechnicalProposalReviewEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// drpCompileMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCompileMan; + + /// + /// txtCompileDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtCompileDate; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnFile; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx new file mode 100644 index 00000000..641c1a9c --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx @@ -0,0 +1,93 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TechnicalProposalReviewView.aspx.cs" Inherits="FineUIPro.Web.CQMS.Plan.TechnicalProposalReviewView" %> + + + + + + 项目技术方案评审 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.cs new file mode 100644 index 00000000..476ea58c --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.cs @@ -0,0 +1,77 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Data; +using System.Data.SqlClient; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.CQMS.Plan +{ + public partial class TechnicalProposalReviewView : PageBase + { + /// + /// 主键 + /// + public string TechnicalProposalReviewId + { + get + { + return (string)ViewState["TechnicalProposalReviewId"]; + } + set + { + ViewState["TechnicalProposalReviewId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + TechnicalProposalReviewId = Request.Params["TechnicalProposalReviewId"]; + SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(drpCompileMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1, true); + if (!string.IsNullOrEmpty(TechnicalProposalReviewId)) + { + hdId.Text = this.TechnicalProposalReviewId; + Model.Plan_TechnicalProposalReview TechnicalProposalReview = BLL.CQMS_TechnicalProposalReviewService.GetTechnicalProposalReviewByTechnicalProposalReviewId(TechnicalProposalReviewId); + this.txtCode.Text = TechnicalProposalReview.Code; + this.txtName.Text = TechnicalProposalReview.Name; + if (!string.IsNullOrEmpty(TechnicalProposalReview.CompileMan)) + { + this.drpCompileMan.SelectedValue = TechnicalProposalReview.CompileMan; + } + if (TechnicalProposalReview.CompileDate != null) + { + txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", TechnicalProposalReview.CompileDate); + } + } + else + { + this.drpCompileMan.SelectedValue = this.CurrUser.PersonId; + txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + } + } + } + + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + + } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + + protected void imgBtnFile_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(hdId.Text)) + { + hdId.Text = SQLHelper.GetNewID(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/Plan&menuId={1}", hdId.Text, BLL.Const.TechnicalProposalReviewMenuId))); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.designer.cs new file mode 100644 index 00000000..401e8a53 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.designer.cs @@ -0,0 +1,168 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.Plan { + + + public partial class TechnicalProposalReviewView { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// drpCompileMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCompileMan; + + /// + /// txtCompileDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtCompileDate; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnFile; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 8507c67d..b735179b 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -458,6 +458,9 @@ + + + @@ -3407,6 +3410,8 @@ + + @@ -8898,6 +8903,27 @@ SubPlanView.aspx + + TechnicalProposalReview.aspx + ASPXCodeBehind + + + TechnicalProposalReview.aspx + + + TechnicalProposalReviewEdit.aspx + ASPXCodeBehind + + + TechnicalProposalReviewEdit.aspx + + + TechnicalProposalReviewView.aspx + ASPXCodeBehind + + + TechnicalProposalReviewView.aspx + RewardAndPunish.aspx ASPXCodeBehind @@ -16098,6 +16124,20 @@ ProjectPlanView.aspx + + TechnicalProposalReview.aspx + ASPXCodeBehind + + + TechnicalProposalReview.aspx + + + TechnicalProposalReviewView.aspx + ASPXCodeBehind + + + TechnicalProposalReviewView.aspx + BasicData.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx new file mode 100644 index 00000000..9ee01897 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx @@ -0,0 +1,109 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TechnicalProposalReview.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.TechnicalProposalReview" %> + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx.cs new file mode 100644 index 00000000..2ecf45fa --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx.cs @@ -0,0 +1,183 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.ZHGL.Plan +{ + public partial class TechnicalProposalReview : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ProjectService.InitAllProjectDropDownList(this.drpProject, true); + GetButtonPower(); + BindGrid(); + } + } + /// + /// 绑定数据 + /// + + public void BindGrid() + { + DataTable tb = ChecklistData(); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + protected DataTable ChecklistData() + { + string strSql = @"select C.*,p.PersonName from [dbo].[Plan_TechnicalProposalReview] C left join Person_Persons p on p.PersonId=C.CompileMan + where 1=1"; + List listStr = new List(); + if (this.drpProject.SelectedValue != BLL.Const._Null) + { + strSql += " AND C.ProjectId = @ProjectId"; + listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue)); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + return tb; + } + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + /// + /// 窗体关闭 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + //右键编辑 + protected void btnMenuModify_Click(object sender, EventArgs e) + { + EditData(); + } + //双击编辑 + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuView_Click(null, null); + } + //分页 + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + /// + /// 编辑数据方法 + /// + private void EditData() + { + + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TechnicalProposalReviewEdit.aspx?TechnicalProposalReviewId={0}", Grid1.SelectedRowID, "编辑 - "))); + + } + //右键查看 + protected void btnMenuView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TechnicalProposalReviewView.aspx?TechnicalProposalReviewId={0}", Grid1.SelectedRowID, "查看 - "))); + } + //右键删除 + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + ////删除附件表 + BLL.CommonService.DeleteAttachFileById(rowID); + BLL.CQMS_TechnicalProposalReviewService.DeleteTechnicalProposalReviewById(rowID); + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + /// + /// 搜索 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + /// + /// 重置 + /// + /// + /// + protected void btnRset_Click(object sender, EventArgs e) + { + BindGrid(); + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + } + #endregion + + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + object[] keys = Grid1.DataKeys[e.RowIndex]; + string fileId = string.Empty; + if (keys == null) + { + return; + } + else + { + fileId = keys[0].ToString(); + } + if (e.CommandName.Equals("download")) + { + string menuId = Const.TechnicalProposalReviewMenuId; + PageContext.RegisterStartupScript(WindowAtt.GetShowReference( + String.Format("../../AttachFile/webuploader.aspx?type=-1&source=1&toKeyId={0}&path=FileUpload/CQMS/Plan&menuId={1}", fileId, menuId))); + } + } + + protected void drpProject_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx.designer.cs new file mode 100644 index 00000000..60b6f037 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReview.aspx.designer.cs @@ -0,0 +1,141 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.Plan { + + + public partial class TechnicalProposalReview { + + /// + /// 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; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// 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; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuView; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx new file mode 100644 index 00000000..ba921a10 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx @@ -0,0 +1,94 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TechnicalProposalReviewView.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Plan.TechnicalProposalReviewView" %> + + + + + + 项目技术方案评审 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx.cs new file mode 100644 index 00000000..641df034 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx.cs @@ -0,0 +1,75 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Data; +using System.Data.SqlClient; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.ZHGL.Plan +{ + public partial class TechnicalProposalReviewView : PageBase + { + /// + /// 主键 + /// + public string TechnicalProposalReviewId + { + get + { + return (string)ViewState["TechnicalProposalReviewId"]; + } + set + { + ViewState["TechnicalProposalReviewId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + TechnicalProposalReviewId = Request.Params["TechnicalProposalReviewId"]; + if (!string.IsNullOrEmpty(TechnicalProposalReviewId)) + { + hdId.Text = this.TechnicalProposalReviewId; + Model.Plan_TechnicalProposalReview TechnicalProposalReview = BLL.CQMS_TechnicalProposalReviewService.GetTechnicalProposalReviewByTechnicalProposalReviewId(TechnicalProposalReviewId); + this.txtCode.Text = TechnicalProposalReview.Code; + this.txtName.Text = TechnicalProposalReview.Name; + if (!string.IsNullOrEmpty(TechnicalProposalReview.CompileMan)) + { + this.txtCompileMan.Text = Person_PersonsService.GetPersonsNameById(TechnicalProposalReview.CompileMan); + } + if (TechnicalProposalReview.CompileDate != null) + { + txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", TechnicalProposalReview.CompileDate); + } + } + else + { + txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + } + } + } + + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + + } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + + protected void imgBtnFile_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(hdId.Text)) + { + hdId.Text = SQLHelper.GetNewID(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/Plan&menuId={1}", hdId.Text, BLL.Const.TechnicalProposalReviewMenuId))); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx.designer.cs new file mode 100644 index 00000000..a7f04c62 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/TechnicalProposalReviewView.aspx.designer.cs @@ -0,0 +1,168 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.Plan { + + + public partial class TechnicalProposalReviewView { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// txtCompileMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCompileMan; + + /// + /// txtCompileDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtCompileDate; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnFile; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// hdAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdAttachUrl; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 76401c83..d818ba7a 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1187,6 +1187,9 @@ namespace Model partial void InsertPlan_SubPlanApprove(Plan_SubPlanApprove instance); partial void UpdatePlan_SubPlanApprove(Plan_SubPlanApprove instance); partial void DeletePlan_SubPlanApprove(Plan_SubPlanApprove instance); + partial void InsertPlan_TechnicalProposalReview(Plan_TechnicalProposalReview instance); + partial void UpdatePlan_TechnicalProposalReview(Plan_TechnicalProposalReview instance); + partial void DeletePlan_TechnicalProposalReview(Plan_TechnicalProposalReview instance); partial void InsertProcessControl_InspectionManagement(ProcessControl_InspectionManagement instance); partial void UpdateProcessControl_InspectionManagement(ProcessControl_InspectionManagement instance); partial void DeleteProcessControl_InspectionManagement(ProcessControl_InspectionManagement instance); @@ -4923,6 +4926,14 @@ namespace Model } } + public System.Data.Linq.Table Plan_TechnicalProposalReview + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table ProcessControl_InspectionManagement { get @@ -191687,6 +191698,188 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Plan_TechnicalProposalReview")] + public partial class Plan_TechnicalProposalReview : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _TechnicalProposalReviewId; + + private string _ProjectId; + + private string _Code; + + private string _Name; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnTechnicalProposalReviewIdChanging(string value); + partial void OnTechnicalProposalReviewIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnCodeChanging(string value); + partial void OnCodeChanged(); + partial void OnNameChanging(string value); + partial void OnNameChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public Plan_TechnicalProposalReview() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TechnicalProposalReviewId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TechnicalProposalReviewId + { + get + { + return this._TechnicalProposalReviewId; + } + set + { + if ((this._TechnicalProposalReviewId != value)) + { + this.OnTechnicalProposalReviewIdChanging(value); + this.SendPropertyChanging(); + this._TechnicalProposalReviewId = value; + this.SendPropertyChanged("TechnicalProposalReviewId"); + this.OnTechnicalProposalReviewIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(100)")] + public string Code + { + get + { + return this._Code; + } + set + { + if ((this._Code != value)) + { + this.OnCodeChanging(value); + this.SendPropertyChanging(); + this._Code = value; + this.SendPropertyChanged("Code"); + this.OnCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")] + public string Name + { + get + { + return this._Name; + } + set + { + if ((this._Name != value)) + { + this.OnNameChanging(value); + this.SendPropertyChanging(); + this._Name = value; + this.SendPropertyChanged("Name"); + this.OnNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ProcessControl_InspectionManagement")] public partial class ProcessControl_InspectionManagement : INotifyPropertyChanging, INotifyPropertyChanged { From 9a40154abb7fa7b7f848c2e6d24ac5801a3a34a8 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 4 Sep 2024 09:09:36 +0800 Subject: [PATCH 2/3] =?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 --- .../ArchitectureReportSave.aspx.cs | 482 +++++++++++------- .../Environmental/ChemicalReportSave.aspx.cs | 147 +++++- 2 files changed, 428 insertions(+), 201 deletions(-) diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs index 43fddd64..1db3c6e5 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs @@ -78,7 +78,7 @@ namespace FineUIPro.Web.ZHGL.Environmental if (report != null) { //this.btnCopy.Hidden = true; - //if (this.CurrUser.PersonId == BLL.Const.sysglyId || this.CurrUser.PersonId == BLL.Const.hfnbdId) + //if (this.CurrUser.UserId == BLL.Const.sysglyId || this.CurrUser.UserId == BLL.Const.hfnbdId) //{ // this.btnSave.Hidden = false; //} @@ -103,7 +103,7 @@ namespace FineUIPro.Web.ZHGL.Environmental drpQuarters.SelectedValue = quarters; drpYear.SelectedValue = year; txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - txtDutyPerson.Text = this.CurrUser.PersonName; + txtDutyPerson.Text = this.CurrUser.UserName; //增加明细集合 GetNewItems(year, quarters); this.Grid1.DataSource = items; @@ -131,22 +131,22 @@ namespace FineUIPro.Web.ZHGL.Environmental Grid1.Rows[0].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[14].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[14].CellCssClasses[5] = "f-grid-cell-uneditable"; - //Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[16].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[16].CellCssClasses[5] = "f-grid-cell-uneditable"; //Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable"; //Grid1.Rows[17].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[18].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[18].CellCssClasses[5] = "f-grid-cell-uneditable"; - //Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[20].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[20].CellCssClasses[5] = "f-grid-cell-uneditable"; //Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable"; //Grid1.Rows[21].CellCssClasses[5] = "f-grid-cell-uneditable"; - //Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[22].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[22].CellCssClasses[5] = "f-grid-cell-uneditable"; //Grid1.Rows[24].CellCssClasses[4] = "f-grid-cell-uneditable"; //Grid1.Rows[24].CellCssClasses[5] = "f-grid-cell-uneditable"; - //Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[36].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[36].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[58].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[58].CellCssClasses[5] = "f-grid-cell-uneditable"; } @@ -154,63 +154,63 @@ namespace FineUIPro.Web.ZHGL.Environmental if (lastYearReport.Count > 0) { var lastYearReportItems = ArchitectureReportItemService.GetLastYearItems(Funs.GetNewIntOrZero(drpYear.SelectedValue) - 1); - //Grid1.Rows[1].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[2].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[3].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[4].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[5].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[6].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[7].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[8].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[9].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[10].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[11].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[12].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[13].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[15].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[16].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[17].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[19].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[20].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[21].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[22].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[23].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[24].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[25].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[26].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[27].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[28].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[29].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[30].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[31].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[32].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[33].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[34].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[35].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[36].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[37].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[38].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[39].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[40].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[41].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[42].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[43].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[44].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[45].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[46].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[47].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[48].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[49].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[50].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[51].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[52].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[53].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[54].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[55].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[56].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[57].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[59].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[60].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[1].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[2].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[3].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[4].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[5].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[6].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[7].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[8].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[9].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[10].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[11].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[12].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[13].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[15].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[16].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[17].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[19].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[20].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[21].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[22].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[23].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[24].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[25].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[26].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[27].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[28].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[29].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[30].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[31].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[32].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[33].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[34].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[35].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[36].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[37].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[38].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[39].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[40].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[41].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[42].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[43].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[44].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[45].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[46].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[47].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[48].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[49].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[50].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[51].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[52].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[53].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[54].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[55].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[56].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[57].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[59].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[60].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); SetLastYearUnEditableRow(); } else @@ -221,63 +221,63 @@ namespace FineUIPro.Web.ZHGL.Environmental if (lastQuartersReport != null) { var lastQuartersReportItems = BLL.ArchitectureReportItemService.GetItems(lastQuartersReport.ArchitectureReportId); - //Grid1.Rows[1].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[2].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[3].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[4].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[5].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[6].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[7].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[8].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[9].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[10].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[11].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[12].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[13].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[15].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[16].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[17].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[19].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[20].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[21].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[22].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[23].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[24].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[25].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[26].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[27].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[28].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[29].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[30].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[31].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[32].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[33].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[34].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[35].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[36].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[37].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[38].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[39].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[40].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[41].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[42].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[43].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[44].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[45].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[46].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[47].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[48].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[49].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[50].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[51].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[52].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[53].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[54].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[55].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[56].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[57].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[59].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - //Grid1.Rows[60].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[1].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[2].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[3].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[4].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[5].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[6].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[7].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[8].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[9].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[10].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[11].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[12].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[13].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[15].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[16].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[17].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[19].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[20].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[21].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[22].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[23].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[24].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[25].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[26].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[27].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[28].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[29].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[30].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[31].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[32].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[33].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[34].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[35].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[36].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[37].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[38].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[39].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[40].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[41].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[42].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[43].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[44].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[45].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[46].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[47].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[48].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[49].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[50].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[51].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[52].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[53].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[54].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[55].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[56].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[57].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[59].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[60].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); SetLastYearUnEditableRow(); } else @@ -475,63 +475,63 @@ namespace FineUIPro.Web.ZHGL.Environmental private void SetLastYearUnEditableRow() { - //Grid1.Rows[1].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[2].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[3].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[4].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[5].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[6].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[7].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[8].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[9].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[10].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[11].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[12].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[13].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[24].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[25].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[26].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[27].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[28].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[29].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[30].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[31].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[32].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[33].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[34].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[35].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[37].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[38].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[39].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[40].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[41].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[42].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[43].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[44].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[45].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[46].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[47].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[48].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[49].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[50].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[51].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[52].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[53].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[54].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[55].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[56].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[57].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[59].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[60].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[1].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[2].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[3].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[4].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[5].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[6].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[7].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[8].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[9].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[10].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[11].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[12].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[13].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[24].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[25].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[26].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[27].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[28].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[29].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[30].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[31].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[32].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[33].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[34].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[35].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[37].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[38].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[39].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[40].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[41].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[42].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[43].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[44].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[45].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[46].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[47].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[48].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[49].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[50].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[51].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[52].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[53].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[54].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[55].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[56].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[57].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[59].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[60].CellCssClasses[4] = "f-grid-cell-uneditable"; } #endregion @@ -542,8 +542,8 @@ namespace FineUIPro.Web.ZHGL.Environmental private void GetData() { decimal E6 = 0, F6 = 0, E7 = 0, F7 = 0, E8, F8, E9 = 0, F9 = 0, E10 = 0, F10 = 0, E11 = 0, F11 = 0, E12 = 0, F12 = 0, E13 = 0, F13 = 0, E14 = 0, F14 = 0, E15 = 0, F15 = 0, E16 = 0, F16 = 0, E17 = 0, F17 = 0, E18 = 0, F18 = 0, E20 = 0, F20 = 0, E21 = 0, F21 = 0, E22 = 0, F22 = 0, - E24 = 0, F24 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28, F28, E29 = 0, F29 = 0, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41 = 0, F41 = 0, - E42, F42, E43, F43, E44, F44, E45, F45, E46, F46, E47, F47, E48, F48, E49, F49, E50, F50, E51, F51, E52, F52, E53, F53, E54, F54, E55, F55, + E24 = 0, F24 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28 = 0, F28 = 0, E29 = 0, F29 = 0, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41 = 0, F41 = 0, + E42 = 0, F42 = 0, E43, F43, E44, F44, E45, F45, E46, F46, E47, F47, E48, F48, E49, F49, E50, F50, E51, F51, E52, F52, E53, F53, E54, F54, E55, F55, E56, F56, E57, F57, E58, F58, E59, F59, E60, F60, E61, F61, E62, F62, E64 = 0, F64 = 0, E65 = 0, F65 = 0; JArray mergedData = Grid1.GetMergedData(); foreach (JObject mergedRow in mergedData) @@ -1105,6 +1105,18 @@ namespace FineUIPro.Web.ZHGL.Environmental { this.Grid1.Rows[14].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[4].ToString()), 2).ToString() + "%"; } + if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E22 > 0) + { + this.Grid1.Rows[16].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E22, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F22 > 0) + { + this.Grid1.Rows[16].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F22, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[16].Values[4].ToString()) && this.Grid1.Rows[16].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[16].Values[5].ToString())) + { + this.Grid1.Rows[16].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[4].ToString()), 2).ToString() + "%"; + } if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E24 > 0) { this.Grid1.Rows[18].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E24, 4); @@ -1117,6 +1129,42 @@ namespace FineUIPro.Web.ZHGL.Environmental { this.Grid1.Rows[18].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[4].ToString()), 2).ToString() + "%"; } + if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E26 > 0) + { + this.Grid1.Rows[20].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E26, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F26 > 0) + { + this.Grid1.Rows[20].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F26, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[20].Values[4].ToString()) && this.Grid1.Rows[20].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[20].Values[5].ToString())) + { + this.Grid1.Rows[20].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[4].ToString()), 2).ToString() + "%"; + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E28 > 0) + { + this.Grid1.Rows[22].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E28, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F28 > 0) + { + this.Grid1.Rows[22].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F28, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[22].Values[4].ToString()) && this.Grid1.Rows[22].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[22].Values[5].ToString())) + { + this.Grid1.Rows[22].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[4].ToString()), 2).ToString() + "%"; + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E42 > 0) + { + this.Grid1.Rows[36].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E42, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F42 > 0) + { + this.Grid1.Rows[36].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F42, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[36].Values[4].ToString()) && this.Grid1.Rows[36].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[36].Values[5].ToString())) + { + this.Grid1.Rows[36].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[4].ToString()), 2).ToString() + "%"; + } if (E64 > 0 && E65 > 0 && E20 > 0) { this.Grid1.Rows[58].Values[4] = decimal.Round((E64 + E65) / E20, 4); @@ -1171,7 +1219,7 @@ namespace FineUIPro.Web.ZHGL.Environmental { report.ArchitectureReportId = SQLHelper.GetNewID(typeof(Model.Environmental_ArchitectureReport)); report.UpState = BLL.Const.UpState_2; - report.FillingMan = this.CurrUser.PersonName; + report.FillingMan = this.CurrUser.UserName; BLL.ArchitectureReportService.AddArchitectureReport(report); BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Quarters.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnAdd); } @@ -1232,6 +1280,26 @@ namespace FineUIPro.Web.ZHGL.Environmental protected void btnSave_Click(object sender, EventArgs e) { + bool isEmpty = false; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int rowIndex = mergedRow.Value("index"); + string sortIndex = values.Value("SortIndex"); + if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38") + { + if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0) + { + isEmpty = true; + break; + } + } + } + if (isEmpty) + { + ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning); + return; + } Save("add"); ShowNotify("保存成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); @@ -1239,11 +1307,51 @@ namespace FineUIPro.Web.ZHGL.Environmental protected void btnUpdata_Click(object sender, EventArgs e) { + bool isEmpty = false; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int rowIndex = mergedRow.Value("index"); + string sortIndex = values.Value("SortIndex"); + if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38") + { + if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0) + { + isEmpty = true; + break; + } + } + } + if (isEmpty) + { + ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning); + return; + } Save("updata"); } protected void btnSubmit_Click(object sender, EventArgs e) { + bool isEmpty = false; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int rowIndex = mergedRow.Value("index"); + string sortIndex = values.Value("SortIndex"); + if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38") + { + if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0) + { + isEmpty = true; + break; + } + } + } + if (isEmpty) + { + ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning); + return; + } Save("submit"); } #endregion @@ -1326,7 +1434,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// private void GetButtonPower() { - var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ArchitectureReportMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ArchitectureReportMenuId); if (buttonList.Count() > 0) { if (buttonList.Contains(BLL.Const.BtnSave)) @@ -1364,9 +1472,9 @@ namespace FineUIPro.Web.ZHGL.Environmental newArchitectureReport.UnitId = this.drpUnit.SelectedValue; newArchitectureReport.Year = Convert.ToInt32(this.drpYear.SelectedValue); newArchitectureReport.Quarters = Convert.ToInt32(this.drpQuarters.SelectedValue); - newArchitectureReport.FillingMan = this.CurrUser.PersonName; + newArchitectureReport.FillingMan = this.CurrUser.UserName; newArchitectureReport.FillingDate = DateTime.Now; - newArchitectureReport.DutyPerson = this.CurrUser.PersonName; + newArchitectureReport.DutyPerson = this.CurrUser.UserName; newArchitectureReport.UpState = BLL.Const.UpState_2; BLL.ArchitectureReportService.AddArchitectureReport(newArchitectureReport); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs index d5e8f8b8..9c54e727 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs @@ -1,6 +1,7 @@ using BLL; using Model; using Newtonsoft.Json.Linq; +using Org.BouncyCastle.Asn1.Ocsp; using System; using System.Collections.Generic; using System.Data; @@ -78,7 +79,7 @@ namespace FineUIPro.Web.ZHGL.Environmental if (report != null) { //this.btnCopy.Hidden = true; - //if (this.CurrUser.PersonId == BLL.Const.sysglyId || this.CurrUser.PersonId == BLL.Const.hfnbdId) + //if (this.CurrUser.UserId == BLL.Const.sysglyId || this.CurrUser.UserId == BLL.Const.hfnbdId) //{ // this.btnSave.Hidden = false; //} @@ -103,7 +104,7 @@ namespace FineUIPro.Web.ZHGL.Environmental drpMonth.SelectedValue = months; drpYear.SelectedValue = year; txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - txtDutyPerson.Text = this.CurrUser.PersonName; + txtDutyPerson.Text = this.CurrUser.UserName; //增加明细集合 GetNewItems(year, months); this.Grid1.DataSource = items; @@ -123,8 +124,16 @@ namespace FineUIPro.Web.ZHGL.Environmental Grid1.Rows[0].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[15].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[17].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[19].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[21].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[23].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[68].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[68].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[96].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[96].CellCssClasses[5] = "f-grid-cell-uneditable"; } @@ -139,20 +148,22 @@ namespace FineUIPro.Web.ZHGL.Environmental Grid1.Rows[0].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[15].CellCssClasses[5] = "f-grid-cell-uneditable"; - //Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[17].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[17].CellCssClasses[5] = "f-grid-cell-uneditable"; //Grid1.Rows[18].CellCssClasses[4] = "f-grid-cell-uneditable"; //Grid1.Rows[18].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[19].CellCssClasses[5] = "f-grid-cell-uneditable"; - //Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[21].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[21].CellCssClasses[5] = "f-grid-cell-uneditable"; //Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable"; //Grid1.Rows[22].CellCssClasses[5] = "f-grid-cell-uneditable"; - //Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable"; - //Grid1.Rows[23].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[23].CellCssClasses[5] = "f-grid-cell-uneditable"; //Grid1.Rows[33].CellCssClasses[4] = "f-grid-cell-uneditable"; //Grid1.Rows[33].CellCssClasses[5] = "f-grid-cell-uneditable"; + Grid1.Rows[68].CellCssClasses[4] = "f-grid-cell-uneditable"; + Grid1.Rows[68].CellCssClasses[5] = "f-grid-cell-uneditable"; Grid1.Rows[96].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[96].CellCssClasses[5] = "f-grid-cell-uneditable"; } @@ -791,10 +802,10 @@ namespace FineUIPro.Web.ZHGL.Environmental private void GetData() { decimal E6 = 0, F6 = 0, E7 = 0, F7 = 0, E8, F8, E9, F9, E10 = 0, F10 = 0, E11 = 0, F11 = 0, E12 = 0, F12 = 0, E13 = 0, F13 = 0, E14 = 0, F14 = 0, E15 = 0, F15 = 0, E16 = 0, F16 = 0, E17 = 0, F17 = 0, E18 = 0, F18 = 0, E19 = 0, F19 = 0, - E21 = 0, F21 = 0, E22 = 0, F22 = 0, E23 = 0, F23 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28 = 0, F28 = 0, E29, F29, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41, F41, + E21 = 0, F21 = 0, E22 = 0, F22 = 0, E23 = 0, F23 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28 = 0, F28 = 0, E29 = 0, F29 = 0, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41, F41, E42, F42, E43, F43, E44, F44, E45, F45, E46, F46, E47, F47, E48, F48, E49, F49, E50, F50, E51, F51, E52, F52, E53, F53, E54, F54, E55, F55, E56, F56, E57, F57, E58, F58, E59, F59, E60, F60, E61, F61, E62, F62, E63, F63, E64, F64, E65, F65, E66, F66, E67, F67, E68, F68, E69, F69, - E70, F70, E71, F71, E72, F72, E73, F73, E74, F74, E75, F75, E76, F76, E77, F77, E78, F78, E79, F79, E80, F80, E81, F81, E82, F82, E83, F83, + E70, F70, E71, F71, E72, F72, E73, F73, E74 = 0, F74 = 0, E75, F75, E76, F76, E77, F77, E78, F78, E79, F79, E80, F80, E81, F81, E82, F82, E83, F83, E84, F84, E85, F85, E86, F86, E87, F87, E88, F88, E89, F89, E90, F90, E91, F91, E92, F92, E93, F93, E94, F94, E95, F95, E96, F96, E97, F97, E98, F98, E99, F99, E100, F100, E102 = 0, F102 = 0, E103 = 0, F103 = 0; JArray mergedData = Grid1.GetMergedData(); @@ -1699,6 +1710,18 @@ namespace FineUIPro.Web.ZHGL.Environmental { this.Grid1.Rows[15].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[15].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[15].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[15].Values[4].ToString()), 2).ToString() + "%"; } + if (E6 > 0 && E23 > 0) + { + this.Grid1.Rows[17].Values[4] = decimal.Round(E6 * 10000 / E23, 4); + } + if (F6 > 0 && F23 > 0) + { + this.Grid1.Rows[17].Values[5] = decimal.Round(F6 * 10000 / F23, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[17].Values[4].ToString()) && this.Grid1.Rows[17].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[17].Values[5].ToString())) + { + this.Grid1.Rows[17].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[17].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[17].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[17].Values[4].ToString()), 2).ToString() + "%"; + } if (E6 > 0 && E25 > 0) { this.Grid1.Rows[19].Values[4] = decimal.Round(E6 * 10000 / E25, 4); @@ -1711,6 +1734,42 @@ namespace FineUIPro.Web.ZHGL.Environmental { this.Grid1.Rows[19].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[19].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[19].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[19].Values[4].ToString()), 2).ToString() + "%"; } + if (E6 > 0 && E27 > 0) + { + this.Grid1.Rows[21].Values[4] = decimal.Round(E6 * 10000 / E27, 4); + } + if (F6 > 0 && F27 > 0) + { + this.Grid1.Rows[21].Values[5] = decimal.Round(F6 * 10000 / F27, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[21].Values[4].ToString()) && this.Grid1.Rows[21].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[21].Values[5].ToString())) + { + this.Grid1.Rows[21].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[4].ToString()), 2).ToString() + "%"; + } + if (E6 > 0 && E29 > 0) + { + this.Grid1.Rows[23].Values[4] = decimal.Round(E6 * 10000 / E29, 4); + } + if (F6 > 0 && F29 > 0) + { + this.Grid1.Rows[23].Values[5] = decimal.Round(F6 * 10000 / F29, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[23].Values[4].ToString()) && this.Grid1.Rows[23].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[23].Values[5].ToString())) + { + this.Grid1.Rows[23].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[4].ToString()), 2).ToString() + "%"; + } + if (E6 > 0 && E74 > 0) + { + this.Grid1.Rows[68].Values[4] = decimal.Round(E6 * 10000 / E74, 4); + } + if (F6 > 0 && F74 > 0) + { + this.Grid1.Rows[68].Values[5] = decimal.Round(F6 * 10000 / F74, 4); + } + if (!string.IsNullOrEmpty(this.Grid1.Rows[68].Values[4].ToString()) && this.Grid1.Rows[68].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[68].Values[5].ToString())) + { + this.Grid1.Rows[68].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[68].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[68].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[68].Values[4].ToString()), 2).ToString() + "%"; + } if (E102 > 0 && E103 > 0 && E21 > 0) { this.Grid1.Rows[96].Values[4] = decimal.Round((E102 + E103) / E21, 4); @@ -1782,7 +1841,7 @@ namespace FineUIPro.Web.ZHGL.Environmental { report.ChemicalReportId = SQLHelper.GetNewID(typeof(Model.Environmental_ChemicalReport)); report.UpState = BLL.Const.UpState_2; - report.FillingMan = this.CurrUser.PersonName; + report.FillingMan = this.CurrUser.UserName; BLL.ChemicalReportService.AddChemicalReport(report); BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Month.ToString(), report.ChemicalReportId, BLL.Const.ProjectChemicalReportMenuId, BLL.Const.BtnAdd); } @@ -1843,6 +1902,26 @@ namespace FineUIPro.Web.ZHGL.Environmental protected void btnSave_Click(object sender, EventArgs e) { + bool isEmpty = false; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int rowIndex = mergedRow.Value("index"); + string sortIndex = values.Value("SortIndex"); + if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70") + { + if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0) + { + isEmpty = true; + break; + } + } + } + if (isEmpty) + { + ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning); + return; + } Save("add"); ShowNotify("保存成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); @@ -1850,11 +1929,51 @@ namespace FineUIPro.Web.ZHGL.Environmental protected void btnUpdata_Click(object sender, EventArgs e) { + bool isEmpty = false; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int rowIndex = mergedRow.Value("index"); + string sortIndex = values.Value("SortIndex"); + if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70") + { + if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0) + { + isEmpty = true; + break; + } + } + } + if (isEmpty) + { + ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning); + return; + } Save("updata"); } protected void btnSubmit_Click(object sender, EventArgs e) { + bool isEmpty = false; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int rowIndex = mergedRow.Value("index"); + string sortIndex = values.Value("SortIndex"); + if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70") + { + if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0) + { + isEmpty = true; + break; + } + } + } + if (isEmpty) + { + ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning); + return; + } Save("submit"); } #endregion @@ -1937,7 +2056,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// private void GetButtonPower() { - var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ProjectChemicalReportMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectChemicalReportMenuId); if (buttonList.Count() > 0) { if (buttonList.Contains(BLL.Const.BtnSave)) @@ -1975,9 +2094,9 @@ namespace FineUIPro.Web.ZHGL.Environmental newChemicalReport.UnitId = this.drpUnit.SelectedValue; newChemicalReport.Year = Convert.ToInt32(this.drpYear.SelectedValue); newChemicalReport.Month = Convert.ToInt32(this.drpMonth.SelectedValue); - newChemicalReport.FillingMan = this.CurrUser.PersonName; + newChemicalReport.FillingMan = this.CurrUser.UserName; newChemicalReport.FillingDate = DateTime.Now; - newChemicalReport.DutyPerson = this.CurrUser.PersonName; + newChemicalReport.DutyPerson = this.CurrUser.UserName; newChemicalReport.UpState = BLL.Const.UpState_2; BLL.ChemicalReportService.AddChemicalReport(newChemicalReport); From 24de50cd30acbb4c5c4cd349102389b49fad3ca7 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 4 Sep 2024 09:19:35 +0800 Subject: [PATCH 3/3] =?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 --- .../ZHGL/Environmental/ArchitectureReportSave.aspx.cs | 10 +++++----- .../ZHGL/Environmental/ChemicalReportSave.aspx.cs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs index 1db3c6e5..aff828e5 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs @@ -103,7 +103,7 @@ namespace FineUIPro.Web.ZHGL.Environmental drpQuarters.SelectedValue = quarters; drpYear.SelectedValue = year; txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - txtDutyPerson.Text = this.CurrUser.UserName; + txtDutyPerson.Text = this.CurrUser.PersonName; //增加明细集合 GetNewItems(year, quarters); this.Grid1.DataSource = items; @@ -1219,7 +1219,7 @@ namespace FineUIPro.Web.ZHGL.Environmental { report.ArchitectureReportId = SQLHelper.GetNewID(typeof(Model.Environmental_ArchitectureReport)); report.UpState = BLL.Const.UpState_2; - report.FillingMan = this.CurrUser.UserName; + report.FillingMan = this.CurrUser.PersonName; BLL.ArchitectureReportService.AddArchitectureReport(report); BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Quarters.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnAdd); } @@ -1434,7 +1434,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// private void GetButtonPower() { - var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ArchitectureReportMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ArchitectureReportMenuId); if (buttonList.Count() > 0) { if (buttonList.Contains(BLL.Const.BtnSave)) @@ -1472,9 +1472,9 @@ namespace FineUIPro.Web.ZHGL.Environmental newArchitectureReport.UnitId = this.drpUnit.SelectedValue; newArchitectureReport.Year = Convert.ToInt32(this.drpYear.SelectedValue); newArchitectureReport.Quarters = Convert.ToInt32(this.drpQuarters.SelectedValue); - newArchitectureReport.FillingMan = this.CurrUser.UserName; + newArchitectureReport.FillingMan = this.CurrUser.PersonName; newArchitectureReport.FillingDate = DateTime.Now; - newArchitectureReport.DutyPerson = this.CurrUser.UserName; + newArchitectureReport.DutyPerson = this.CurrUser.PersonName; newArchitectureReport.UpState = BLL.Const.UpState_2; BLL.ArchitectureReportService.AddArchitectureReport(newArchitectureReport); diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs index 9c54e727..42cde8e7 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs @@ -104,7 +104,7 @@ namespace FineUIPro.Web.ZHGL.Environmental drpMonth.SelectedValue = months; drpYear.SelectedValue = year; txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - txtDutyPerson.Text = this.CurrUser.UserName; + txtDutyPerson.Text = this.CurrUser.PersonName; //增加明细集合 GetNewItems(year, months); this.Grid1.DataSource = items; @@ -1841,7 +1841,7 @@ namespace FineUIPro.Web.ZHGL.Environmental { report.ChemicalReportId = SQLHelper.GetNewID(typeof(Model.Environmental_ChemicalReport)); report.UpState = BLL.Const.UpState_2; - report.FillingMan = this.CurrUser.UserName; + report.FillingMan = this.CurrUser.PersonName; BLL.ChemicalReportService.AddChemicalReport(report); BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Month.ToString(), report.ChemicalReportId, BLL.Const.ProjectChemicalReportMenuId, BLL.Const.BtnAdd); } @@ -2056,7 +2056,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// private void GetButtonPower() { - var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectChemicalReportMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ProjectChemicalReportMenuId); if (buttonList.Count() > 0) { if (buttonList.Contains(BLL.Const.BtnSave)) @@ -2094,9 +2094,9 @@ namespace FineUIPro.Web.ZHGL.Environmental newChemicalReport.UnitId = this.drpUnit.SelectedValue; newChemicalReport.Year = Convert.ToInt32(this.drpYear.SelectedValue); newChemicalReport.Month = Convert.ToInt32(this.drpMonth.SelectedValue); - newChemicalReport.FillingMan = this.CurrUser.UserName; + newChemicalReport.FillingMan = this.CurrUser.PersonName; newChemicalReport.FillingDate = DateTime.Now; - newChemicalReport.DutyPerson = this.CurrUser.UserName; + newChemicalReport.DutyPerson = this.CurrUser.PersonName; newChemicalReport.UpState = BLL.Const.UpState_2; BLL.ChemicalReportService.AddChemicalReport(newChemicalReport);