diff --git a/DataBase/版本日志/SGGLDB_V2023-11-09.sql b/DataBase/版本日志/SGGLDB_V2023-11-09.sql new file mode 100644 index 00000000..6dfe8054 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-11-09.sql @@ -0,0 +1,32 @@ + +ALTER VIEW [dbo].[View_WBS] +AS +select '1' as Id,'0' as SupId ,'JZ' as Code, '' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,null as JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,null as RealStartDate,null as IsMileStone,null as PlanCost,null as PreWorkCode,'' as ShowId, +ProjectId from dbo.Base_Project +Union +select '2' as Id,'0' as SupId ,'AZ' as Code, 'װ' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,null as JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,null as RealStartDate,null as IsMileStone,null as PlanCost,null as PreWorkCode,'' as ShowId, +ProjectId from dbo.Base_Project +Union +select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,RealStartDate,null as IsMileStone,PlanCost,null as PreWorkCode,'' as ShowId, +ProjectId from dbo.WBS_UnitWork +Union all +select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,Unit,PlanProjectQuantity,RealProjectQuantity,RealStartDate,IsMileStone,PlanCost,PreWorkCode,case when (select COUNT(*) from WBS_WorkPackage a where a.SuperWorkPackageId=w.WorkPackageId and a.IsApprove=1)=0 then WorkPackageId else '' end as ShowId, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null +Union all +select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,Unit,PlanProjectQuantity,RealProjectQuantity,RealStartDate,IsMileStone,PlanCost,PreWorkCode,case when (select COUNT(*) from WBS_WorkPackage a where a.SuperWorkPackageId=w.WorkPackageId and a.IsApprove=1)=0 then WorkPackageId else '' end as ShowId, +ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null + + + + + + + + + + + + +GO + + diff --git a/DataBase/版本日志/SGGLDB_V2023-11-10.sql b/DataBase/版本日志/SGGLDB_V2023-11-10.sql new file mode 100644 index 00000000..cd9310ef --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-11-10.sql @@ -0,0 +1,45 @@ +CREATE VIEW [dbo].[View_Hazard_HazardRegisterList] +AS +/**********ȫѲͼ*************/ +SELECT Registration.ProjectId, + Registration.HazardRegisterId, + Registration.ResponsibleUnit, + Registration.CheckTime, + Registration.ProblemTypes, + User2.PersonName AS CheckManName, + RegisterTypes.RegisterTypesName, + ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName, + Unit.UnitName AS ResponsibilityUnitName, + Registration.RectificationTime, + Registration.states, + Registration.RegisterDef, + Registration.HazardValue, + Registration.RegisterTypes2Id , + RegisterTypes2.RegisterTypesName as RegisterTypes2Name, + Registration.RegisterTypes3Id , + RegisterTypes3.RegisterTypesName as RegisterTypes3Name, + Registration.RegisterTypes4Id , + RegisterTypes4.RegisterTypesName as RegisterTypes4Name, + User1.PersonName AS ResponsibilityManName, + User2.UnitId AS SendUnitId, + Registration.Rectification, + Registration.RectificationPeriod, + Registration.RegisterDate, + (CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '' + WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ϸ' + WHEN Registration.states='2' THEN '' + WHEN Registration.states='3' THEN 'ѱջ' ELSE '' END ) AS StatesStr +FROM dbo.HSSE_Hazard_HazardRegister AS Registration +LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes2 ON RegisterTypes2.RegisterTypesId = Registration.RegisterTypes2Id +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes3 ON RegisterTypes3.RegisterTypesId = Registration.RegisterTypes3Id +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes4 ON RegisterTypes4.RegisterTypesId = Registration.RegisterTypes4Id +LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit +LEFT JOIN dbo.Person_Persons AS User1 ON User1.PersonId = Registration.ResponsibleMan +LEFT JOIN dbo.Person_Persons AS User2 ON User2.PersonId = Registration.CheckManId +LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place + +GO + + diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 01bd6402..fd000c2f 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -245,7 +245,7 @@ namespace BLL /// 获取模拟树表格 /// /// - public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime, string isOK) + public static DataTable GetAllTreeDataTable0(string projectId, string IsOut, string startTime, string endTime, string isOK) { using (var db = new Model.SGGLDB(Funs.ConnString)) { @@ -292,11 +292,6 @@ namespace BLL table.Columns.Add(new DataColumn("PlanCost", typeof(String))); table.Columns.Add(new DataColumn("PreWorkCode", typeof(String))); table.Columns.Add(new DataColumn("Code", typeof(String))); - for (int i = 0; i < months.Count; i++) - { - table.Columns.Add(new DataColumn("PlanNum" + (i + 1).ToString(), typeof(String))); - table.Columns.Add(new DataColumn("ThisNum" + (i + 1).ToString(), typeof(String))); - } if (getWBSs.Count() > 0) { List newList = new List(); @@ -372,19 +367,6 @@ namespace BLL row[15] = decimal.Round(Convert.ToDecimal(workPackage.PlanCost), 2); } row[16] = workPackage.PreWorkCode; - var details = getDetails.Where(x => x.WorkPackageId == item.Id).ToList(); - foreach (var item1 in details) - { - var index = months.FindIndex(x => x.Equals(item1.Months)); - if (item1.PlanNum != 0) - { - row[18 + index * 2] = decimal.Round(Convert.ToDecimal(item1.PlanNum), 2); - } - if (item1.ThisNum != 0) - { - row[19 + index * 2] = decimal.Round(Convert.ToDecimal(item1.ThisNum), 2); - } - } } else { @@ -454,6 +436,168 @@ namespace BLL } } + public static List GetAllTreeDataTable2(string projectId, string IsOut, string startTime, string endTime, string isOK) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + List getWBSs = (from x in db.View_WBS where x.ProjectId == projectId select x).ToList(); + List newList = new List(); + if (getWBSs.Count() > 0) + { + + var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0"); + int a = 1; + foreach (var item in projectTypes) + { + item.Code = a.ToString(); + newList.Add(item); + if (string.IsNullOrEmpty(IsOut)) + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK); + } + else + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK); + } + a++; + } + } + return newList; + } + } + + /// + /// 获取模拟树表格 + /// + /// + public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime, string isOK) + { + using (var db = new Model.SGGLDB(Funs.ConnString)) + { + IQueryable getDetails = from x in db.View_WBS_WorkPackageDetail where x.ProjectId == projectId select x; + List getWBSs = (from x in db.View_WBS where x.ProjectId == projectId select x).ToList(); + DateTime startDate, endDate, startMonth, endMonth; + List months = new List(); + var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId); + if (project.StartDate != null) + { + startDate = Convert.ToDateTime(project.StartDate); + endDate = DateTime.Now; + if (project.EndDate != null) + { + endDate = Convert.ToDateTime(project.EndDate); + } + startMonth = Convert.ToDateTime(startDate.Year + "-" + startDate.Month + "-01"); + endMonth = Convert.ToDateTime(endDate.Year + "-" + endDate.Month + "-01"); + do + { + months.Add(startMonth); + startMonth = startMonth.AddMonths(1); + } while (startMonth <= endMonth); + } + DataTable table = new DataTable(); + table.Columns.Add(new DataColumn("Id", typeof(String))); + table.Columns.Add(new DataColumn("SupId", typeof(String))); + table.Columns.Add(new DataColumn("Name", typeof(String))); + table.Columns.Add(new DataColumn("WBSType", typeof(String))); + table.Columns.Add(new DataColumn("ProjectId", typeof(String))); + table.Columns.Add(new DataColumn("ShowId", typeof(String))); + table.Columns.Add(new DataColumn("JDWeights", typeof(String))); + table.Columns.Add(new DataColumn("Unit", typeof(String))); + table.Columns.Add(new DataColumn("PlanProjectQuantity", typeof(String))); + table.Columns.Add(new DataColumn("RealProjectQuantity", typeof(String))); + table.Columns.Add(new DataColumn("PlanStartDate", typeof(DateTime))); + table.Columns.Add(new DataColumn("PlanEndDate", typeof(DateTime))); + table.Columns.Add(new DataColumn("RealStartDate", typeof(DateTime))); + table.Columns.Add(new DataColumn("RealEndDate", typeof(DateTime))); + table.Columns.Add(new DataColumn("IsMileStone", typeof(bool))); + table.Columns.Add(new DataColumn("PlanCost", typeof(String))); + table.Columns.Add(new DataColumn("PreWorkCode", typeof(String))); + table.Columns.Add(new DataColumn("Code", typeof(String))); + for (int i = 0; i < months.Count; i++) + { + table.Columns.Add(new DataColumn("PlanNum" + (i + 1).ToString(), typeof(String))); + table.Columns.Add(new DataColumn("ThisNum" + (i + 1).ToString(), typeof(String))); + } + if (getWBSs.Count() > 0) + { + List newList = new List(); + var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0"); + int a = 1; + foreach (var item in projectTypes) + { + item.Code = a.ToString(); + newList.Add(item); + if (string.IsNullOrEmpty(IsOut)) + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK); + } + else + { + AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK); + } + a++; + } + DataRow row; + foreach (Model.View_WBS item in newList) + { + row = table.NewRow(); + row[0] = item.Id; + row[1] = item.SupId; + row[2] = item.Name; + row[3] = item.WBSType; + row[4] = item.ProjectId; + row[5] = item.ShowId; + row[6] = item.JDWeights; + row[7] = item.Unit; + row[8] = item.PlanProjectQuantity; + row[9] = item.RealProjectQuantity; + if (item.PlanStartDate != null) + { + row[10] = item.PlanStartDate; + } + if (item.PlanEndDate != null) + { + row[11] = item.PlanEndDate; + } + if (item.RealStartDate != null) + { + row[12] = item.RealStartDate; + } + if (item.RealEndDate != null) + { + row[13] = item.RealEndDate; + } + if (item.IsMileStone != null) + { + row[14] = item.IsMileStone; + } + row[15] = item.PlanCost; + row[16] = item.PreWorkCode; + row[17] = item.Code; + if (!string.IsNullOrEmpty(item.ShowId)) + { + var details = getDetails.Where(x => x.WorkPackageId == item.Id).ToList(); + foreach (var item1 in details) + { + var index = months.FindIndex(x => x.Equals(item1.Months)); + if (item1.PlanNum != 0) + { + row[18 + index * 2] = decimal.Round(Convert.ToDecimal(item1.PlanNum), 2); + } + if (item1.ThisNum != 0) + { + row[19 + index * 2] = decimal.Round(Convert.ToDecimal(item1.ThisNum), 2); + } + } + } + table.Rows.Add(row); + } + } + return table; + } + } + private static void AddDetail(List newList, List oldList, string id, string preCode, string startTime, string endTime, string isOK) { if (isOK == "0") @@ -760,7 +904,7 @@ namespace BLL public static string getWorkPageNamesByControlItemAndCycle(string workPackageId, string controlItemAndCycleId) { string returnValues = string.Empty; - string ControlItemName=string.Empty; + string ControlItemName = string.Empty; if (!string.IsNullOrEmpty(controlItemAndCycleId)) { var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId); @@ -802,7 +946,7 @@ namespace BLL var getSupWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getWorkPackage.SuperWorkPackageId); if (getSupWorkPackage != null) { - returnValues = getWorkPackage.PackageContent + "|" + returnValues; + returnValues = getWorkPackage.PackageContent + "|" + returnValues; returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues); } @@ -820,7 +964,7 @@ namespace BLL { returnValues = "安装工程|" + getUnitWork.UnitWorkName + "|" + returnValues; } - + } } } @@ -1093,7 +1237,7 @@ namespace BLL } } - private static void AddDetail2(List newList, List oldList, string id, string preCode, DateTime startTime, DateTime endTime,List ids) + private static void AddDetail2(List newList, List oldList, string id, string preCode, DateTime startTime, DateTime endTime, List ids) { var items = oldList.Where(x => x.SupId == id && ((x.PlanEndDate > startTime && x.PlanEndDate <= endTime) || ids.Contains(x.Id))).OrderBy(x => x.Code); int b = 1; diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs index 615d0498..ddf092cf 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs @@ -221,7 +221,7 @@ namespace BLL { Model.SGGLDB db = Funs.DB; Model.HJGL_Pipeline_Component newPipeline = new Model.HJGL_Pipeline_Component(); - pipeline.IsPrint ??= false; + pipeline.IsPrint = false; newPipeline.PipelineComponentId = pipeline.PipelineComponentId; newPipeline.PipelineId = pipeline.PipelineId; newPipeline.PreUnit = pipeline.PreUnit; diff --git a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs index ca6147f7..9638c7ae 100644 --- a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs +++ b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs @@ -1,7 +1,8 @@ -using System; +using FineUIPro; +using System; +using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Web.UI.WebControls; namespace BLL { @@ -9,6 +10,124 @@ namespace BLL { public static Model.SGGLDB db = Funs.DB; + #region 获取安全巡检列表信息 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.View_Hazard_HazardRegisterList + where x.ProblemTypes == "1" + select x; + + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public static IEnumerable getListData(string projectId, string checkMan, string type, string workAreaName, string responsibilityUnitName, DateTime? startTime, DateTime? endTime, DateTime? startRectificationTime, DateTime? endRectificationTime + ,string states, string personId, string unitId, Grid Grid1) + { + IQueryable getDataList = getDataLists; + if (!string.IsNullOrEmpty(projectId)) + { + getDataList = getDataList.Where(e => e.ProjectId == projectId); + } + if (!string.IsNullOrEmpty(checkMan)) + { + getDataList = getDataList.Where(e => e.CheckManName.Contains(checkMan)); + } + if (!string.IsNullOrEmpty(type)) + { + getDataList = getDataList.Where(e => e.RegisterTypesName.Contains(type)); + } + + if (!string.IsNullOrEmpty(workAreaName)) + { + getDataList = getDataList.Where(e => e.WorkAreaName.Contains(workAreaName)); + } + if (!string.IsNullOrEmpty(responsibilityUnitName)) + { + getDataList = getDataList.Where(e => e.ResponsibilityUnitName.Contains(responsibilityUnitName)); + } + if (startTime.HasValue) + { + getDataList = getDataList.Where(e => e.CheckTime >= startTime); + } + if (endTime.HasValue) + { + getDataList = getDataList.Where(e => e.CheckTime <= endTime); + } + + if (startRectificationTime.HasValue) + { + getDataList = getDataList.Where(e => e.RectificationTime >= startRectificationTime); + } + if (endRectificationTime.HasValue) + { + getDataList = getDataList.Where(e => e.RectificationTime <= endRectificationTime); + } + + if (!string.IsNullOrEmpty(states) && states != Const._Null) + { + getDataList = getDataList.Where(e => e.States.Contains(states)); + } + + if (!CommonService.IsMainUnitOrAdmin(personId)) + { + getDataList = getDataList.Where(e => e.ResponsibleUnit == unitId || e.SendUnitId == unitId); + } + + count = getDataList.Count(); + if (count == 0) + { + return null; + } + getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getDataList + select new + { + x.HazardRegisterId, + x.CheckTime, + x.RegisterDef, + x.RegisterTypes2Name, + x.RegisterTypesName, + x.RegisterTypes3Name, + x.HazardValue, + x.RegisterTypes4Name, + x.WorkAreaName, + x.ResponsibilityUnitName, + x.ResponsibilityManName, + x.Rectification, + x.RectificationPeriod, + //x.CCManNames, + x.RectificationTime, + x.CheckManName, + x.RegisterDate, + x.StatesStr, + }; + } + #endregion + /// /// 根据危险观察登记主键获取危险观察登记信息 /// diff --git a/SGGL/BLL/HSSE/License/LicenseManagerService.cs b/SGGL/BLL/HSSE/License/LicenseManagerService.cs index f6ba7913..08a67cb6 100644 --- a/SGGL/BLL/HSSE/License/LicenseManagerService.cs +++ b/SGGL/BLL/HSSE/License/LicenseManagerService.cs @@ -1,4 +1,10 @@ -using System; +using FineUIPro; +using Model; +using NPOI.SS.Formula.Functions; +using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; using System.Linq; namespace BLL @@ -10,6 +16,120 @@ namespace BLL { public static Model.SGGLDB db = Funs.DB; + #region 获取安全巡检列表信息 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.License_LicenseManager + select x; + + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public static IEnumerable getListData(string projectId, string unitId, DateTime? startTime, DateTime? endTime, string licenseType, string unitId2, Grid Grid1) + { + IQueryable getDataList = getDataLists; + if (!string.IsNullOrEmpty(projectId)) + { + getDataList = getDataList.Where(e => e.ProjectId == projectId); + } + if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId)) + { + getDataList = getDataList.Where(e => e.UnitId == unitId); + } + if (startTime.HasValue) + { + getDataList = getDataList.Where(e => e.StartDate >= startTime); + } + if (endTime.HasValue) + { + getDataList = getDataList.Where(e => e.EndDate <= endTime); + } + if (!string.IsNullOrEmpty(licenseType)) + { + getDataList = getDataList.Where(e => e.LicenseTypeId == licenseType); + } + + if (!string.IsNullOrEmpty(unitId2) && unitId2 != Const._Null) + { + getDataList = getDataList.Where(e => e.UnitId == unitId2 ); + } + + + count = getDataList.Count(); + if (count == 0) + { + return null; + } + getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getDataList + select new + { + x.LicenseManagerId, + x.LicenseManagerCode, + LicenseTypeName = db.Base_LicenseType.First(t => t.LicenseTypeId == x.LicenseTypeId).LicenseTypeName, + UnitName = db.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName, + WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId), + x.CompileDate, + x.StartDate, + x.EndDate, + FlowOperateName = getFlow(x.LicenseManagerId, x.States), + }; + } + + public static string getFlow(string id,string states) + { + string strrValue = string.Empty; + string name = string.Empty; + var getFlow = Funs.DB.Sys_FlowOperate.FirstOrDefault(x => x.DataId == id && x.IsClosed != true); + if (getFlow != null) + { + var getPerson = Funs.DB.Person_Persons.FirstOrDefault(x => x.PersonId == getFlow.OperaterId); + if (getPerson != null) + { + name = getPerson.PersonName; + } + } + + if (states == BLL.Const.State_0 || string.IsNullOrEmpty(states)) + { + strrValue = "待[" + name + "]提交"; + } + else if (states == BLL.Const.State_1) + { + strrValue = "审核/审批完成"; + } else + { + strrValue = "待[" + name + "]办理"; + } + + return strrValue; + } + #endregion + /// /// 根据主键获取安全许可证 /// diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx index 14d5606f..f6e453b4 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx @@ -119,9 +119,9 @@ SortField="RectificationPeriod" FieldType="Date" Renderer="Date" HeaderText="整改期限" TextAlign="Center" HeaderTextAlign="Center"> - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs index 12ada81c..7bd36521 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs @@ -57,76 +57,84 @@ namespace FineUIPro.Web.HSSE.HiddenInspection /// private void BindGrid() { - string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes='1' "; - List listStr = new List(); - if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) - { - strSql += " AND ProjectId = @ProjectId"; - listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - } - if (!string.IsNullOrEmpty(this.txtCheckMan.Text.Trim())) - { - strSql += " AND CheckManName LIKE @CheckMan"; - listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%")); - } - if (!string.IsNullOrEmpty(this.txtType.Text.Trim())) - { - strSql += " AND RegisterTypesName LIKE @Type"; - listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%")); - } - if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim())) - { - strSql += " AND WorkAreaName LIKE @WorkAreaName"; - listStr.Add(new SqlParameter("@WorkAreaName", "%" + this.txtWorkAreaName.Text.Trim() + "%")); - } - //if (this.ckType.SelectedValue != "0") + //string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes='1' "; + //List listStr = new List(); + //if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) //{ - // strSql += " AND CheckCycle=@CheckCycle"; - // listStr.Add(new SqlParameter("@CheckCycle", this.ckType.SelectedValue)); + // strSql += " AND ProjectId = @ProjectId"; + // listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); //} - if (!string.IsNullOrEmpty(this.txtResponsibilityUnitName.Text.Trim())) - { - strSql += " AND ResponsibilityUnitName LIKE @ResponsibilityUnitName"; - listStr.Add(new SqlParameter("@ResponsibilityUnitName", "%" + this.txtResponsibilityUnitName.Text.Trim() + "%")); - } - if (!string.IsNullOrEmpty(txtStartTime.Text.Trim())) - { - strSql += " AND CheckTime >= @StartTime"; - listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim())); - } - if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim())) - { - strSql += " AND CheckTime <= @EndTime"; - listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim())); - } - if (!string.IsNullOrEmpty(txtStartRectificationTime.Text.Trim())) - { - strSql += " AND RectificationTime >= @StartRectificationTime"; - listStr.Add(new SqlParameter("@StartRectificationTime", this.txtStartRectificationTime.Text.Trim())); - } - if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) - { - strSql += " AND RectificationTime <= @EndRectificationTime"; - listStr.Add(new SqlParameter("@EndRectificationTime", this.txtEndRectificationTime.Text.Trim())); - } - if (this.drpStates.SelectedValue != BLL.Const._Null) - { - strSql += " AND States LIKE @States"; - listStr.Add(new SqlParameter("@States", "%" + this.drpStates.SelectedValue + "%")); - } - if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.PersonId)) - { - strSql += " AND (ResponsibleUnit =@ResponsibleUnit OR SendUnitId=@SendUnitId)"; - listStr.Add(new SqlParameter("@ResponsibleUnit", this.CurrUser.UnitId)); - listStr.Add(new SqlParameter("@SendUnitId", this.CurrUser.UnitId)); - } - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + //if (!string.IsNullOrEmpty(this.txtCheckMan.Text.Trim())) + //{ + // strSql += " AND CheckManName LIKE @CheckMan"; + // listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%")); + //} + //if (!string.IsNullOrEmpty(this.txtType.Text.Trim())) + //{ + // strSql += " AND RegisterTypesName LIKE @Type"; + // listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%")); + //} + //if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim())) + //{ + // strSql += " AND WorkAreaName LIKE @WorkAreaName"; + // listStr.Add(new SqlParameter("@WorkAreaName", "%" + this.txtWorkAreaName.Text.Trim() + "%")); + //} + ////if (this.ckType.SelectedValue != "0") + ////{ + //// strSql += " AND CheckCycle=@CheckCycle"; + //// listStr.Add(new SqlParameter("@CheckCycle", this.ckType.SelectedValue)); + ////} + //if (!string.IsNullOrEmpty(this.txtResponsibilityUnitName.Text.Trim())) + //{ + // strSql += " AND ResponsibilityUnitName LIKE @ResponsibilityUnitName"; + // listStr.Add(new SqlParameter("@ResponsibilityUnitName", "%" + this.txtResponsibilityUnitName.Text.Trim() + "%")); + //} + //if (!string.IsNullOrEmpty(txtStartTime.Text.Trim())) + //{ + // strSql += " AND CheckTime >= @StartTime"; + // listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim())); + //} + //if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim())) + //{ + // strSql += " AND CheckTime <= @EndTime"; + // listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim())); + //} + //if (!string.IsNullOrEmpty(txtStartRectificationTime.Text.Trim())) + //{ + // strSql += " AND RectificationTime >= @StartRectificationTime"; + // listStr.Add(new SqlParameter("@StartRectificationTime", this.txtStartRectificationTime.Text.Trim())); + //} + //if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) + //{ + // strSql += " AND RectificationTime <= @EndRectificationTime"; + // listStr.Add(new SqlParameter("@EndRectificationTime", this.txtEndRectificationTime.Text.Trim())); + //} + //if (this.drpStates.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND States LIKE @States"; + // listStr.Add(new SqlParameter("@States", "%" + this.drpStates.SelectedValue + "%")); + //} + //if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.PersonId)) + //{ + // strSql += " AND (ResponsibleUnit =@ResponsibleUnit OR SendUnitId=@SendUnitId)"; + // listStr.Add(new SqlParameter("@ResponsibleUnit", this.CurrUser.UnitId)); + // listStr.Add(new SqlParameter("@SendUnitId", this.CurrUser.UnitId)); + //} + //SqlParameter[] parameter = listStr.ToArray(); + //DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - Grid1.RecordCount = tb.Rows.Count; - var table = this.GetPagedDataTable(Grid1, tb); + //Grid1.RecordCount = tb.Rows.Count; + //var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; + //Grid1.DataSource = table; + //Grid1.DataBind(); + + + var getData = HSSE_Hazard_HazardRegisterService.getListData(this.CurrUser.LoginProjectId, this.txtCheckMan.Text.Trim(), this.txtType.Text.Trim(), this.txtWorkAreaName.Text.Trim(), + this.txtResponsibilityUnitName.Text.Trim(),Funs.GetNewDateTime(txtStartTime.Text.Trim()),Funs.GetNewDateTime(this.txtEndTime.Text.Trim()), Funs.GetNewDateTime(this.txtStartRectificationTime.Text.Trim()), Funs.GetNewDateTime(this.txtEndRectificationTime.Text.Trim()), + this.drpStates.SelectedValue, this.CurrUser.PersonId, this.CurrUser.UnitId, Grid1); + Grid1.RecordCount = HSSE_Hazard_HazardRegisterService.count; + Grid1.DataSource = getData; Grid1.DataBind(); } #endregion diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx index 8812e0f3..4b3f7180 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx @@ -30,7 +30,10 @@ - + + diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs index 23ee103f..0680367e 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs @@ -132,31 +132,36 @@ namespace FineUIPro.Web.JDGL.Check { errorInfos = string.Empty; string Id = Request.Params["Id"]; - DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0"); - Grid1.DataSource = table; - Grid1.DataBind(); - for (int i = 0; i < this.Grid1.Rows.Count; i++) + + } + } + + protected void btnShow_Click(object sender, EventArgs e) + { + DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0"); + Grid1.DataSource = table; + Grid1.DataBind(); + for (int i = 0; i < this.Grid1.Rows.Count; i++) + { + if (string.IsNullOrEmpty(this.Grid1.Rows[i].DataKeys[2].ToString())) { - if (string.IsNullOrEmpty(this.Grid1.Rows[i].DataKeys[2].ToString())) + System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone")); + cbIsMileStone.Visible = false; + foreach (GridColumn column in Grid1.Columns) { - System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone")); - cbIsMileStone.Visible = false; - foreach (GridColumn column in Grid1.Columns) + if (column.ColumnIndex != 0 && column.ColumnIndex != 1) { - if (column.ColumnIndex != 0 && column.ColumnIndex != 1) - { - this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable"; - } + this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable"; } } - else + } + else + { + System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone")); + Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(this.Grid1.Rows[i].DataKeys[2].ToString()); + if (workPackage != null && workPackage.IsMileStone == true) { - System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone")); - Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(this.Grid1.Rows[i].DataKeys[2].ToString()); - if (workPackage != null && workPackage.IsMileStone == true) - { - cbIsMileStone.Checked = true; - } + cbIsMileStone.Checked = true; } } } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs index c6abcb68..43a25ccb 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs @@ -66,6 +66,15 @@ namespace FineUIPro.Web.JDGL.Check { /// protected global::FineUIPro.TextBox hdId; + /// + /// btnShow 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnShow; + /// /// btnSave 控件。 /// diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx index 3f77a098..1d38a46c 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx @@ -28,7 +28,7 @@ + TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="true"> diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs index a865e1e5..e6b170e0 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.JDGL.Check private void BindGrid() { - DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(),this.rblIsOK.SelectedValue); + var table = BLL.WorkPackageService.GetAllTreeDataTable2(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(),this.rblIsOK.SelectedValue); Grid1.DataSource = table; Grid1.DataBind(); for (int i = 0; i < this.Grid1.Rows.Count; i++) diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index bb7a7a34..b532a9bb 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -1,51 +1,9 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -58,15 +16,12 @@ - - - - - - - - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index 129ab5fd..c0fc81f0 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -1,14 +1,12 @@  - - - + + + - - @@ -16,10 +14,7 @@ - - - - + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index fd6a0762..8d4aa005 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,11 +1,7 @@  - + - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml index 31955789..eb672a76 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml @@ -17,20 +17,19 @@ - - - - - - - - - - + + + + + + + + + - + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 9bc36592..03eb9188 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -48,6 +48,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index afeadd18..828362b1 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -6409,6 +6409,14 @@ namespace Model } } + public System.Data.Linq.Table View_Hazard_HazardRegisterList + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table View_HJGL_Batch_PointBatch { get @@ -11763,7 +11771,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] public string ApproveIdea { get @@ -39519,10 +39527,10 @@ namespace Model private string _SaveHandleMan; - private string _WorkPackageId; - private string _WorkPackageName; + private string _WorkPackageId; + private EntityRef _Base_Project; private EntityRef _Person_Persons; @@ -39579,10 +39587,10 @@ namespace Model partial void OnProposeUnitIdChanged(); partial void OnSaveHandleManChanging(string value); partial void OnSaveHandleManChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public Check_CheckControl() @@ -40061,26 +40069,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] - public string WorkPackageId - { - get - { - return this._WorkPackageId; - } - set - { - if ((this._WorkPackageId != value)) - { - this.OnWorkPackageIdChanging(value); - this.SendPropertyChanging(); - this._WorkPackageId = value; - this.SendPropertyChanged("WorkPackageId"); - this.OnWorkPackageIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] public string WorkPackageName { @@ -40101,6 +40089,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -100751,10 +100759,10 @@ namespace Model private string _HazardValue; - private string _WorkPackageId; - private string _WorkPackageName; + private string _WorkPackageId; + private EntityRef _Base_Unit; private EntityRef _HSSE_Hazard_HazardRegisterTypes; @@ -100855,10 +100863,10 @@ namespace Model partial void OnRegisterTypes4IdChanged(); partial void OnHazardValueChanging(string value); partial void OnHazardValueChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public HSSE_Hazard_HazardRegister() @@ -101796,26 +101804,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] - public string WorkPackageId - { - get - { - return this._WorkPackageId; - } - set - { - if ((this._WorkPackageId != value)) - { - this.OnWorkPackageIdChanging(value); - this.SendPropertyChanging(); - this._WorkPackageId = value; - this.SendPropertyChanged("WorkPackageId"); - this.OnWorkPackageIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] public string WorkPackageName { @@ -101836,6 +101824,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -151245,7 +151253,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] public string AttentPerson { get @@ -182768,7 +182776,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] public System.Nullable WorkPackageEstimate { get @@ -268078,6 +268086,465 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Hazard_HazardRegisterList")] + public partial class View_Hazard_HazardRegisterList + { + + private string _ProjectId; + + private string _HazardRegisterId; + + private string _ResponsibleUnit; + + private System.Nullable _CheckTime; + + private string _ProblemTypes; + + private string _CheckManName; + + private string _RegisterTypesName; + + private string _WorkAreaName; + + private string _ResponsibilityUnitName; + + private System.Nullable _RectificationTime; + + private string _States; + + private string _RegisterDef; + + private string _HazardValue; + + private string _RegisterTypes2Id; + + private string _RegisterTypes2Name; + + private string _RegisterTypes3Id; + + private string _RegisterTypes3Name; + + private string _RegisterTypes4Id; + + private string _RegisterTypes4Name; + + private string _ResponsibilityManName; + + private string _SendUnitId; + + private string _Rectification; + + private System.Nullable _RectificationPeriod; + + private System.Nullable _RegisterDate; + + private string _StatesStr; + + public View_Hazard_HazardRegisterList() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this._ProjectId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardRegisterId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string HazardRegisterId + { + get + { + return this._HazardRegisterId; + } + set + { + if ((this._HazardRegisterId != value)) + { + this._HazardRegisterId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")] + public string ResponsibleUnit + { + get + { + return this._ResponsibleUnit; + } + set + { + if ((this._ResponsibleUnit != value)) + { + this._ResponsibleUnit = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckTime", DbType="DateTime")] + public System.Nullable CheckTime + { + get + { + return this._CheckTime; + } + set + { + if ((this._CheckTime != value)) + { + this._CheckTime = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemTypes", DbType="Char(1)")] + public string ProblemTypes + { + get + { + return this._ProblemTypes; + } + set + { + if ((this._ProblemTypes != value)) + { + this._ProblemTypes = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckManName", DbType="NVarChar(200)")] + public string CheckManName + { + get + { + return this._CheckManName; + } + set + { + if ((this._CheckManName != value)) + { + this._CheckManName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypesName", DbType="NVarChar(200)")] + public string RegisterTypesName + { + get + { + return this._RegisterTypesName; + } + set + { + if ((this._RegisterTypesName != value)) + { + this._RegisterTypesName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(30) NOT NULL", CanBeNull=false)] + public string WorkAreaName + { + get + { + return this._WorkAreaName; + } + set + { + if ((this._WorkAreaName != value)) + { + this._WorkAreaName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityUnitName", DbType="NVarChar(200)")] + public string ResponsibilityUnitName + { + get + { + return this._ResponsibilityUnitName; + } + set + { + if ((this._ResponsibilityUnitName != value)) + { + this._ResponsibilityUnitName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationTime", DbType="DateTime")] + public System.Nullable RectificationTime + { + get + { + return this._RectificationTime; + } + set + { + if ((this._RectificationTime != value)) + { + this._RectificationTime = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="states", Storage="_States", DbType="Char(1)")] + public string States + { + get + { + return this._States; + } + set + { + if ((this._States != value)) + { + this._States = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDef", DbType="NVarChar(500)")] + public string RegisterDef + { + get + { + return this._RegisterDef; + } + set + { + if ((this._RegisterDef != value)) + { + this._RegisterDef = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardValue", DbType="NVarChar(50)")] + public string HazardValue + { + get + { + return this._HazardValue; + } + set + { + if ((this._HazardValue != value)) + { + this._HazardValue = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes2Id", DbType="NVarChar(50)")] + public string RegisterTypes2Id + { + get + { + return this._RegisterTypes2Id; + } + set + { + if ((this._RegisterTypes2Id != value)) + { + this._RegisterTypes2Id = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes2Name", DbType="NVarChar(200)")] + public string RegisterTypes2Name + { + get + { + return this._RegisterTypes2Name; + } + set + { + if ((this._RegisterTypes2Name != value)) + { + this._RegisterTypes2Name = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes3Id", DbType="NVarChar(50)")] + public string RegisterTypes3Id + { + get + { + return this._RegisterTypes3Id; + } + set + { + if ((this._RegisterTypes3Id != value)) + { + this._RegisterTypes3Id = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes3Name", DbType="NVarChar(200)")] + public string RegisterTypes3Name + { + get + { + return this._RegisterTypes3Name; + } + set + { + if ((this._RegisterTypes3Name != value)) + { + this._RegisterTypes3Name = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes4Id", DbType="NVarChar(50)")] + public string RegisterTypes4Id + { + get + { + return this._RegisterTypes4Id; + } + set + { + if ((this._RegisterTypes4Id != value)) + { + this._RegisterTypes4Id = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypes4Name", DbType="NVarChar(200)")] + public string RegisterTypes4Name + { + get + { + return this._RegisterTypes4Name; + } + set + { + if ((this._RegisterTypes4Name != value)) + { + this._RegisterTypes4Name = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityManName", DbType="NVarChar(200)")] + public string ResponsibilityManName + { + get + { + return this._ResponsibilityManName; + } + set + { + if ((this._ResponsibilityManName != value)) + { + this._ResponsibilityManName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendUnitId", DbType="NVarChar(50)")] + public string SendUnitId + { + get + { + return this._SendUnitId; + } + set + { + if ((this._SendUnitId != value)) + { + this._SendUnitId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")] + public string Rectification + { + get + { + return this._Rectification; + } + set + { + if ((this._Rectification != value)) + { + this._Rectification = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationPeriod", DbType="DateTime")] + public System.Nullable RectificationPeriod + { + get + { + return this._RectificationPeriod; + } + set + { + if ((this._RectificationPeriod != value)) + { + this._RectificationPeriod = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDate", DbType="DateTime")] + public System.Nullable RegisterDate + { + get + { + return this._RegisterDate; + } + set + { + if ((this._RegisterDate != value)) + { + this._RegisterDate = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StatesStr", DbType="VarChar(6) NOT NULL", CanBeNull=false)] + public string StatesStr + { + get + { + return this._StatesStr; + } + set + { + if ((this._StatesStr != value)) + { + this._StatesStr = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_Batch_PointBatch")] public partial class View_HJGL_Batch_PointBatch { @@ -292526,6 +292993,24 @@ namespace Model private string _WBSCode; + private System.Nullable _JDWeights; + + private string _Unit; + + private System.Nullable _PlanProjectQuantity; + + private System.Nullable _RealProjectQuantity; + + private System.Nullable _RealStartDate; + + private System.Nullable _IsMileStone; + + private System.Nullable _PlanCost; + + private string _PreWorkCode; + + private string _ShowId; + private string _ProjectId; public View_WBS() @@ -292580,7 +293065,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] public string Name { get @@ -292676,6 +293161,150 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JDWeights", DbType="Decimal(9,2)")] + public System.Nullable JDWeights + { + get + { + return this._JDWeights; + } + set + { + if ((this._JDWeights != value)) + { + this._JDWeights = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(50)")] + public string Unit + { + get + { + return this._Unit; + } + set + { + if ((this._Unit != value)) + { + this._Unit = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanProjectQuantity", DbType="Decimal(18,2)")] + public System.Nullable PlanProjectQuantity + { + get + { + return this._PlanProjectQuantity; + } + set + { + if ((this._PlanProjectQuantity != value)) + { + this._PlanProjectQuantity = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealProjectQuantity", DbType="Decimal(18,2)")] + public System.Nullable RealProjectQuantity + { + get + { + return this._RealProjectQuantity; + } + set + { + if ((this._RealProjectQuantity != value)) + { + this._RealProjectQuantity = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealStartDate", DbType="DateTime")] + public System.Nullable RealStartDate + { + get + { + return this._RealStartDate; + } + set + { + if ((this._RealStartDate != value)) + { + this._RealStartDate = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsMileStone", DbType="Bit")] + public System.Nullable IsMileStone + { + get + { + return this._IsMileStone; + } + set + { + if ((this._IsMileStone != value)) + { + this._IsMileStone = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCost", DbType="Decimal(18,2)")] + public System.Nullable PlanCost + { + get + { + return this._PlanCost; + } + set + { + if ((this._PlanCost != value)) + { + this._PlanCost = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PreWorkCode", DbType="NVarChar(50)")] + public string PreWorkCode + { + get + { + return this._PreWorkCode; + } + set + { + if ((this._PreWorkCode != value)) + { + this._PreWorkCode = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ShowId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ShowId + { + get + { + return this._ShowId; + } + set + { + if ((this._ShowId != value)) + { + this._ShowId = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] public string ProjectId {