From 726c5116f4757efef4d2eb952fc335ce3bb7f45e Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 25 Dec 2023 14:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=95=E8=BD=A6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-12-25.sql | 25 + SGGL/BLL/Common/NPOIHelper.cs | 2 + SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 32 + .../FourDecisionOtherConfirm.aspx | 4 +- .../FourDecisionOtherConfirm.aspx.cs | 11 +- .../FourDecisionOtherConfirmEdit.aspx | 4 +- .../FourDecisionOtherConfirmEdit.aspx.cs | 15 +- .../FourDecisionProposerConfirm.aspx | 139 +++ .../FourDecisionProposerConfirm.aspx.cs | 298 +++++++ ...urDecisionProposerConfirm.aspx.designer.cs | 188 ++++ .../FourDecisionProposerConfirmEdit.aspx | 160 ++++ .../FourDecisionProposerConfirmEdit.aspx.cs | 244 ++++++ ...cisionProposerConfirmEdit.aspx.designer.cs | 305 +++++++ .../FourDecisionProposerHandle.aspx | 140 +++ .../FourDecisionProposerHandle.aspx.cs | 299 +++++++ ...ourDecisionProposerHandle.aspx.designer.cs | 188 ++++ .../FourDecisionProposerHandleEdit.aspx | 129 +++ .../FourDecisionProposerHandleEdit.aspx.cs | 203 +++++ ...ecisionProposerHandleEdit.aspx.designer.cs | 260 ++++++ .../FourDecisionResponsibilityConfirm.aspx | 13 +- .../FourDecisionResponsibilityConfirm.aspx.cs | 18 +- ...sionResponsibilityConfirm.aspx.designer.cs | 4 +- ...FourDecisionResponsibilityConfirmEdit.aspx | 28 +- ...rDecisionResponsibilityConfirmEdit.aspx.cs | 33 +- ...ResponsibilityConfirmEdit.aspx.designer.cs | 18 + .../BeforeTestRun/InspectTailTermList.aspx.cs | 2 +- .../InspectWanderAboutAllPassList.aspx.cs | 2 +- .../InspectWanderAboutList.aspx.cs | 2 +- .../BeforeTestRun/SiteImplementation.aspx | 4 +- .../SiteImplementationList.aspx.cs | 2 +- .../TestRun/BeforeTestRun/SubInspectTerm.aspx | 23 + .../BeforeTestRun/SubInspectTerm.aspx.cs | 20 +- .../SubInspectTerm.aspx.designer.cs | 27 + .../BeforeTestRun/SubSysWorkPackage.aspx.cs | 8 +- .../SubThreeChecksFourDecisionEdit.aspx | 63 +- .../SubThreeChecksFourDecisionEdit.aspx.cs | 40 +- ...reeChecksFourDecisionEdit.aspx.designer.cs | 71 +- .../SubThreeChecksFourDecisionList.aspx | 33 +- .../SubThreeChecksFourDecisionList.aspx.cs | 77 +- ...reeChecksFourDecisionList.aspx.designer.cs | 17 +- .../BeforeTestRun/SubWorkInspect.aspx.cs | 2 +- .../BeforeTestRun/SysPipingDeviceImport.aspx | 75 +- .../SysPipingDeviceImport.aspx.cs | 30 +- .../BeforeTestRun/TailTermApproveList.aspx.cs | 2 +- .../BeforeTestRun/TailTermHandleList.aspx.cs | 2 +- .../BeforeTestRun/TestRunRecordUpload.aspx | 5 + .../BeforeTestRun/TestRunRecordUpload.aspx.cs | 38 +- .../TestRunRecordUpload.aspx.designer.cs | 9 + .../TestRunRecordUploadList.aspx.cs | 2 +- .../TestRunManage/SubSysWorkPackage.aspx.cs | 10 +- SGGL/Model/Model.cs | 818 +++++++++--------- 51 files changed, 3545 insertions(+), 599 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-12-25.sql create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2023-12-25.sql b/DataBase/版本日志/SGGLDB_WH_2023-12-25.sql new file mode 100644 index 00000000..98c8fc4d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-12-25.sql @@ -0,0 +1,25 @@ +delete Sys_Menu where MenuId='E673FC27-74F1-479C-8DE1-950183566725' +delete Sys_Menu where MenuId='FAD7BF9B-B08A-473B-BEB9-CCAC3E5EA130' +delete Sys_Menu where MenuId='4822760B-395B-4979-B547-EA0D715C8A2C' +delete Sys_Menu where MenuId='7803218A-3E94-4715-814A-951CF2474E7C' +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('4822760B-395B-4979-B547-EA0D715C8A2C','Ķ˴',null,'TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx',16,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('E673FC27-74F1-479C-8DE1-950183566725','Ķ',null,'TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx',17,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('7803218A-3E94-4715-814A-951CF2474E7C','Ķȷ',null,'TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx',18,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1) +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('FAD7BF9B-B08A-473B-BEB9-CCAC3E5EA130','Ķȷ',null,'TestRun/BeforeTestRun/FourDecisionOtherConfirm.aspx',19,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1) + +--/˴״̬(0:ύ1:˴2:˴˻3:˴ȷ4:˻5:ͨ˴6:˻7:ȷͨ) +alter table PreRun_SubThreeChecksFourDecision add ResponsibilityProposeSatate int null +--˴ʱ +alter table PreRun_SubThreeChecksFourDecision add ProposeHandleData datetime NULL +--Ķ +alter table PreRun_SubThreeChecksFourDecision add FourDecisionCode varchar(20) NULL + +-- +truncate table PreRun_SubThreeChecksFourDecision +truncate table PreRun_DecisionConfirmRecords +truncate table PreRun_PropertySysPiping +truncate table PreRun_SubPropertySelect +truncate table PreRun_TechnologySysPiping +truncate table PreRun_SubTechnologySelect +truncate table PreRun_InstrumentSysPiping +truncate table PreRun_SubInstrumentSelect \ No newline at end of file diff --git a/SGGL/BLL/Common/NPOIHelper.cs b/SGGL/BLL/Common/NPOIHelper.cs index 48ee0ae9..b376f00d 100644 --- a/SGGL/BLL/Common/NPOIHelper.cs +++ b/SGGL/BLL/Common/NPOIHelper.cs @@ -113,6 +113,7 @@ namespace BLL sheetNumber = firstSheet ? 1 : workbook.NumberOfSheets; for (int i = 0; i < sheetNumber; i++) { + if (workbook.IsSheetHidden(i)) continue; string sheetName = workbook.GetSheetName(i); sheet = workbook.GetSheet(sheetName); if (sheet != null) @@ -137,6 +138,7 @@ namespace BLL sheetNumber = firstSheet ? 1 : workbook.NumberOfSheets; for (int i = 0; i < sheetNumber; i++) { + if (workbook.IsSheetHidden(i)) continue; string sheetName = workbook.GetSheetName(i); sheet = workbook.GetSheet(sheetName); if (sheet != null) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index c5185f93..21917918 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1674,6 +1674,10 @@ + + + + @@ -15154,6 +15158,34 @@ FourDecisionOtherConfirmEdit.aspx + + FourDecisionProposerConfirm.aspx + ASPXCodeBehind + + + FourDecisionProposerConfirm.aspx + + + FourDecisionProposerConfirmEdit.aspx + ASPXCodeBehind + + + FourDecisionProposerConfirmEdit.aspx + + + FourDecisionProposerHandle.aspx + ASPXCodeBehind + + + FourDecisionProposerHandle.aspx + + + FourDecisionProposerHandleEdit.aspx + ASPXCodeBehind + + + FourDecisionProposerHandleEdit.aspx + FourDecisionResponsibilityConfirm.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionOtherConfirm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionOtherConfirm.aspx index 14b086f8..40c30b82 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionOtherConfirm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionOtherConfirm.aspx @@ -4,7 +4,7 @@ - 提出人,总包,监理,业主确认 + 总包,监理,业主确认 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx.cs new file mode 100644 index 00000000..03fb40b3 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx.cs @@ -0,0 +1,298 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class FourDecisionProposerConfirm : PageBase + { + /// + /// 子系统主键 + /// + public string SsubSystemId + { + get { return (string)ViewState["SsubSystemId"]; } + set { ViewState["SsubSystemId"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //加载树 + this.InitTreeMenu(); + } + } + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "提出人确认"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var decisions = Funs.DB.PreRun_SubThreeChecksFourDecision.Where(x => x.ProposeUser == this.CurrUser.UserId && x.ResponsibilityConfirm == 2 && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + if (decisions.Count == 0) return; + //获取子系统主键 + var subsystemids = decisions.ConvertAll(x => x.SubSystemId); + //根据子系统获取其他节点ID + var userDevices = Funs.DB.PreRun_SysDevice.Where(p => p.ProjectId == this.CurrUser.LoginProjectId && subsystemids.Contains(p.PreRunId)).ToList(); + List allIds = new List(); + allIds.AddRange(userDevices.ConvertAll(x => x.ProcessesId)); + allIds.AddRange(userDevices.ConvertAll(x => x.SystemId)); + allIds.AddRange(subsystemids); + var allPreRunLs = Funs.DB.PreRun_SysDevice.Where(p => p.ProjectId == this.CurrUser.LoginProjectId && p.PreRunLevel > 1 && allIds.Contains(p.PreRunId)).ToList(); + var onePreRunLs = allPreRunLs.Where(p => p.PreRunLevel == 2).OrderBy(x => x.Sort); + foreach (var item in onePreRunLs) + { + TreeNode rootUnitNode = new TreeNode();//定义根节点 + rootUnitNode.NodeID = item.PreRunId; + rootUnitNode.Text = item.PreRunName; + rootUnitNode.ToolTip = item.PreRunName; + rootUnitNode.CommandName = ""; + rootUnitNode.EnableClickEvent = false; + rootUnitNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootUnitNode); + rootUnitNode.Expanded = true; + var otherPreRunls = allPreRunLs.Where(p => p.PreRunLevel != 1).ToList(); + this.BindNodes(rootUnitNode, otherPreRunls, item.PreRunId); + } + } + + /// + /// 绑定树节点 + /// + private void BindNodes(TreeNode node, List list, string parentId) + { + var itemList = list.Where(p => p.ParentId == parentId).OrderBy(x => x.Sort).ToList(); + if (itemList.Count > 0) + { + foreach (var item in itemList) + { + TreeNode newNode = new TreeNode(); + newNode.Text = item.PreRunName; + newNode.NodeID = item.PreRunId; + newNode.ToolTip = item.PreRunName; + newNode.CommandName = ""; + newNode.EnableClickEvent = item.PreRunLevel == 4 ? true : false; + newNode.EnableExpandEvent = item.PreRunLevel == 4 ? true : false; + newNode.Expanded = true; + node.Nodes.Add(newNode); + BindNodes(newNode, list, item.PreRunId); + } + } + } + + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.SsubSystemId = tvControlItem.SelectedNodeID; + BindGrid(); + } + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select a.DecisionId,a.ProjectId,a.SubSystemId,a.ProposeUser,puser.UserName as ProposeUserName,a.ResponsibilityUser,ruser.UserName as ResponsibilityUserName,a.ResponsibilityUnit,unit.UnitName as ResponsibilityUnitName,a.QuestionDesc,a.Level,a.Speciality,a.AskDestructionTime,a.RealityDestructionTime,a.RestrictCondition,a.ResponsibilityProposeSatate,(case a.ResponsibilityProposeSatate when 0 then '待提交' when 1 then '提出人待处理' when 2 then '提出人处理退回' when 3 then '责任人待确认' when 4 then '责任人退回' when 5 then '责任人通过提出人待处理' when 6 then '提出人退回' when 7 then '提出人确认通过' else '' end) as ResponsibilityProposeSatateName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.ResponsibilityConfirm,(case a.ResponsibilityConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ResponsibilityConfirmName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.GeneraConfirm,(case a.GeneraConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as GeneraConfirmName,a.SupervisionConfirm,(case a.SupervisionConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as SupervisionConfirmName,a.OwnerConfirm,(case a.OwnerConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as OwnerConfirmName,a.ProposeConfirmData,a.ResponsibilityConfirmData,a.GeneraConfirmData,a.SupervisionConfirmData,a.OwnerConfirmData,a.DecisionIsClose,(case a.DecisionIsClose when 1 then '已关闭' else '未关闭' end) as DecisionIsCloseName,(case ISNULL(a.AskDestructionTime,'') when '' then 0 else DATEDIFF(DAY, GETDATE(),a.AskDestructionTime) end) as DestructionDiffDay,a.AddUser,a.AddTime,a.Sort from PreRun_SubThreeChecksFourDecision as a left join Sys_User as puser on a.ProposeUser=puser.UserId left join Sys_User as ruser on a.ResponsibilityUser=ruser.UserId left join Base_Unit as unit on a.ResponsibilityUnit=unit.UnitId where 1=1 and a.SubSystemId=@SubSystemId and a.ProjectId=@ProjectId and a.ProposeUser=@ProposeUser and a.ResponsibilityProposeSatate in (5,6,7) "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@SubSystemId", this.SsubSystemId)); + listStr.Add(new SqlParameter("@ProposeUser", this.CurrUser.UserId)); + //提出人/责任人处理状态 + if (!string.IsNullOrWhiteSpace(ddlResponsibilityProposeSatate.SelectedValue)) + { + strSql += " and a.ResponsibilityProposeSatate=@ResponsibilityProposeSatate"; + listStr.Add(new SqlParameter("@ResponsibilityProposeSatate", ddlResponsibilityProposeSatate.SelectedValue)); + } + //是否关闭 + if (!string.IsNullOrWhiteSpace(ddlDecisionState.Text)) + { + strSql += " and a.DecisionState=@DecisionState"; + listStr.Add(new SqlParameter("@DecisionState", ddlDecisionState.SelectedValue)); + } + strSql += " order by a.AddTime desc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnSubmitConfirm_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 行数据处理事件 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + DataRowView row = e.DataItem as DataRowView; + + int diffDay = Convert.ToInt32(row["DestructionDiffDay"]); + TemplateField AdjustDiffDay = Grid1.FindColumn("DestructionDiffDay") as TemplateField; + int isClose = int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()); + if (isClose != 1) + { + if (diffDay > 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color1"; + } + else if (diffDay == 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color2"; + } + else if (diffDay < 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color3"; + } + } + } + + #endregion + + /// + /// 提出人确认 + /// + protected void btnSubmitConfirm_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == Grid1.SelectedRowID); + if (model != null) + { + if (model.ResponsibilityProposeSatate != 5) + { + Alert.ShowInTop("仅“责任人通过提出人待处理”状态才可进行提出人确认！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("FourDecisionProposerConfirmEdit.aspx?DecisionId={0}", Grid1.SelectedRowID, "提出人确认 - "))); + } + + /// + /// 搜索 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 查看 + /// + protected void btnView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("FourDecisionProposerConfirmEdit.aspx?DecisionId={0}&IsView=true", Grid1.SelectedRowID, "查看 - "))); + } + + /// + /// 是否逾期返回 + /// + /// + public string IsOverdue(object diffDayVal, object stateVal) + { + var result = string.Empty; + var diffDay = 0; + var itemState = 0; + if (diffDayVal != null) diffDay = int.Parse(diffDayVal.ToString()); + if (stateVal != null) itemState = int.Parse(stateVal.ToString()); + if (itemState != 1) + { + if (diffDay > 0) + { + result = "未逾期"; + } + else if (diffDay == 0) + { + result = "即将逾期"; + } + else if (diffDay < 0) + { + result = "已逾期"; + } + } + else + { + result = "已关闭"; + } + return result; + } + + /// + /// 右击确认 + /// + protected void btnMenuConfirm_Click(object sender, EventArgs e) + { + btnSubmitConfirm_Click(null, null); + } + + /// + /// 关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx.designer.cs new file mode 100644 index 00000000..9a27e744 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirm.aspx.designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class FourDecisionProposerConfirm + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// ddlResponsibilityProposeSatate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlResponsibilityProposeSatate; + + /// + /// ddlDecisionState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlDecisionState; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnView; + + /// + /// btnSubmitConfirm 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmitConfirm; + + /// + /// lblIsOverdue 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblIsOverdue; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuConfirm 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuConfirm; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx new file mode 100644 index 00000000..9c680ff7 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx @@ -0,0 +1,160 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FourDecisionProposerConfirmEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.FourDecisionProposerConfirmEdit" %> + + + + + + 责任人确认 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx.cs new file mode 100644 index 00000000..2f578bc6 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx.cs @@ -0,0 +1,244 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class FourDecisionProposerConfirmEdit : PageBase + { + /// + /// 主键 + /// + public string DecisionId + { + get { return (string)ViewState["DecisionId"]; } + set { ViewState["DecisionId"] = value; } + } + + /// + /// 是否查看 + /// + public bool IsView + { + get { return (bool)ViewState["IsView"]; } + set { ViewState["IsView"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + /// + /// 整改图片是否可编辑 + /// + public int RectifyEditImg + { + get { return (int)ViewState["RectifyEditImg"]; } + set { ViewState["RectifyEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + this.DecisionId = Request["DecisionId"]; + //是否查看 + this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]); + //数据绑定 + PageInit(); + //提出人处理 + gvDataBrid(); + //判断是否查看 + if (IsView) + { + btnReturn.Hidden = true; + btnPass.Hidden = true; + QuestionEditImg = -1; + RectifyEditImg = -1; + lblResponsibilityUnit.Enabled = false; + lblQuestionDesc.Enabled = false; + lblRestrictCondition.Enabled = false; + lblLevel.Enabled = false; + lblSpeciality.Enabled = false; + lblAskDestructionTime.Enabled = false; + lblRealityDestructionTime.Enabled = false; + lblResponsibilityUser.Enabled = false; + lblProposeUser.Enabled = false; + lblGeneraUser.Enabled = false; + lblSupervisionUser.Enabled = false; + lblOwnerUser.Enabled = false; + lblDecisionIsClose.Enabled = false; + txtConfirmDesc.Enabled = false; + } + } + + /// + /// 默认绑定 + /// + public void PageInit() + { + QuestionEditImg = -1; + RectifyEditImg = -1; + var query = from a in Funs.DB.PreRun_SubThreeChecksFourDecision + join b in Funs.DB.Base_Project on a.ProjectId equals b.ProjectId + join c in Funs.DB.Base_Unit on a.ResponsibilityUnit equals c.UnitId + join d in Funs.DB.Sys_User on a.ResponsibilityUser equals d.UserId + join e in Funs.DB.Sys_User on a.ProposeUser equals e.UserId + join f in Funs.DB.Sys_User on a.GeneraUser equals f.UserId + join g in Funs.DB.Sys_User on a.SupervisionUser equals g.UserId + join h in Funs.DB.Sys_User on a.OwnerUser equals h.UserId + where a.DecisionId == this.DecisionId + select new + { + a.DecisionId, + a.ProjectId, + b.ProjectName, + a.ResponsibilityUnit, + ResponsibilityUnitName = c.UnitName, + a.ResponsibilityUser, + ResponsibilityUserName = d.UserName, + a.ProposeUser, + ProposeUserName = e.UserName, + a.GeneraUser, + GeneraUserName = f.UserName, + a.SupervisionUser, + SupervisionUserName = g.UserName, + a.OwnerUser, + OwnerUserName = h.UserName, + a.QuestionDesc, + a.Level, + a.Speciality, + a.AskDestructionTime, + a.RealityDestructionTime, + a.RestrictCondition, + a.DecisionIsClose, + DecisionIsCloseName = a.DecisionIsClose == 1 ? "已关闭" : "未关闭" + }; + var model = query.FirstOrDefault(); + if (model != null) + { + lblProjectName.Text = model.ProjectName; + lblResponsibilityUnit.Text = model.ResponsibilityUnitName; + lblQuestionDesc.Text = model.QuestionDesc; + lblRestrictCondition.Text = model.RestrictCondition; + lblLevel.Text = model.Level; + lblSpeciality.Text = model.Speciality; + lblAskDestructionTime.Text = model.AskDestructionTime.Value != null ? model.AskDestructionTime.Value.ToString("yyyy-MM-dd") : string.Empty; + lblRealityDestructionTime.Text = model.RealityDestructionTime != null ? model.RealityDestructionTime.Value.ToString("yyyy-MM-dd") : string.Empty; + lblResponsibilityUser.Text = model.ResponsibilityUserName; + lblProposeUser.Text = model.ProposeUserName; + lblGeneraUser.Text = model.GeneraUserName; + lblSupervisionUser.Text = model.SupervisionUserName; + lblOwnerUser.Text = model.OwnerUserName; + lblDecisionIsClose.Text = model.DecisionIsCloseName; + } + } + + /// + /// 提出人处理 + /// + public void gvDataBrid() + { + string strSql = @"select a.ConfirmId,a.ProjectId,a.DecisionId,a.ConfirmDesc,a.ConfirmTime,a.ConfirmUser,b.UserName as ConfirmUserName,a.ConfirmType,(case a.ConfirmType when 1 then '提出人处理' when 2 then '责任人确认' when 3 then '提出人确认' when 4 then '总包确认' when 5 then '监理确认' when 6 then '业主确认' else '' end) as ConfirmTypeName,a.ConfirmState,(case a.ConfirmState when 1 then '确认通过' when 2 then '确认退回' else '' end) as ConfirmStateName,a.AddUser,a.AddTime from PreRun_DecisionConfirmRecords as a left join Sys_User as b on a.ConfirmUser=b.UserId where a.ProjectId=@ProjectId and a.DecisionId=@DecisionId and a.ConfirmType=2"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@DecisionId", this.DecisionId)); + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + gvTcrcl.DataSource = tb; + gvTcrcl.DataBind(); + } + + /// + /// 问题图片查看 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.DecisionId + "q", Const.InspectTailTerm))); + } + + /// + /// 整改图片查看 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.DecisionId + "h", Const.InspectTailTerm))); + } + + /// + /// 退回 + /// + protected void btnReturn_Click(object sender, EventArgs e) + { + var decisionModel = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == this.DecisionId); + if (decisionModel != null) + { + decisionModel.ProposeConfirm = 1; + decisionModel.ResponsibilityProposeSatate = 6; + var model = new PreRun_DecisionConfirmRecords(); + model.ConfirmId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.DecisionId = this.DecisionId; + model.ConfirmDesc = txtConfirmDesc.Text; + model.ConfirmTime = DateTime.Now; + model.ConfirmUser = this.CurrUser.UserId; + model.ConfirmType = 3; + model.ConfirmState = 2; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.PreRun_DecisionConfirmRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("退回成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 确认通过 + /// + protected void btnPass_Click(object sender, EventArgs e) + { + var decisionModel = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == this.DecisionId); + if (decisionModel != null) + { + decisionModel.ResponsibilityProposeSatate = 7; + decisionModel.ProposeConfirm = 2; + decisionModel.ResponsibilityConfirmData = DateTime.Now; + var model = new PreRun_DecisionConfirmRecords(); + model.ConfirmId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.DecisionId = this.DecisionId; + model.ConfirmDesc = txtConfirmDesc.Text; + model.ConfirmTime = DateTime.Now; + model.ConfirmUser = this.CurrUser.UserId; + model.ConfirmType = 3; + model.ConfirmState = 1; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.PreRun_DecisionConfirmRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("确认通过成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx.designer.cs new file mode 100644 index 00000000..a6911ae2 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerConfirmEdit.aspx.designer.cs @@ -0,0 +1,305 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class FourDecisionProposerConfirmEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblResponsibilityUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblResponsibilityUnit; + + /// + /// lblQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblQuestionDesc; + + /// + /// lblRestrictCondition 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRestrictCondition; + + /// + /// lblLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblLevel; + + /// + /// lblSpeciality 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblSpeciality; + + /// + /// lblAskDestructionTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAskDestructionTime; + + /// + /// lblRealityDestructionTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRealityDestructionTime; + + /// + /// lblResponsibilityUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblResponsibilityUser; + + /// + /// lblProposeUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProposeUser; + + /// + /// lblGeneraUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblGeneraUser; + + /// + /// lblSupervisionUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblSupervisionUser; + + /// + /// lblOwnerUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblOwnerUser; + + /// + /// lblDecisionIsClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblDecisionIsClose; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// txtConfirmDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtConfirmDesc; + + /// + /// plApprove2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvTcrcl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvTcrcl; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnReturn 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReturn; + + /// + /// btnPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPass; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx new file mode 100644 index 00000000..7fb3baca --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx @@ -0,0 +1,140 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FourDecisionProposerHandle.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.FourDecisionProposerHandle" %> + + + + + + 提出人处理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx.cs new file mode 100644 index 00000000..32eb6135 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx.cs @@ -0,0 +1,299 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class FourDecisionProposerHandle : PageBase + { + /// + /// 子系统主键 + /// + public string SsubSystemId + { + get { return (string)ViewState["SsubSystemId"]; } + set { ViewState["SsubSystemId"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //加载树 + this.InitTreeMenu(); + } + } + + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "提出人处理"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + rootNode.ToolTip = ""; + rootNode.EnableClickEvent = true; + this.tvControlItem.Nodes.Add(rootNode); + var decisions = Funs.DB.PreRun_SubThreeChecksFourDecision.Where(x => x.ProposeUser == this.CurrUser.UserId && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + if (decisions.Count == 0) return; + //获取子系统主键 + var subsystemids = decisions.ConvertAll(x => x.SubSystemId); + //根据子系统获取其他节点ID + var userDevices = Funs.DB.PreRun_SysDevice.Where(p => p.ProjectId == this.CurrUser.LoginProjectId && subsystemids.Contains(p.PreRunId)).ToList(); + List allIds = new List(); + allIds.AddRange(userDevices.ConvertAll(x => x.ProcessesId)); + allIds.AddRange(userDevices.ConvertAll(x => x.SystemId)); + allIds.AddRange(subsystemids); + var allPreRunLs = Funs.DB.PreRun_SysDevice.Where(p => p.ProjectId == this.CurrUser.LoginProjectId && p.PreRunLevel > 1 && allIds.Contains(p.PreRunId)).ToList(); + var onePreRunLs = allPreRunLs.Where(p => p.PreRunLevel == 2).OrderBy(x => x.Sort); + foreach (var item in onePreRunLs) + { + TreeNode rootUnitNode = new TreeNode();//定义根节点 + rootUnitNode.NodeID = item.PreRunId; + rootUnitNode.Text = item.PreRunName; + rootUnitNode.ToolTip = item.PreRunName; + rootUnitNode.CommandName = ""; + rootUnitNode.EnableClickEvent = false; + rootUnitNode.EnableExpandEvent = false; + rootNode.Nodes.Add(rootUnitNode); + rootUnitNode.Expanded = true; + var otherPreRunls = allPreRunLs.Where(p => p.PreRunLevel != 1).ToList(); + this.BindNodes(rootUnitNode, otherPreRunls, item.PreRunId); + } + } + + /// + /// 绑定树节点 + /// + private void BindNodes(TreeNode node, List list, string parentId) + { + var itemList = list.Where(p => p.ParentId == parentId).OrderBy(x => x.Sort).ToList(); + if (itemList.Count > 0) + { + foreach (var item in itemList) + { + TreeNode newNode = new TreeNode(); + newNode.Text = item.PreRunName; + newNode.NodeID = item.PreRunId; + newNode.ToolTip = item.PreRunName; + newNode.CommandName = ""; + newNode.EnableClickEvent = item.PreRunLevel == 4 ? true : false; + newNode.EnableExpandEvent = item.PreRunLevel == 4 ? true : false; + newNode.Expanded = true; + node.Nodes.Add(newNode); + BindNodes(newNode, list, item.PreRunId); + } + } + } + + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.SsubSystemId = tvControlItem.SelectedNodeID; + BindGrid(); + } + + #region 绑定数据 + + /// + /// 数据绑定 + /// + public void BindGrid() + { + string strSql = @"select a.DecisionId,a.ProjectId,a.SubSystemId,a.ProposeUser,puser.UserName as ProposeUserName,a.ResponsibilityUser,ruser.UserName as ResponsibilityUserName,a.ResponsibilityUnit,unit.UnitName as ResponsibilityUnitName,a.QuestionDesc,a.Level,a.Speciality,a.AskDestructionTime,a.RealityDestructionTime,a.RestrictCondition,a.ResponsibilityProposeSatate,(case a.ResponsibilityProposeSatate when 0 then '待提交' when 1 then '提出人待处理' when 2 then '提出人处理退回' when 3 then '责任人待确认' when 4 then '责任人退回' when 5 then '责任人通过提出人待处理' when 6 then '提出人退回' when 7 then '提出人确认通过' else '' end) as ResponsibilityProposeSatateName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.ResponsibilityConfirm,(case a.ResponsibilityConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ResponsibilityConfirmName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.GeneraConfirm,(case a.GeneraConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as GeneraConfirmName,a.SupervisionConfirm,(case a.SupervisionConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as SupervisionConfirmName,a.OwnerConfirm,(case a.OwnerConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as OwnerConfirmName,a.ProposeConfirmData,a.ResponsibilityConfirmData,a.GeneraConfirmData,a.SupervisionConfirmData,a.OwnerConfirmData,a.DecisionIsClose,(case a.DecisionIsClose when 1 then '已关闭' else '未关闭' end) as DecisionIsCloseName,(case ISNULL(a.AskDestructionTime,'') when '' then 0 else DATEDIFF(DAY, GETDATE(),a.AskDestructionTime) end) as DestructionDiffDay,a.AddUser,a.AddTime,a.Sort from PreRun_SubThreeChecksFourDecision as a left join Sys_User as puser on a.ProposeUser=puser.UserId left join Sys_User as ruser on a.ResponsibilityUser=ruser.UserId left join Base_Unit as unit on a.ResponsibilityUnit=unit.UnitId where 1=1 and a.SubSystemId=@SubSystemId and a.ProjectId=@ProjectId and a.ProposeUser=@ProposeUser and a.ResponsibilityProposeSatate in (1,2,4) "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@SubSystemId", this.SsubSystemId)); + listStr.Add(new SqlParameter("@ProposeUser", this.CurrUser.UserId)); + //提出人处理状态 + if (!string.IsNullOrWhiteSpace(ddlResponsibilityProposeSatate.SelectedValue)) + { + strSql += " and a.ResponsibilityProposeSatate=@ResponsibilityProposeSatate"; + listStr.Add(new SqlParameter("@ResponsibilityProposeSatate", ddlResponsibilityProposeSatate.SelectedValue)); + } + //是否关闭 + if (!string.IsNullOrWhiteSpace(ddlDecisionState.Text)) + { + strSql += " and a.DecisionState=@DecisionState"; + listStr.Add(new SqlParameter("@DecisionState", ddlDecisionState.SelectedValue)); + } + strSql += " order by a.AddTime desc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 双击事件 + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnSubmitConfirm_Click(null, null); + } + + /// + /// 分页下拉框 + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 行数据处理事件 + /// + protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + { + DataRowView row = e.DataItem as DataRowView; + + int diffDay = Convert.ToInt32(row["DestructionDiffDay"]); + TemplateField AdjustDiffDay = Grid1.FindColumn("DestructionDiffDay") as TemplateField; + int isClose = int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()); + if (isClose != 1) + { + if (diffDay > 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color1"; + } + else if (diffDay == 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color2"; + } + else if (diffDay < 0) + { + e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color3"; + } + } + } + + #endregion + + /// + /// 提出人处理 + /// + protected void btnSubmitConfirm_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + var model = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == Grid1.SelectedRowID); + if (model != null) + { + int[] arr = { 1, 4 }; + if (!arr.Contains(model.ResponsibilityProposeSatate.Value)) + { + Alert.ShowInTop("仅“提出人待处理”和“责任人退回”才可以进行处理操作！", MessageBoxIcon.Warning); + return; + } + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("FourDecisionProposerHandleEdit.aspx?DecisionId={0}", Grid1.SelectedRowID, "提出人处理 - "))); + } + + /// + /// 搜索 + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + /// + /// 查看 + /// + protected void btnView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("FourDecisionProposerHandleEdit.aspx?DecisionId={0}&IsView=true", Grid1.SelectedRowID, "查看 - "))); + } + + /// + /// 是否逾期返回 + /// + /// + public string IsOverdue(object diffDayVal, object stateVal) + { + var result = string.Empty; + var diffDay = 0; + var itemState = 0; + if (diffDayVal != null) diffDay = int.Parse(diffDayVal.ToString()); + if (stateVal != null) itemState = int.Parse(stateVal.ToString()); + if (itemState != 1) + { + if (diffDay > 0) + { + result = "未逾期"; + } + else if (diffDay == 0) + { + result = "即将逾期"; + } + else if (diffDay < 0) + { + result = "已逾期"; + } + } + else + { + result = "已关闭"; + } + return result; + } + + /// + /// 右击确认 + /// + protected void btnMenuConfirm_Click(object sender, EventArgs e) + { + btnSubmitConfirm_Click(null, null); + } + + /// + /// 关闭 + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx.designer.cs new file mode 100644 index 00000000..fa871b68 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx.designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class FourDecisionProposerHandle + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// ddlResponsibilityProposeSatate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlResponsibilityProposeSatate; + + /// + /// ddlDecisionState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlDecisionState; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnView; + + /// + /// btnSubmitConfirm 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSubmitConfirm; + + /// + /// lblIsOverdue 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblIsOverdue; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuConfirm 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuConfirm; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx new file mode 100644 index 00000000..25901988 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx @@ -0,0 +1,129 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FourDecisionProposerHandleEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.FourDecisionProposerHandleEdit" %> + + + + + + 提出人处理 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx.cs new file mode 100644 index 00000000..29b5b8ed --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx.cs @@ -0,0 +1,203 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + public partial class FourDecisionProposerHandleEdit : PageBase + { + /// + /// 主键 + /// + public string DecisionId + { + get { return (string)ViewState["DecisionId"]; } + set { ViewState["DecisionId"] = value; } + } + + /// + /// 是否查看 + /// + public bool IsView + { + get { return (bool)ViewState["IsView"]; } + set { ViewState["IsView"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int QuestionEditImg + { + get { return (int)ViewState["QuestionEditImg"]; } + set { ViewState["QuestionEditImg"] = value; } + } + + protected void Page_Load(object sender, EventArgs e) + { + this.DecisionId = Request["DecisionId"]; + //是否查看 + this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]); + //数据绑定 + PageInit(); + //判断是否查看 + if (IsView) + { + btnReturn.Hidden = true; + btnSave.Hidden = true; + QuestionEditImg = -1; + lblResponsibilityUnit.Enabled = false; + lblQuestionDesc.Enabled = false; + lblRestrictCondition.Enabled = false; + lblLevel.Enabled = false; + lblSpeciality.Enabled = false; + lblAskDestructionTime.Enabled = false; + lblRealityDestructionTime.Enabled = false; + lblResponsibilityUser.Enabled = false; + lblProposeUser.Enabled = false; + lblGeneraUser.Enabled = false; + lblSupervisionUser.Enabled = false; + lblOwnerUser.Enabled = false; + lblDecisionIsClose.Enabled = false; + txtConfirmDesc.Enabled = false; + } + } + + /// + /// 默认绑定 + /// + public void PageInit() + { + QuestionEditImg = 0; + var query = from a in Funs.DB.PreRun_SubThreeChecksFourDecision + join b in Funs.DB.Base_Project on a.ProjectId equals b.ProjectId + join c in Funs.DB.Base_Unit on a.ResponsibilityUnit equals c.UnitId + join d in Funs.DB.Sys_User on a.ResponsibilityUser equals d.UserId + join e in Funs.DB.Sys_User on a.ProposeUser equals e.UserId + join f in Funs.DB.Sys_User on a.GeneraUser equals f.UserId + join g in Funs.DB.Sys_User on a.SupervisionUser equals g.UserId + join h in Funs.DB.Sys_User on a.OwnerUser equals h.UserId + where a.DecisionId == this.DecisionId + select new + { + a.DecisionId, + a.ProjectId, + b.ProjectName, + a.ResponsibilityUnit, + ResponsibilityUnitName = c.UnitName, + a.ResponsibilityUser, + ResponsibilityUserName = d.UserName, + a.ProposeUser, + ProposeUserName = e.UserName, + a.GeneraUser, + GeneraUserName = f.UserName, + a.SupervisionUser, + SupervisionUserName = g.UserName, + a.OwnerUser, + OwnerUserName = h.UserName, + a.QuestionDesc, + a.Level, + a.Speciality, + a.AskDestructionTime, + a.RealityDestructionTime, + a.RestrictCondition, + a.DecisionIsClose, + DecisionIsCloseName = a.DecisionIsClose == 1 ? "已关闭" : "未关闭" + }; + var model = query.FirstOrDefault(); + if (model != null) + { + lblProjectName.Text = model.ProjectName; + lblResponsibilityUnit.Text = model.ResponsibilityUnitName; + lblQuestionDesc.Text = model.QuestionDesc; + lblRestrictCondition.Text = model.RestrictCondition; + lblLevel.Text = model.Level; + lblSpeciality.Text = model.Speciality; + lblAskDestructionTime.Text = model.AskDestructionTime.Value != null ? model.AskDestructionTime.Value.ToString("yyyy-MM-dd") : string.Empty; + lblRealityDestructionTime.Text = model.RealityDestructionTime != null ? model.RealityDestructionTime.Value.ToString("yyyy-MM-dd") : string.Empty; + lblResponsibilityUser.Text = model.ResponsibilityUserName; + lblProposeUser.Text = model.ProposeUserName; + lblGeneraUser.Text = model.GeneraUserName; + lblSupervisionUser.Text = model.SupervisionUserName; + lblOwnerUser.Text = model.OwnerUserName; + lblDecisionIsClose.Text = model.DecisionIsCloseName; + } + } + + /// + /// 问题图片查看 + /// + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.DecisionId + "q", Const.InspectTailTerm))); + } + + /// + /// 退回 + /// + protected void btnReturn_Click(object sender, EventArgs e) + { + var decisionModel = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == this.DecisionId); + if (decisionModel != null) + { + decisionModel.ResponsibilityProposeSatate = 2; + var model = new PreRun_DecisionConfirmRecords(); + model.ConfirmId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.DecisionId = this.DecisionId; + model.ConfirmDesc = txtConfirmDesc.Text; + model.ConfirmTime = DateTime.Now; + model.ConfirmUser = this.CurrUser.UserId; + model.ConfirmType = 1; + model.ConfirmState = 2; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.PreRun_DecisionConfirmRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("退回成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 确认并提交责任人确认 + /// + protected void btnSave_Click(object sender, EventArgs e) + { + var decisionModel = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == this.DecisionId); + if (decisionModel != null) + { + decisionModel.ResponsibilityProposeSatate = 3; + decisionModel.ProposeHandleData = DateTime.Now; + var model = new PreRun_DecisionConfirmRecords(); + model.ConfirmId = Guid.NewGuid().ToString(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.DecisionId = this.DecisionId; + model.ConfirmDesc = txtConfirmDesc.Text; + model.ConfirmTime = DateTime.Now; + model.ConfirmUser = this.CurrUser.UserId; + model.ConfirmType = 1; + model.ConfirmState = 1; + model.AddUser = this.CurrUser.UserId; + model.AddTime = DateTime.Now; + Funs.DB.PreRun_DecisionConfirmRecords.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + ShowNotify("确认并提交责任人确认成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } + + /// + /// 关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx.designer.cs new file mode 100644 index 00000000..f8e2fbc9 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionProposerHandleEdit.aspx.designer.cs @@ -0,0 +1,260 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.BeforeTestRun +{ + + + public partial class FourDecisionProposerHandleEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lblProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProjectName; + + /// + /// lblResponsibilityUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblResponsibilityUnit; + + /// + /// lblQuestionDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblQuestionDesc; + + /// + /// lblRestrictCondition 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRestrictCondition; + + /// + /// lblLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblLevel; + + /// + /// lblSpeciality 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblSpeciality; + + /// + /// lblAskDestructionTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAskDestructionTime; + + /// + /// lblRealityDestructionTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblRealityDestructionTime; + + /// + /// lblResponsibilityUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblResponsibilityUser; + + /// + /// lblProposeUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblProposeUser; + + /// + /// lblGeneraUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblGeneraUser; + + /// + /// lblSupervisionUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblSupervisionUser; + + /// + /// lblOwnerUser 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblOwnerUser; + + /// + /// lblDecisionIsClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblDecisionIsClose; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// imgBtnQuestionFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// txtConfirmDesc 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtConfirmDesc; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnReturn 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReturn; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx index e5b101f6..b605a0b3 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx @@ -44,11 +44,12 @@ - + - - - + + + + @@ -79,8 +80,8 @@ - - + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx.cs index 425dd9b4..e9de8c19 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx.cs @@ -44,7 +44,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun rootNode.ToolTip = ""; rootNode.EnableClickEvent = true; this.tvControlItem.Nodes.Add(rootNode); - var decisions = Funs.DB.PreRun_SubThreeChecksFourDecision.Where(x => x.ResponsibilityUser == this.CurrUser.UserId && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); + int[] state = { 3, 4, 5, 6 }; + var decisions = Funs.DB.PreRun_SubThreeChecksFourDecision.Where(x => x.ResponsibilityUser == this.CurrUser.UserId && state.Contains(x.ResponsibilityProposeSatate.Value) && x.ProjectId == this.CurrUser.LoginProjectId).ToList(); if (decisions.Count == 0) return; //获取子系统主键 var subsystemids = decisions.ConvertAll(x => x.SubSystemId); @@ -114,16 +115,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// public void BindGrid() { - string strSql = @"select a.DecisionId,a.ProjectId,a.SubSystemId,a.ProposeUser,puser.UserName as ProposeUserName,a.ResponsibilityUser,ruser.UserName as ResponsibilityUserName,a.ResponsibilityUnit,unit.UnitName as ResponsibilityUnitName,a.QuestionDesc,a.Level,a.Speciality,a.AskDestructionTime,a.RealityDestructionTime,a.RestrictCondition,a.ResponsibilityConfirm,(case a.ResponsibilityConfirm when 0 then '待提交' when 1 then '未确认' when 2 then '确认退回' when 3 then '确认通过' else '待提交' end) as ResponsibilityConfirmName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.GeneraConfirm,(case a.GeneraConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as GeneraConfirmName,a.SupervisionConfirm,(case a.SupervisionConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as SupervisionConfirmName,a.OwnerConfirm,(case a.OwnerConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as OwnerConfirmName,a.ProposeConfirmData,a.ResponsibilityConfirmData,a.GeneraConfirmData,a.SupervisionConfirmData,a.OwnerConfirmData,a.DecisionIsClose,(case a.DecisionIsClose when 1 then '已关闭' else '未关闭' end) as DecisionIsCloseName,(case ISNULL(a.AskDestructionTime,'') when '' then 0 else DATEDIFF(DAY, GETDATE(),a.AskDestructionTime) end) as DestructionDiffDay,a.AddUser,a.AddTime,a.Sort from PreRun_SubThreeChecksFourDecision as a left join Sys_User as puser on a.ProposeUser=puser.UserId left join Sys_User as ruser on a.ResponsibilityUser=ruser.UserId left join Base_Unit as unit on a.ResponsibilityUnit=unit.UnitId where 1=1 and a.SubSystemId=@SubSystemId and a.ProjectId=@ProjectId and a.ResponsibilityUser=@ResponsibilityUser and a.ResponsibilityConfirm>0 "; + string strSql = @"select a.DecisionId,a.ProjectId,a.SubSystemId,a.ProposeUser,puser.UserName as ProposeUserName,a.ResponsibilityUser,ruser.UserName as ResponsibilityUserName,a.ResponsibilityUnit,unit.UnitName as ResponsibilityUnitName,a.QuestionDesc,a.Level,a.Speciality,a.AskDestructionTime,a.RealityDestructionTime,a.RestrictCondition,a.ResponsibilityProposeSatate,(case a.ResponsibilityProposeSatate when 0 then '待提交' when 1 then '提出人待处理' when 2 then '提出人处理退回' when 3 then '责任人待确认' when 4 then '责任人退回' when 5 then '责任人通过提出人待处理' when 6 then '提出人退回' when 7 then '提出人确认通过' else '' end) as ResponsibilityProposeSatateName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.ResponsibilityConfirm,(case a.ResponsibilityConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ResponsibilityConfirmName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.GeneraConfirm,(case a.GeneraConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as GeneraConfirmName,a.SupervisionConfirm,(case a.SupervisionConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as SupervisionConfirmName,a.OwnerConfirm,(case a.OwnerConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as OwnerConfirmName,a.ProposeConfirmData,a.ResponsibilityConfirmData,a.GeneraConfirmData,a.SupervisionConfirmData,a.OwnerConfirmData,a.DecisionIsClose,(case a.DecisionIsClose when 1 then '已关闭' else '未关闭' end) as DecisionIsCloseName,(case ISNULL(a.AskDestructionTime,'') when '' then 0 else DATEDIFF(DAY, GETDATE(),a.AskDestructionTime) end) as DestructionDiffDay,a.AddUser,a.AddTime,a.Sort from PreRun_SubThreeChecksFourDecision as a left join Sys_User as puser on a.ProposeUser=puser.UserId left join Sys_User as ruser on a.ResponsibilityUser=ruser.UserId left join Base_Unit as unit on a.ResponsibilityUnit=unit.UnitId where 1=1 and a.SubSystemId=@SubSystemId and a.ProjectId=@ProjectId and a.ResponsibilityUser=@ResponsibilityUser and a.ResponsibilityProposeSatate in (3,4,5,6) "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@SubSystemId", this.SsubSystemId)); listStr.Add(new SqlParameter("@ResponsibilityUser", this.CurrUser.UserId)); - //是否确认 - if (!string.IsNullOrWhiteSpace(ddlResponsibilityConfirm.SelectedValue)) + //提出人/责任人处理状态 + if (!string.IsNullOrWhiteSpace(ddlResponsibilityProposeSatate.SelectedValue)) { - strSql += " and a.ResponsibilityConfirm=@ResponsibilityConfirm"; - listStr.Add(new SqlParameter("@ResponsibilityConfirm", ddlResponsibilityConfirm.SelectedValue)); + strSql += " and a.ResponsibilityProposeSatate=@ResponsibilityProposeSatate"; + listStr.Add(new SqlParameter("@ResponsibilityProposeSatate", ddlResponsibilityProposeSatate.SelectedValue)); } //是否关闭 if (!string.IsNullOrWhiteSpace(ddlDecisionState.Text)) @@ -216,9 +217,10 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun var model = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == Grid1.SelectedRowID); if (model != null) { - if (model.ResponsibilityConfirm != 1) + int[] arr = { 3, 6 }; + if (!arr.Contains(model.ResponsibilityProposeSatate.Value)) { - Alert.ShowInTop("责任人“未确认”才可进行责任人确认操作！", MessageBoxIcon.Warning); + Alert.ShowInTop("仅“责任人待确认”和“提出人退回”状态才可进行责任人确认！", MessageBoxIcon.Warning); return; } } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx.designer.cs index 84f59230..e6a0b71b 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx.designer.cs @@ -78,13 +78,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun protected global::FineUIPro.Toolbar Toolbar3; /// - /// ddlResponsibilityConfirm 控件。 + /// ddlResponsibilityProposeSatate 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList ddlResponsibilityConfirm; + protected global::FineUIPro.DropDownList ddlResponsibilityProposeSatate; /// /// ddlDecisionState 控件。 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx index 9a3cc857..6b8af23f 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx @@ -106,7 +106,7 @@ - + @@ -114,6 +114,30 @@ + + + + + + + + + + + + + + + + + + + + + @@ -122,7 +146,7 @@ - + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx.cs index 6713554e..916f66b2 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx.cs @@ -2,6 +2,8 @@ using Model; using System; using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; using System.Linq; using System.Web; using System.Web.UI; @@ -29,7 +31,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun set { ViewState["IsView"] = value; } } - /// /// 问题图片是否可编辑 /// @@ -55,6 +56,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]); //数据绑定 PageInit(); + //提出人处理 + gvDataBrid(); //判断是否查看 if (IsView) { @@ -141,6 +144,22 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } } + /// + /// 提出人处理 + /// + public void gvDataBrid() + { + string strSql = @"select a.ConfirmId,a.ProjectId,a.DecisionId,a.ConfirmDesc,a.ConfirmTime,a.ConfirmUser,b.UserName as ConfirmUserName,a.ConfirmType,(case a.ConfirmType when 1 then '提出人处理' when 2 then '责任人确认' when 3 then '提出人确认' when 4 then '总包确认' when 5 then '监理确认' when 6 then '业主确认' else '' end) as ConfirmTypeName,a.ConfirmState,(case a.ConfirmState when 1 then '处理通过' when 2 then '处理退回' else '' end) as ConfirmStateName,a.AddUser,a.AddTime from PreRun_DecisionConfirmRecords as a left join Sys_User as b on a.ConfirmUser=b.UserId where a.ProjectId=@ProjectId and a.DecisionId=@DecisionId and a.ConfirmType=1"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@DecisionId", this.DecisionId)); + strSql += " order by a.AddTime asc"; + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + gvTcrcl.DataSource = tb; + gvTcrcl.DataBind(); + } + /// /// 问题图片查看 /// @@ -165,7 +184,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun var decisionModel = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == this.DecisionId); if (decisionModel != null) { - decisionModel.ResponsibilityConfirm = 2; + decisionModel.ResponsibilityConfirm = 1; + decisionModel.ResponsibilityProposeSatate = 4; var model = new PreRun_DecisionConfirmRecords(); model.ConfirmId = Guid.NewGuid().ToString(); model.ProjectId = this.CurrUser.LoginProjectId; @@ -173,7 +193,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.ConfirmDesc = txtConfirmDesc.Text; model.ConfirmTime = DateTime.Now; model.ConfirmUser = this.CurrUser.UserId; - model.ConfirmType = 1; + model.ConfirmType = 2; model.ConfirmState = 2; model.AddUser = this.CurrUser.UserId; model.AddTime = DateTime.Now; @@ -185,14 +205,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } /// - /// 确认通过 + /// 销项完成 /// protected void btnPass_Click(object sender, EventArgs e) { var decisionModel = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == this.DecisionId); if (decisionModel != null) { - decisionModel.ResponsibilityConfirm = 3; + decisionModel.ResponsibilityProposeSatate = 5; + decisionModel.ResponsibilityConfirm = 2; decisionModel.ResponsibilityConfirmData = DateTime.Now; var model = new PreRun_DecisionConfirmRecords(); model.ConfirmId = Guid.NewGuid().ToString(); @@ -201,7 +222,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.ConfirmDesc = txtConfirmDesc.Text; model.ConfirmTime = DateTime.Now; model.ConfirmUser = this.CurrUser.UserId; - model.ConfirmType = 1; + model.ConfirmType = 2; model.ConfirmState = 1; model.AddUser = this.CurrUser.UserId; model.AddTime = DateTime.Now; diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx.designer.cs index 0e212674..afdc6679 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/FourDecisionResponsibilityConfirmEdit.aspx.designer.cs @@ -239,6 +239,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.TextArea txtConfirmDesc; + /// + /// plApprove2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove2; + + /// + /// gvTcrcl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvTcrcl; + /// /// Toolbar1 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs index 7eb0f993..c7a83fa4 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs @@ -51,7 +51,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx.cs index 555ae203..cb6cc7bb 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs index ccbefcce..d15b1ba0 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementation.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementation.aspx index 35750233..b17a03ac 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementation.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementation.aspx @@ -84,8 +84,8 @@ - - + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementationList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementationList.aspx.cs index a317c5dc..43134eb5 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementationList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementationList.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx index 72eb85e4..494cbc42 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx @@ -10,6 +10,10 @@ white-space: normal; word-break: break-all; } + .customlabel span { + color: red; + font-weight: bold; + } @@ -29,6 +33,15 @@ + + + + + + + + + @@ -176,6 +189,16 @@ return valid; } + var basePath = '<%= PageContext.ResolveUrl("~/") %>'; + function openHelloFineUI() { + parent.addExampleTab({ + id: 'fnode46', + iframeUrl: basePath + 'TestRun/BeforeTestRun/TestRunRecordUploadList.aspx', + title: '试车记录上传', + refreshWhenExist: true + }); + } + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs index 8419b5c8..88d4ed68 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs @@ -18,6 +18,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { if (!IsPostBack) { + Toolbar3.Hidden = true; this.InitTreeMenu();//加载树 PageInit(); } @@ -42,6 +43,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun join b in Funs.DB.PreRun_SubSysWorkPackage on a.PreRunId equals b.SubSystemId join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId where a.ProjectId == this.CurrUser.LoginProjectId + orderby a.Sort, a.PreRunLevel ascending select new { a.PreRunId, a.SystemId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName, b.WorkPackCode }; if (list.Count() > 0) @@ -50,7 +52,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun var workPackIds = list.Select(x => x.WorkPackId).ToList(); var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 @@ -183,6 +185,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last(); } + var workPage = Funs.DB.PreRun_WorkPackage.FirstOrDefault(x => x.WorkPackId == workPackId); + if (workPage.SpecialWorkPack == 0) + { + Toolbar3.Hidden = true; + } + else + { + Toolbar3.Hidden = false; + } if (typechange) { var propertyTechnologyIds = string.Empty; @@ -201,7 +212,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (inspectItems.Count > 0) propertyTechnologyIds = string.Join(",", inspectItems.ConvertAll(x => x.PropertyTechnologyId)); - var workPage = Funs.DB.PreRun_WorkPackage.FirstOrDefault(x => x.WorkPackId == workPackId); if (workPage != null) { //加载类型 @@ -817,6 +827,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } else { + ddbSysPiping.Values = null; + ddbSysPiping.Texts = null; cbSysPiping.Items.Clear(); cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); } @@ -871,6 +883,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } else { + ddbSysPiping.Values = null; + ddbSysPiping.Texts = null; cbSysPiping.Items.Clear(); cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); } @@ -925,6 +939,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } else { + ddbSysPiping.Values = null; + ddbSysPiping.Texts = null; cbSysPiping.Items.Clear(); cbSysPiping.Items.Insert(0, new CheckItem("==无数据==", "")); } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs index c3219fca..8d920894 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs @@ -68,6 +68,33 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.Grid Grid1; + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// lblbz 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblbz; + + /// + /// Button1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button Button1; + /// /// Toolbar1 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx.cs index 236813d9..16eab5cf 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubSysWorkPackage.aspx.cs @@ -246,6 +246,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun }; if (data.Count() > 0) { + int num = 1; int i = 1; foreach (var item in data.OrderBy(p => p.Sort)) { @@ -255,7 +256,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.SystemId = item.SystemId; if (string.IsNullOrWhiteSpace(item.WorkPackCode)) { - var num = Funs.DB.PreRun_SubSysWorkPackage.Count(p => p.SystemId == this.SystemId) + i; + var workpackages = Funs.DB.TestRun_SubSysWorkPackage.Where(p => p.SystemId == this.SystemId).ToList(); + if (workpackages.Count > 0) + { + num = workpackages.ConvertAll(x => int.Parse(x.WorkPackCode.Replace("WP", ""))).Max(m => m); + } + num = num + i; model.WorkPackCode = $"WP{string.Format("{0:d3}", num)}"; i++; } diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx index 876d8b12..4e5330f3 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx @@ -100,9 +100,18 @@ - - + + + + + + + + + + @@ -112,8 +121,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx.cs index c724a66c..a14738c1 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx.cs @@ -81,7 +81,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { QuestionEditImg = 0; //施工单位 - UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlResponsibilityUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_1, false); + UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlResponsibilityUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); //获取人员信息 var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId @@ -156,31 +156,49 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// public void gvDataBrid() { - string strSql = @"select a.ConfirmId,a.ProjectId,a.DecisionId,a.ConfirmDesc,a.ConfirmTime,a.ConfirmUser,b.UserName as ConfirmUserName,a.ConfirmType,(case a.ConfirmType when 1 then '责任人确认' when 2 then '提出人确认' when 3 then '总包确认' when 4 then '监理确认' when 5 then '业主确认' else '' end) as ConfirmTypeName,a.ConfirmState,(case a.ConfirmState when 1 then '确认通过' when 2 then '确认退回' else '' end) as ConfirmStateName,a.AddUser,a.AddTime from PreRun_DecisionConfirmRecords as a left join Sys_User as b on a.ConfirmUser=b.UserId where a.ProjectId=@ProjectId and a.DecisionId=@DecisionId "; + string strSql = @"select a.ConfirmId,a.ProjectId,a.DecisionId,a.ConfirmDesc,a.ConfirmTime,a.ConfirmUser,b.UserName as ConfirmUserName,a.ConfirmType,(case a.ConfirmType when 1 then '提出人处理' when 2 then '责任人确认' when 3 then '提出人确认' when 4 then '总包确认' when 5 then '监理确认' when 6 then '业主确认' else '' end) as ConfirmTypeName,a.ConfirmState,(case a.ConfirmState when 1 then '确认通过' when 2 then '确认退回' else '' end) as ConfirmStateName,a.AddUser,a.AddTime from PreRun_DecisionConfirmRecords as a left join Sys_User as b on a.ConfirmUser=b.UserId where a.ProjectId=@ProjectId and a.DecisionId=@DecisionId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@DecisionId", this.DecisionId)); strSql += " order by a.AddTime asc"; SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + //提出人处理 + var tcrclTb = tb.AsEnumerable().Where(row => row.Field("ConfirmType") == 1); + gvTcrcl.DataSource = tcrclTb; + gvTcrcl.DataBind(); + //提出人确认 + var tcrqrTb = tb.AsEnumerable().Where(row => row.Field("ConfirmType") == 3); + gvTcrqr.DataSource = tcrqrTb; + gvTcrqr.DataBind(); //责任人确认 - var handleTb = tb.AsEnumerable().Where(row => row.Field("ConfirmType") == 1); - gvZrrConfirm.DataSource = handleTb; + var zrrqrTb = tb.AsEnumerable().Where(row => row.Field("ConfirmType") == 2); + gvZrrConfirm.DataSource = zrrqrTb; gvZrrConfirm.DataBind(); //其他人员确认 - var approveTb = tb.AsEnumerable().Where(row => row.Field("ConfirmType") != 1); + int[] type = { 4, 5, 6 }; + var approveTb = tb.AsEnumerable().Where(row => type.Contains(row.Field("ConfirmType"))); gvOtherConfirm.DataSource = approveTb; gvOtherConfirm.DataBind(); } /// - /// 问题图片 + /// 问题图片查看 /// - protected void BtnQuestionFile_Click(object sender, EventArgs e) + protected void imgBtnQuestionFile_Click(object sender, EventArgs e) { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.DecisionId + "q", Const.InspectTailTerm))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CheckControl&menuId={1}", this.DecisionId + "q", Const.InspectTailTerm))); } + /// + /// 整改图片查看 + /// + protected void imgBtnRectifyFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CheckControl&menuId={1}", this.DecisionId + "h", Const.InspectTailTerm))); + } + + /// /// 保存 /// @@ -238,7 +256,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.RestrictCondition = txtRestrictCondition.Text; model.AddUser = this.CurrUser.LoginProjectId; model.AddTime = DateTime.Now; - model.ResponsibilityConfirm = 0; + model.ResponsibilityProposeSatate = 0; if (isAdd) { Funs.DB.PreRun_SubThreeChecksFourDecision.InsertOnSubmit(model); @@ -249,7 +267,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } /// - /// 保存并提交 + /// 保存并提交提出人处理 /// protected void btnSubmit_Click(object sender, EventArgs e) { @@ -305,7 +323,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.RestrictCondition = txtRestrictCondition.Text; model.AddUser = this.CurrUser.LoginProjectId; model.AddTime = DateTime.Now; - model.ResponsibilityConfirm = 1; + model.ResponsibilityProposeSatate = 1; if (isAdd) { Funs.DB.PreRun_SubThreeChecksFourDecision.InsertOnSubmit(model); diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx.designer.cs index dc0e46a0..a24a4990 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionEdit.aspx.designer.cs @@ -195,13 +195,58 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun protected global::FineUIPro.Panel Panel1; /// - /// BtnQuestionFile 控件。 + /// imgBtnQuestionFile 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button BtnQuestionFile; + protected global::FineUIPro.Button imgBtnQuestionFile; + + /// + /// Panel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel2; + + /// + /// lblAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblAttach; + + /// + /// imgBtnRectifyFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button imgBtnRectifyFile; + + /// + /// plApprove1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove1; + + /// + /// gvTcrcl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvTcrcl; /// /// plApprove2 控件。 @@ -213,13 +258,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun protected global::FineUIPro.FormRow plApprove2; /// - /// gvZrrConfirm 控件。 + /// gvTcrqr 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Grid gvZrrConfirm; + protected global::FineUIPro.Grid gvTcrqr; /// /// plApprove3 控件。 @@ -230,6 +275,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.FormRow plApprove3; + /// + /// gvZrrConfirm 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvZrrConfirm; + + /// + /// plApprove4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FormRow plApprove4; + /// /// gvOtherConfirm 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx index 03682da6..19bca928 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx @@ -41,7 +41,7 @@ - + @@ -52,16 +52,16 @@ - + - - - - - - - - + + + + + + + + @@ -94,13 +94,14 @@ - - + + - + + @@ -117,9 +118,7 @@ - - - + @@ -132,7 +131,7 @@ - + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx.cs index fc700cf2..3464080a 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx.cs @@ -100,21 +100,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// public void BindGrid() { - string strSql = @"select a.DecisionId,a.ProjectId,a.SubSystemId,a.ProposeUser,puser.UserName as ProposeUserName,a.ResponsibilityUser,ruser.UserName as ResponsibilityUserName,a.ResponsibilityUnit,unit.UnitName as ResponsibilityUnitName,a.QuestionDesc,a.Level,a.Speciality,a.AskDestructionTime,a.RealityDestructionTime,a.RestrictCondition,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.ResponsibilityConfirm,(case a.ResponsibilityConfirm when 0 then '待提交' when 1 then '未确认' when 2 then '确认退回' when 3 then '确认通过' else '待提交' end) as ResponsibilityConfirmName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.GeneraConfirm,(case a.GeneraConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as GeneraConfirmName,a.SupervisionConfirm,(case a.SupervisionConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as SupervisionConfirmName,a.OwnerConfirm,(case a.OwnerConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as OwnerConfirmName,a.ProposeConfirmData,a.ResponsibilityConfirmData,a.GeneraConfirmData,a.SupervisionConfirmData,a.OwnerConfirmData,a.DecisionIsClose,(case a.DecisionIsClose when 1 then '已关闭' else '未关闭' end) as DecisionIsCloseName,(case ISNULL(a.AskDestructionTime,'') when '' then 0 else DATEDIFF(DAY, GETDATE(),a.AskDestructionTime) end) as DestructionDiffDay,a.DecisionIsClose,a.AddUser,a.AddTime,a.Sort from PreRun_SubThreeChecksFourDecision as a left join Sys_User as puser on a.ProposeUser=puser.UserId left join Sys_User as ruser on a.ResponsibilityUser=ruser.UserId left join Base_Unit as unit on a.ResponsibilityUnit=unit.UnitId where 1=1 and a.SubSystemId=@SubSystemId and a.ProjectId=@ProjectId"; + string strSql = @"select a.DecisionId,a.ProjectId,a.SubSystemId,a.ProposeUser,puser.UserName as ProposeUserName,a.ResponsibilityUser,ruser.UserName as ResponsibilityUserName,a.ResponsibilityUnit,unit.UnitName as ResponsibilityUnitName,a.QuestionDesc,a.Level,a.Speciality,a.AskDestructionTime,a.RealityDestructionTime,a.RestrictCondition,a.ResponsibilityProposeSatate,(case a.ResponsibilityProposeSatate when 0 then '待提交' when 1 then '提出人待处理' when 2 then '提出人处理退回' when 3 then '责任人待确认' when 4 then '责任人退回' when 5 then '责任人通过提出人待处理' when 6 then '提出人退回' when 7 then '提出人确认通过' else '' end) as ResponsibilityProposeSatateName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.ResponsibilityConfirm,(case a.ResponsibilityConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ResponsibilityConfirmName,a.ProposeConfirm,(case a.ProposeConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as ProposeConfirmName,a.GeneraConfirm,(case a.GeneraConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as GeneraConfirmName,a.SupervisionConfirm,(case a.SupervisionConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as SupervisionConfirmName,a.OwnerConfirm,(case a.OwnerConfirm when 1 then '未确认' when 2 then '确认通过' else '' end) as OwnerConfirmName,a.ProposeConfirmData,a.ResponsibilityConfirmData,a.GeneraConfirmData,a.SupervisionConfirmData,a.OwnerConfirmData,a.DecisionIsClose,(case a.DecisionIsClose when 1 then '已关闭' else '未关闭' end) as DecisionIsCloseName,(case ISNULL(a.AskDestructionTime,'') when '' then 0 else DATEDIFF(DAY, GETDATE(),a.AskDestructionTime) end) as DestructionDiffDay,a.DecisionIsClose,a.AddUser,a.AddTime,a.Sort,a.FourDecisionCode from PreRun_SubThreeChecksFourDecision as a left join Sys_User as puser on a.ProposeUser=puser.UserId left join Sys_User as ruser on a.ResponsibilityUser=ruser.UserId left join Base_Unit as unit on a.ResponsibilityUnit=unit.UnitId where 1=1 and a.SubSystemId=@SubSystemId and a.ProjectId=@ProjectId"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@SubSystemId", this.SsubSystemId)); - //责任人是否确认 - if (!string.IsNullOrWhiteSpace(ddlResponsibilityConfirm.SelectedValue)) + //提出人/责任人处理状态 + if (!string.IsNullOrWhiteSpace(ddlResponsibilityProposeSatate.SelectedValue)) { - strSql += " and isnull(a.ResponsibilityConfirm,1)=@ResponsibilityConfirm"; - listStr.Add(new SqlParameter("@ResponsibilityConfirm", ddlResponsibilityConfirm.SelectedValue)); - } - //提出人是否确认 - if (!string.IsNullOrWhiteSpace(ddlProposeConfirm.SelectedValue)) - { - strSql += " and isnull(a.ProposeConfirm,1)=@ProposeConfirm"; - listStr.Add(new SqlParameter("@ProposeConfirm", ddlProposeConfirm.SelectedValue)); + strSql += " and isnull(a.ResponsibilityProposeSatate,0)=@ResponsibilityProposeSatate"; + listStr.Add(new SqlParameter("@ResponsibilityProposeSatate", ddlResponsibilityProposeSatate.SelectedValue)); } //总包是否确认 if (!string.IsNullOrWhiteSpace(ddlGeneraConfirm.SelectedValue)) @@ -140,7 +134,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun strSql += " and isnull(a.DecisionIsClose,0)=@DecisionIsClose"; listStr.Add(new SqlParameter("@DecisionIsClose", ddlDecisionState.SelectedValue)); } - strSql += " order by a.AddTime desc"; + strSql += " order by a.Sort asc "; SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; @@ -193,7 +187,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun int diffDay = Convert.ToInt32(row["DestructionDiffDay"]); TemplateField AdjustDiffDay = Grid1.FindColumn("DestructionDiffDay") as TemplateField; int isClose = int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString()); - if (isClose != 1) + if (isClose != 1 && !string.IsNullOrWhiteSpace(row["AskDestructionTime"].ToString())) { if (diffDay > 0) { @@ -244,7 +238,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (model != null) { var states = new List() { 0, 2 }; - if (!states.Contains(model.ResponsibilityConfirm.Value)) + if (!states.Contains(model.ResponsibilityProposeSatate.Value)) { Alert.ShowInTop("责任人“待提交”和“确认退回”才可进行编辑操作！", MessageBoxIcon.Warning); return; @@ -326,9 +320,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } /// - /// 提交责任人确认 + /// 提交提出人处理 /// - protected void btnSubmitConfirm_Click(object sender, EventArgs e) + protected void btnSubmitHandle_Click(object sender, EventArgs e) { if (Grid1.SelectedRowIndexArray.Length == 0) { @@ -338,17 +332,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun var model = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == Grid1.SelectedRowID); if (model != null) { - if (model.ResponsibilityConfirm == 1) + int state = model.ResponsibilityProposeSatate == null ? 0 : model.ResponsibilityProposeSatate.Value; + int[] stateArr = { 0, 2 }; + if (stateArr.Contains(state)) { - Alert.ShowInTop("责任人未确认状态，无法提交！", MessageBoxIcon.Warning); + Alert.ShowInTop("仅“待提交”和“提出人处理退回”状态才可提交提出人处理！", MessageBoxIcon.Warning); return; } - if (model.ResponsibilityConfirm == 3) - { - Alert.ShowInTop("责任人确认通过，无法提交！", MessageBoxIcon.Warning); - return; - } - model.ResponsibilityConfirm = 1; + model.ResponsibilityProposeSatate = 1; Funs.DB.SubmitChanges(); BindGrid(); Alert.ShowInTop("确认成功！", MessageBoxIcon.Success); @@ -356,7 +347,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } /// - /// 取消提出人确认 + /// 取消提出人处理 /// protected void btnWithdraw_Click(object sender, EventArgs e) { @@ -368,9 +359,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun var model = Funs.DB.PreRun_SubThreeChecksFourDecision.FirstOrDefault(x => x.DecisionId == Grid1.SelectedRowID); if (model != null) { - if (model.ResponsibilityConfirm != 1) + if (model.ResponsibilityProposeSatate == 1) { - Alert.ShowInTop("仅责任人未确认状态才可撤回！", MessageBoxIcon.Warning); + Alert.ShowInTop("仅提出人待处理状态才可撤回！", MessageBoxIcon.Warning); return; } model.ProposeConfirm = 0; @@ -486,7 +477,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun List users = userNames.Count > 0 ? Funs.DB.Sys_User.Where(x => userNames.Contains(x.UserName)).ToList() : new List(); var baseUserNames = users.ConvertAll(x => x.UserName); //获取责任单位 - List units = responsibilityUnitNames.Count > 0 ? Funs.DB.Base_Unit.Where(x => responsibilityUnitNames.Contains(x.UnitName)).ToList() : new List(); + List units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2); #region 验证人员和单位 //验证责任人 @@ -555,11 +546,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } #endregion - //获取已存在的尾项清单 var existDecisions = Funs.DB.PreRun_SubThreeChecksFourDecision.Where(x => x.SubSystemId == tvControlItem.SelectedNodeID && questions.Contains(x.QuestionDesc)).ToList(); if (existDecisions == null) existDecisions = new List(); List list = new List(); + int sortnum = Funs.DB.PreRun_SubThreeChecksFourDecision.Count(x => x.SubSystemId == tvControlItem.SelectedNodeID); //数据导入 for (int i = 5; i < ds.Tables[0].Rows.Count; i++) { @@ -570,14 +561,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun updatemodel.Level = ds.Tables[0].Rows[i][4].ToString(); updatemodel.Speciality = ds.Tables[0].Rows[i][5].ToString(); updatemodel.AskDestructionTime = TimeVal(ds.Tables[0].Rows[i][6].ToString()); - if (updatemodel.ResponsibilityConfirm == 0) + if (!string.IsNullOrWhiteSpace(ds.Tables[0].Rows[i][7].ToString())) { - if (!string.IsNullOrWhiteSpace(ds.Tables[0].Rows[i][8].ToString())) - { - updatemodel.ResponsibilityUser = users.FirstOrDefault(x => x.UserName == ds.Tables[0].Rows[i][8].ToString()).UserId; - } + updatemodel.ResponsibilityUnit = units.FirstOrDefault(x => x.UnitName == ds.Tables[0].Rows[i][7].ToString()).UnitId; } - if (updatemodel.ProposeConfirm != 2) + int state = updatemodel.ResponsibilityProposeSatate == null ? 0 : updatemodel.ResponsibilityProposeSatate.Value; + if (state == 0) { if (!string.IsNullOrWhiteSpace(ds.Tables[0].Rows[i][2].ToString())) @@ -585,6 +574,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun updatemodel.ProposeUser = users.FirstOrDefault(x => x.UserName == ds.Tables[0].Rows[i][2].ToString()).UserId; } } + int[] responsibilityState = { 0, 1 }; + if (responsibilityState.Contains(state)) + { + if (!string.IsNullOrWhiteSpace(ds.Tables[0].Rows[i][8].ToString())) + { + updatemodel.ResponsibilityUser = users.FirstOrDefault(x => x.UserName == ds.Tables[0].Rows[i][8].ToString()).UserId; + } + } if (updatemodel.GeneraConfirm != 2) { @@ -614,6 +611,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } else { + sortnum++; PreRun_SubThreeChecksFourDecision model = new PreRun_SubThreeChecksFourDecision(); model.DecisionId = Guid.NewGuid().ToString(); model.ProjectId = this.CurrUser.LoginProjectId; @@ -648,11 +646,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.AskDestructionTime = TimeVal(ds.Tables[0].Rows[i][6].ToString()); model.RealityDestructionTime = TimeVal(ds.Tables[0].Rows[i][10].ToString()); model.RestrictCondition = ds.Tables[0].Rows[i][9].ToString(); - model.ResponsibilityConfirm = 0; + model.ResponsibilityProposeSatate = 0; model.DecisionIsClose = 0; model.AddUser = this.CurrUser.UserId; model.AddTime = DateTime.Now; - model.Sort = i - 4; + model.Sort = sortnum; + model.FourDecisionCode = $"PL_{string.Format("{0:d3}", model.Sort)}"; list.Add(model); } } @@ -737,8 +736,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// 是否逾期返回 /// /// - public string IsOverdue(object diffDayVal, object stateVal) + public string IsOverdue(object diffDayVal, object stateVal, object time) { + if (string.IsNullOrWhiteSpace(time.ToString())) return ""; var result = string.Empty; var diffDay = 0; var itemState = 0; @@ -810,6 +810,5 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun } #endregion - } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx.designer.cs index f70f03b7..4b132dff 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx.designer.cs @@ -105,22 +105,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun protected global::FineUIPro.Toolbar Toolbar1; /// - /// ddlProposeConfirm 控件。 + /// ddlResponsibilityProposeSatate 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList ddlProposeConfirm; - - /// - /// ddlResponsibilityConfirm 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList ddlResponsibilityConfirm; + protected global::FineUIPro.DropDownList ddlResponsibilityProposeSatate; /// /// ddlGeneraConfirm 控件。 @@ -222,13 +213,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun protected global::FineUIPro.Button btnView; /// - /// btnSubmitConfirm 控件。 + /// btnSubmitHandle 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnSubmitConfirm; + protected global::FineUIPro.Button btnSubmitHandle; /// /// btnWithdraw 控件。 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs index cb9f4361..519aca4a 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs @@ -51,7 +51,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx index d236fd72..90e230f0 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx @@ -92,7 +92,7 @@ - @@ -100,15 +100,14 @@ - + - @@ -116,13 +115,13 @@ - - @@ -132,7 +131,7 @@ - @@ -140,7 +139,7 @@ - @@ -148,13 +147,13 @@ - - @@ -168,7 +167,7 @@ - @@ -182,7 +181,7 @@ - @@ -192,7 +191,7 @@ - @@ -206,7 +205,7 @@ - @@ -216,7 +215,7 @@ - @@ -226,13 +225,13 @@ - - @@ -278,25 +277,25 @@ - - - - @@ -304,13 +303,13 @@ - - @@ -320,13 +319,13 @@ - - @@ -334,7 +333,7 @@ - @@ -380,44 +379,44 @@ - + - + - + - + - + - + - + - + @@ -426,7 +425,7 @@ - + @@ -435,14 +434,14 @@ - + - + @@ -503,7 +502,7 @@ - diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.cs index bf18e348..a5e541da 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.cs @@ -184,7 +184,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// public void ZxtgdBrid() { - string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId "; + string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId order by Sort asc"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@SystemId", this.tvControlItem.SelectedNodeID)); @@ -308,6 +308,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun ShowNotify("Excel模板格式不正确!", MessageBoxIcon.Warning); return; } + var sortnum = Funs.DB.PreRun_PropertySysPiping.Count(x => x.SystemId == tvControlItem.SelectedNodeID); List list = new List(); for (int i = 0; i < ds.Tables.Count; i++) { @@ -318,6 +319,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { if (string.IsNullOrWhiteSpace(itemTb.Rows[j][1].ToString()) || string.IsNullOrWhiteSpace(itemTb.Rows[j][8].ToString())) continue; PreRun_PropertySysPiping model = new PreRun_PropertySysPiping(); + sortnum++; model.PropertyId = Guid.NewGuid().ToString(); model.SystemId = tvControlItem.SelectedNodeID; model.ProjectId = this.CurrUser.LoginProjectId; @@ -339,7 +341,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.Remark = itemTb.Rows[j][53].ToString(); model.AddUser = this.CurrUser.UserId; model.AddTime = DateTime.Now; - model.Sort = list.Count; + model.Sort = sortnum; list.Add(model); } } @@ -469,7 +471,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// public void ZxtgyBrid() { - string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId "; + string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId order by Sort asc"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@SystemId", this.tvControlItem.SelectedNodeID)); @@ -595,6 +597,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun ShowNotify("Excel模板格式不正确!", MessageBoxIcon.Warning); return; } + var sortnum = Funs.DB.PreRun_TechnologySysPiping.Count(x => x.SystemId == tvControlItem.SelectedNodeID); List list = new List(); for (int i = 0; i < ds.Tables.Count; i++) { @@ -609,6 +612,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun PreRun_TechnologySysPiping model = new PreRun_TechnologySysPiping(); if (!string.IsNullOrWhiteSpace(itemTb.Rows[j][4].ToString())) { + sortnum++; model.TechnologyId = Guid.NewGuid().ToString(); model.SystemId = tvControlItem.SelectedNodeID; model.ProjectId = this.CurrUser.LoginProjectId; @@ -623,7 +627,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun model.Remark = itemTb.Rows[j][52].ToString(); model.AddUser = this.CurrUser.UserId; model.AddTime = DateTime.Now; - model.Sort = i - 1; + model.Sort = sortnum; list.Add(model); lastTagNumber = model.TagNumber; } @@ -1037,7 +1041,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var datatb = new DataTable(); var addTb = new DataTable(); - string strSql = @"select a.PropertyId,a.SystemId,a.ProjectId,a.PipingCode,a.Diameter,a.MaterialLevel,a.AdiabatType,a.AdiabatThickness,a.MediumState,a.DrawingNo,a.PipingStart,a.PipingEnd,a.PipingLevel,a.NormalTemperature,a.NormalPressure,a.DesignTemperature,a.DesignPressure,a.PaintLevel,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_PropertySysPiping as a inner join PreRun_SubPropertySelect as b on a.PropertyId=b.PropertyId where 1=1 and a.ProjectId=@ProjectId and b.SubSystemId=@SubSystemId "; + string strSql = @"select a.PropertyId,a.SystemId,a.ProjectId,a.PipingCode,a.Diameter,a.MaterialLevel,a.AdiabatType,a.AdiabatThickness,a.MediumState,a.DrawingNo,a.PipingStart,a.PipingEnd,a.PipingLevel,a.NormalTemperature,a.NormalPressure,a.DesignTemperature,a.DesignPressure,a.PaintLevel,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_PropertySysPiping as a inner join PreRun_SubPropertySelect as b on a.PropertyId=b.PropertyId where 1=1 and a.ProjectId=@ProjectId and b.SubSystemId=@SubSystemId order by a.Sort asc "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@SubSystemId", this.tvControlItem.SelectedNodeID)); @@ -1051,7 +1055,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (selectPropertys.Count > 0) { - var addtbRowSql = $"select a.PropertyId,a.SystemId,a.ProjectId,a.PipingCode,a.Diameter,a.MaterialLevel,a.AdiabatType,a.AdiabatThickness,a.MediumState,a.DrawingNo,a.PipingStart,a.PipingEnd,a.PipingLevel,a.NormalTemperature,a.NormalPressure,a.DesignTemperature,a.DesignPressure,a.PaintLevel,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_PropertySysPiping as a where 1=1 and a.PropertyId in ('{string.Join("','", selectPropertys)}')"; + var addtbRowSql = $"select a.PropertyId,a.SystemId,a.ProjectId,a.PipingCode,a.Diameter,a.MaterialLevel,a.AdiabatType,a.AdiabatThickness,a.MediumState,a.DrawingNo,a.PipingStart,a.PipingEnd,a.PipingLevel,a.NormalTemperature,a.NormalPressure,a.DesignTemperature,a.DesignPressure,a.PaintLevel,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_PropertySysPiping as a where 1=1 and a.PropertyId in ('{string.Join("','", selectPropertys)}') order by a.Sort asc "; addTb = SQLHelper.GetDataTableRunText(addtbRowSql); } } @@ -1175,7 +1179,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var datatb = new DataTable(); var addTb = new DataTable(); - string strSql = @"select a.TechnologyId,a.SystemId,a.ProjectId,a.TagNumber,a.NameSpecifications,a.DrawingNo,a.Materials,a.NumOperate,a.NumStandby,a.WeightSingle,a.WeightTotal,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_TechnologySysPiping as a inner join PreRun_SubTechnologySelect as b on a.TechnologyId=b.TechnologyId where 1=1 and a.ProjectId=@ProjectId and b.SubSystemId=@SubSystemId "; + string strSql = @"select a.TechnologyId,a.SystemId,a.ProjectId,a.TagNumber,a.NameSpecifications,a.DrawingNo,a.Materials,a.NumOperate,a.NumStandby,a.WeightSingle,a.WeightTotal,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_TechnologySysPiping as a inner join PreRun_SubTechnologySelect as b on a.TechnologyId=b.TechnologyId where 1=1 and a.ProjectId=@ProjectId and b.SubSystemId=@SubSystemId order by a.Sort asc"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@SubSystemId", this.tvControlItem.SelectedNodeID)); @@ -1188,7 +1192,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (existTechnologyIds.Count > 0) selectTechnologys.RemoveAll(a => existTechnologyIds.Contains(a)); if (selectTechnologys.Count > 0) { - var addtbRowSql = $"select a.TechnologyId,a.SystemId,a.ProjectId,a.TagNumber,a.NameSpecifications,a.DrawingNo,a.Materials,a.NumOperate,a.NumStandby,a.WeightSingle,a.WeightTotal,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_TechnologySysPiping as a where 1=1 and a.TechnologyId in ('{string.Join("','", selectTechnologys)}')"; + var addtbRowSql = $"select a.TechnologyId,a.SystemId,a.ProjectId,a.TagNumber,a.NameSpecifications,a.DrawingNo,a.Materials,a.NumOperate,a.NumStandby,a.WeightSingle,a.WeightTotal,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_TechnologySysPiping as a where 1=1 and a.TechnologyId in ('{string.Join("','", selectTechnologys)}') order by a.Sort asc"; addTb = SQLHelper.GetDataTableRunText(addtbRowSql); } } @@ -1304,7 +1308,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var datatb = new DataTable(); var addTb = new DataTable(); - string strSql = @"select a.InstrumentId,a.SystemId,a.ProjectId,a.InstrumentTag,a.UseTo,a.InstrumentName,a.Supplier,a.InstallationPosition,a.SignalType,a.AssociatedSystem,a.Cp25,a.In11,a.In40,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_InstrumentSysPiping as a inner join PreRun_SubInstrumentSelect as b on a.InstrumentId=b.InstrumentId where 1=1 and a.ProjectId=@ProjectId and b.SubSystemId=@SubSystemId "; + string strSql = @"select a.InstrumentId,a.SystemId,a.ProjectId,a.InstrumentTag,a.UseTo,a.InstrumentName,a.Supplier,a.InstallationPosition,a.SignalType,a.AssociatedSystem,a.Cp25,a.In11,a.In40,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_InstrumentSysPiping as a inner join PreRun_SubInstrumentSelect as b on a.InstrumentId=b.InstrumentId where 1=1 and a.ProjectId=@ProjectId and b.SubSystemId=@SubSystemId order by a.Sort asc "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@SubSystemId", this.tvControlItem.SelectedNodeID)); @@ -1316,7 +1320,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (existInstrumentIdIds.Count > 0) selectInstrumentIds.RemoveAll(a => existInstrumentIdIds.Contains(a)); if (selectInstrumentIds.Count > 0) { - var addtbRowSql = $"select a.InstrumentId,a.SystemId,a.ProjectId,a.InstrumentTag,a.UseTo,a.InstrumentName,a.Supplier,a.InstallationPosition,a.SignalType,a.AssociatedSystem,a.Cp25,a.In11,a.In40,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_InstrumentSysPiping as a where 1=1 and a.InstrumentId in ('{string.Join("','", selectInstrumentIds)}')"; + var addtbRowSql = $"select a.InstrumentId,a.SystemId,a.ProjectId,a.InstrumentTag,a.UseTo,a.InstrumentName,a.Supplier,a.InstallationPosition,a.SignalType,a.AssociatedSystem,a.Cp25,a.In11,a.In40,a.Remark,a.AddUser,a.AddTime,a.Sort from PreRun_InstrumentSysPiping as a where 1=1 and a.InstrumentId in ('{string.Join("','", selectInstrumentIds)}') order by a.Sort asc"; addTb = SQLHelper.GetDataTableRunText(addtbRowSql); } } @@ -1485,9 +1489,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun if (dt.Rows[3][28].ToString() != "安装位置") result = false; if (dt.Rows[3][32].ToString() != "信号类型") result = false; if (dt.Rows[3][36].ToString() != "关联系统") result = false; - if (dt.Rows[4][40].ToString() != "CP25") result = false; - if (dt.Rows[4][44].ToString() != "IN11") result = false; - if (dt.Rows[4][48].ToString() != "IN40") result = false; + if (dt.Rows[3][40].ToString() != "P&ID") result = false; + if (dt.Rows[3][44].ToString() != "数据表") result = false; + if (dt.Rows[3][48].ToString() != "仪表位置图") result = false; if (dt.Rows[3][52].ToString() != "备注") result = false; return result; diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs index 187822b4..f6124038 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApproveList.aspx.cs @@ -56,7 +56,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs index 8ce606c5..1dd36e2f 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx.cs @@ -56,7 +56,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx index d057a57e..e35047ff 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx @@ -52,6 +52,11 @@ + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.cs index f5fb6eec..4e85fea0 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.cs @@ -92,11 +92,28 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun a.SiteImplementUser, a.InspectIsClose, a.InspectCloseData, - b.SpecialWorkPack + b.SpecialWorkPack, + a.PropertyTechnologyId }; var termModel = termData.FirstOrDefault(); if (termModel.SpecialWorkPack == 1) { + var selectPtids = termModel.PropertyTechnologyId.Split(','); + if (termModel.WorkPackType==1) + { + var listPros = Funs.DB.PreRun_PropertySysPiping.Where(x => selectPtids.Contains(x.PropertyId)).ToList(); + lblzcStr.Text = string.Join(",", listPros.ConvertAll(x => x.PipingCode)); + } + else if(termModel.WorkPackType == 2) + { + var listTechno = Funs.DB.PreRun_TechnologySysPiping.Where(x => selectPtids.Contains(x.TechnologyId)).ToList(); + lblzcStr.Text = string.Join(",", listTechno.ConvertAll(x => x.TagNumber)); + } + else if (termModel.WorkPackType == 3) + { + var listInstrument = Funs.DB.PreRun_InstrumentSysPiping.Where(x => selectPtids.Contains(x.InstrumentId)).ToList(); + lblzcStr.Text = string.Join(",", listInstrument.ConvertAll(x => x.InstrumentTag)); + } lblProjectName.Text = termModel.ProjectName; lblProjectCode.Text = termModel.ProjectCode; lblWorkPackTypeName.Text = termModel.WorkPackTypeName; @@ -140,11 +157,28 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun SiteImplementName = i.UserName, a.SiteImplementUser, a.InspectIsClose, - a.InspectCloseData + a.InspectCloseData, + a.PropertyTechnologyId }; var inspectTermModel = data.FirstOrDefault(); if (inspectTermModel != null) { + var selectPtids = inspectTermModel.PropertyTechnologyId.Split(','); + if (inspectTermModel.WorkPackType == 1) + { + var listPros = Funs.DB.PreRun_PropertySysPiping.Where(x => selectPtids.Contains(x.PropertyId)).ToList(); + lblzcStr.Text = string.Join(",", listPros.ConvertAll(x => x.PipingCode)); + } + else if (inspectTermModel.WorkPackType == 2) + { + var listTechno = Funs.DB.PreRun_TechnologySysPiping.Where(x => selectPtids.Contains(x.TechnologyId)).ToList(); + lblzcStr.Text = string.Join(",", listTechno.ConvertAll(x => x.TagNumber)); + } + else if (inspectTermModel.WorkPackType == 3) + { + var listInstrument = Funs.DB.PreRun_InstrumentSysPiping.Where(x => selectPtids.Contains(x.InstrumentId)).ToList(); + lblzcStr.Text = string.Join(",", listInstrument.ConvertAll(x => x.InstrumentTag)); + } lblProjectName.Text = inspectTermModel.ProjectName; lblProjectCode.Text = inspectTermModel.ProjectCode; lblWorkPackTypeName.Text = inspectTermModel.WorkPackTypeName; diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.designer.cs index fea8726a..8b6f6403 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun /// protected global::FineUIPro.Label lblWorkPackName; + /// + /// lblzcStr 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblzcStr; + /// /// lblInspectUser 控件。 /// diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUploadList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUploadList.aspx.cs index f1c44e27..74ebcd88 100644 --- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUploadList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUploadList.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun { var selectlist = YscInspectItems(workPackIds, subSystemIds); var systemIds = list.Select(x => x.SystemId).ToList(); - var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)); + var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId)).OrderBy(o => o.Sort).ThenBy(t => t.PreRunLevel); foreach (var itemSys in syslist) { TreeNode rootFirstNode = new TreeNode();//定义根节点 diff --git a/SGGL/FineUIPro.Web/TestRun/TestRunManage/SubSysWorkPackage.aspx.cs b/SGGL/FineUIPro.Web/TestRun/TestRunManage/SubSysWorkPackage.aspx.cs index 5334b8d7..12a49217 100644 --- a/SGGL/FineUIPro.Web/TestRun/TestRunManage/SubSysWorkPackage.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/TestRunManage/SubSysWorkPackage.aspx.cs @@ -232,6 +232,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage }; if (data.Count() > 0) { + int num = 1; int i = 1; foreach (var item in data.OrderBy(p => p.Sort)) { @@ -241,7 +242,12 @@ namespace FineUIPro.Web.TestRun.TestRunManage model.SystemId = item.SystemId; if (string.IsNullOrWhiteSpace(item.WorkPackCode)) { - var num = Funs.DB.TestRun_SubSysWorkPackage.Count(p => p.SystemId == this.SystemId) + i; + var workpackages = Funs.DB.TestRun_SubSysWorkPackage.Where(p => p.SystemId == this.SystemId).ToList(); + if (workpackages.Count > 0) + { + num = workpackages.ConvertAll(x => int.Parse(x.WorkPackCode.Replace("WP", ""))).Max(m => m); + } + num = num + i; model.WorkPackCode = $"WP{string.Format("{0:d3}", num)}"; i++; } @@ -249,7 +255,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage { model.WorkPackCode = item.WorkPackCode; } - model.Sort = item.Sort; + model.Sort = num; model.Remark = item.Remark; result.Add(model); } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 45d6b023..999d966a 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -263053,6 +263053,8 @@ namespace Model private System.Nullable _ProblemType; + private string _SubInspectId; + private string _TermItemId; private string _WorkPackId; @@ -263065,20 +263067,18 @@ namespace Model private string _InspectUser; + private string _HandleUser; + private string _ApproveUser; + private System.Nullable _AdjustCompleteTime; + private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; - private string _SubInspectId; - - private string _HandleUser; - - private System.Nullable _AdjustCompleteTime; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -263095,6 +263095,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -263107,20 +263109,18 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); #endregion public PreRun_InspectTailTerm() @@ -263248,6 +263248,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")] public string TermItemId { @@ -263368,6 +263388,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -263388,6 +263428,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -263448,66 +263508,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] - public string SubInspectId - { - get - { - return this._SubInspectId; - } - set - { - if ((this._SubInspectId != value)) - { - this.OnSubInspectIdChanging(value); - this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -263549,14 +263549,14 @@ namespace Model private string _ApproveUser; + private System.Nullable _ApproveType; + private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; - private System.Nullable _ApproveType; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -263575,14 +263575,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -263730,6 +263730,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -263790,26 +263810,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -264742,7 +264742,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -264865,12 +264865,6 @@ namespace Model private string _InspectResult; - private System.Nullable _InspectTime; - - private string _AddUser; - - private System.Nullable _AddTime; - private string _Subcontractor; private string _Contractor; @@ -264879,10 +264873,6 @@ namespace Model private string _Owner; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; - private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -264893,6 +264883,10 @@ namespace Model private System.Nullable _OwnerIsAllPass; + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; + private System.Nullable _SubcontractorAllPassData; private System.Nullable _ContractorAllPassData; @@ -264925,6 +264919,12 @@ namespace Model private string _UnifyWanderAboutOpinion; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -264945,12 +264945,6 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -264959,10 +264953,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -264973,6 +264963,10 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -265005,6 +264999,12 @@ namespace Model partial void OnUnifyWanderAboutDataChanged(); partial void OnUnifyWanderAboutOpinionChanging(string value); partial void OnUnifyWanderAboutOpinionChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); #endregion public PreRun_SubInspectTerm() @@ -265172,66 +265172,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime - { - get - { - return this._InspectTime; - } - set - { - if ((this._InspectTime != value)) - { - this.OnInspectTimeChanging(value); - this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser - { - get - { - return this._AddUser; - } - set - { - if ((this._AddUser != value)) - { - this.OnAddUserChanging(value); - this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -265312,46 +265252,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType - { - get - { - return this._WorkPackType; - } - set - { - if ((this._WorkPackType != value)) - { - this.OnWorkPackTypeChanging(value); - this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -265452,6 +265352,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorAllPassData", DbType="DateTime")] public System.Nullable SubcontractorAllPassData { @@ -265772,6 +265712,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -265835,18 +265835,6 @@ namespace Model private string _Owner; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; - - private string _Remark; - - private string _AddUser; - - private System.Nullable _AddTime; - - private System.Nullable _Sort; - private System.Nullable _SubcontractorIsPass; private System.Nullable _ContractorIsPass; @@ -265863,6 +265851,18 @@ namespace Model private string _OwnerRemark; + private System.Nullable _WorkPackType; + + private string _PropertyTechnologyId; + + private string _Remark; + + private string _AddUser; + + private System.Nullable _AddTime; + + private System.Nullable _Sort; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -265903,18 +265903,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); - partial void OnSortChanging(System.Nullable value); - partial void OnSortChanged(); partial void OnSubcontractorIsPassChanging(System.Nullable value); partial void OnSubcontractorIsPassChanged(); partial void OnContractorIsPassChanging(System.Nullable value); @@ -265931,6 +265919,18 @@ namespace Model partial void OnSupervisionRemarkChanged(); partial void OnOwnerRemarkChanging(string value); partial void OnOwnerRemarkChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); + partial void OnSortChanging(System.Nullable value); + partial void OnSortChanged(); #endregion public PreRun_SubInspectTermItem() @@ -266298,126 +266298,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType - { - get - { - return this._WorkPackType; - } - set - { - if ((this._WorkPackType != value)) - { - this.OnWorkPackTypeChanging(value); - this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")] - public string Remark - { - get - { - return this._Remark; - } - set - { - if ((this._Remark != value)) - { - this.OnRemarkChanging(value); - this.SendPropertyChanging(); - this._Remark = value; - this.SendPropertyChanged("Remark"); - this.OnRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser - { - get - { - return this._AddUser; - } - set - { - if ((this._AddUser != value)) - { - this.OnAddUserChanging(value); - this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] - public System.Nullable Sort - { - get - { - return this._Sort; - } - set - { - if ((this._Sort != value)) - { - this.OnSortChanging(value); - this.SendPropertyChanging(); - this._Sort = value; - this.SendPropertyChanged("Sort"); - this.OnSortChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] public System.Nullable SubcontractorIsPass { @@ -266578,6 +266458,126 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string PropertyTechnologyId + { + get + { + return this._PropertyTechnologyId; + } + set + { + if ((this._PropertyTechnologyId != value)) + { + this.OnPropertyTechnologyIdChanging(value); + this.SendPropertyChanging(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")] + public System.Nullable Sort + { + get + { + return this._Sort; + } + set + { + if ((this._Sort != value)) + { + this.OnSortChanging(value); + this.SendPropertyChanging(); + this._Sort = value; + this.SendPropertyChanged("Sort"); + this.OnSortChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -267081,8 +267081,6 @@ namespace Model private System.Nullable _Sort; - private string _SystemId; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -267103,8 +267101,6 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); - partial void OnSystemIdChanging(string value); - partial void OnSystemIdChanged(); #endregion public PreRun_SubSysWorkPackage() @@ -267272,26 +267268,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemId", DbType="VarChar(50)")] - public string SystemId - { - get - { - return this._SystemId; - } - set - { - if ((this._SystemId != value)) - { - this.OnSystemIdChanging(value); - this.SendPropertyChanging(); - this._SystemId = value; - this.SendPropertyChanged("SystemId"); - this.OnSystemIdChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -267579,6 +267555,8 @@ namespace Model private string _RestrictCondition; + private System.Nullable _ResponsibilityProposeSatate; + private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -267589,9 +267567,11 @@ namespace Model private System.Nullable _OwnerConfirm; + private System.Nullable _ProposeConfirmData; + private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeConfirmData; + private System.Nullable _ProposeHandleData; private System.Nullable _GeneraConfirmData; @@ -267641,6 +267621,8 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -267651,10 +267633,12 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnResponsibilityConfirmDataChanging(System.Nullable value); - partial void OnResponsibilityConfirmDataChanged(); partial void OnProposeConfirmDataChanging(System.Nullable value); partial void OnProposeConfirmDataChanged(); + partial void OnResponsibilityConfirmDataChanging(System.Nullable value); + partial void OnResponsibilityConfirmDataChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -267976,6 +267960,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -268076,6 +268080,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData + { + get + { + return this._ProposeConfirmData; + } + set + { + if ((this._ProposeConfirmData != value)) + { + this.OnProposeConfirmDataChanging(value); + this.SendPropertyChanging(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -268096,22 +268120,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData { get { - return this._ProposeConfirmData; + return this._ProposeHandleData; } set { - if ((this._ProposeConfirmData != value)) + if ((this._ProposeHandleData != value)) { - this.OnProposeConfirmDataChanging(value); + this.OnProposeHandleDataChanging(value); this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); } } } @@ -268948,7 +268972,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get