diff --git a/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql b/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql new file mode 100644 index 0000000..35ef164 Binary files /dev/null and b/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql differ diff --git a/DataBase/版本日志/SGGLDB_2025-10-13-geh.sql b/DataBase/版本日志/SGGLDB_2025-10-13-geh.sql new file mode 100644 index 0000000..2516dfb Binary files /dev/null and b/DataBase/版本日志/SGGLDB_2025-10-13-geh.sql differ diff --git a/DataBase/版本日志/SGGLDB_2025-11-13-geh.sql b/DataBase/版本日志/SGGLDB_2025-11-13-geh.sql new file mode 100644 index 0000000..901f681 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_2025-11-13-geh.sql @@ -0,0 +1,7 @@ + +--拆分前 +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'F32D79E1-7116-45F2-9964-3F6CB243C403', N'安全数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx', 80, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1'); +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'7AF59776-21CD-4B6A-A765-2F888E4AF8BD', N'质量数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx', 90, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1'); +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'8358C2EE-2B65-4001-AC09-32B6936AA3CA', N'焊接数据统计', NULL, N'ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx', 100, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', N'Menu_SysSet', '1', '1', '1'); +go + diff --git a/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_CQMSData_CQMS）.sql b/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_CQMSData_CQMS）.sql new file mode 100644 index 0000000..e51dcbc --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_CQMSData_CQMS）.sql @@ -0,0 +1,36 @@ + + + + + +CREATE View [dbo].[View_Project_CQMSData_CQMS] +as + WITH LatestData AS ( + SELECT + person.CollCropCode, + MAX(ReportDate) AS LatestReportDate + FROM + dbo.Project_CQMSData_CQMS person + GROUP BY + person.CollCropCode +),RankedData AS ( + SELECT + cqms.* + FROM + dbo.Project_CQMSData_CQMS cqms + INNER JOIN + LatestData l ON cqms.CollCropCode = l.CollCropCode AND cqms.ReportDate = l.LatestReportDate +) +SELECT + pro.ProjectName, + pro.ShortName, + rd.* +FROM RankedData rd +LEFT JOIN Base_Project pro ON pro.ProjectId = rd.ProjectId +where pro.ProjectName !='' and pro.ProjectState='1' + + +GO + + + diff --git a/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_HJGLData_HJGL）.sql b/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_HJGLData_HJGL）.sql new file mode 100644 index 0000000..4cb3735 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_HJGLData_HJGL）.sql @@ -0,0 +1,33 @@ + + + +CREATE View [dbo].[View_Project_HJGLData_HJGL] +as +WITH LatestData AS ( + SELECT + person.CollCropCode, + MAX(ReportDate) AS LatestReportDate + FROM + dbo.Project_HJGLData_HJGL person + GROUP BY + person.CollCropCode +),RankedData AS ( + SELECT + hjgl.* + FROM + dbo.Project_HJGLData_HJGL hjgl + INNER JOIN + LatestData l ON hjgl.CollCropCode = l.CollCropCode AND hjgl.ReportDate = l.LatestReportDate +) +SELECT + pro.ProjectName, + pro.ShortName, + rd.* +FROM RankedData rd +LEFT JOIN Base_Project pro ON pro.ProjectId = rd.ProjectId +where pro.ProjectName !='' and pro.ProjectState='1' + + +GO + + diff --git a/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_HSSEData_HSSE）.sql b/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_HSSEData_HSSE）.sql new file mode 100644 index 0000000..c640665 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-11-13-geh（View_Project_HSSEData_HSSE）.sql @@ -0,0 +1,41 @@ + +CREATE view [dbo].[View_Project_HSSEData_HSSE] as +WITH LatestData AS ( + SELECT + project.CollCropCode, + MAX(ReportDate) AS LatestReportDate + FROM + dbo.Project_HSSEData_HSSE project + GROUP BY + project.CollCropCode +),RankedData AS ( + SELECT + hsse.* + FROM + dbo.Project_HSSEData_HSSE hsse + INNER JOIN + LatestData l ON hsse.CollCropCode = l.CollCropCode AND hsse.ReportDate = l.LatestReportDate +),TotalWorkNumData as +( + select t3.ProjectId,t3.ProjectName,sum(TotalWorkNum) as TotalWorkNum + from Base_Project t3 + join Information_MillionsMonthlyReportItem t1 on ((t1.Name = ('['+t3.ProjectCode+']'+t3.ProjectName)) OR + (t1.Name = t3.ProjectName) ) + join Information_MillionsMonthlyReport t2 on t1.MillionsMonthlyReportId = t2.MillionsMonthlyReportId + where t2.Year=Year(getdate()) and t2.Month + /// 获取总包和其下单位的用户信息 + /// + /// + public static List getUserList() + { + using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) + { + List getDataList = new List(); + var uList = db.Base_Unit.Where(x => x.UnitId == "2B0DB792-49CF-43B4-BB0E-8DD27DF1CEE2" || x.IsBranch == true).Select(x => x.UnitId).ToList(); + + getDataList = (from x in db.Sys_User + where uList.Contains(x.UnitId) && x.IsOffice == true + select new Model.UserItem + { + UserId = x.UserId, + Account = x.Account, + UserCode = x.UserCode, + Password = x.Password, + UserName = x.UserName, + UnitId = x.UnitId, + LoginProjectId = x.ProjectId, + IdentityCard = x.IdentityCard, + Email = x.Email, + Telephone = x.Telephone, + IsOffice = x.IsOffice, + SignatureUrl = x.SignatureUrl.Replace('\\', '/'), + }).ToList(); + + return getDataList.OrderBy(x => x.UnitName).ThenBy(x => x.UserName).ToList(); + } + } + } } diff --git a/SUBQHSE/BLL/BLL.csproj b/SUBQHSE/BLL/BLL.csproj index e3ca3e0..33a221d 100644 --- a/SUBQHSE/BLL/BLL.csproj +++ b/SUBQHSE/BLL/BLL.csproj @@ -895,6 +895,7 @@ + diff --git a/SUBQHSE/BLL/Common/Const.cs b/SUBQHSE/BLL/Common/Const.cs index c3ac52f..4c6d0ba 100644 --- a/SUBQHSE/BLL/Common/Const.cs +++ b/SUBQHSE/BLL/Common/Const.cs @@ -972,7 +972,7 @@ namespace BLL /// /// 项目安全总监岗位Id /// - public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa"; + public static string WorkPost_ProjectHSSEDirector = "7ff487fe-344c-4e36-b255-f882ed270b21"; /// /// HSE工程师岗位Id @@ -1291,6 +1291,7 @@ namespace BLL /// 数据同步 /// public const string Menu_SJTB = "Menu_SJTB"; + public const string Menu_SJTB_P = "Menu_SJTB_P"; ///// ///// 合同菜单 ///// @@ -6740,15 +6741,15 @@ namespace BLL /// /// 施工技术交底管理 /// - public const string ConTechnologyDisclosureMenuId = "A16CFA9D-2783-4573-95F9-EBA2B682B7EA"; + public const string ConTechnologyDisclosureMenuId = "C2BBE0BC-C75A-4EEB-A893-8CDBD2DE2A74"; /// /// 特设质保体系 /// - public const string CQMS_QualityAssuranceMenuId = "2C49EC5E-BF6F-4C44-BA02-9BD183CF68C6"; + public const string CQMS_QualityAssuranceMenuId = "D9BE2C06-E757-4611-A73D-91D2A8FD0DEA"; /// /// 图纸会审管理 /// - public const string ReviewDrawingsMenuId = "856D53B3-C5FB-443F-917B-39E83BE685DB"; + public const string ReviewDrawingsMenuId = "C2BBE0BC-C75A-4EEB-A893-8CDBD2DE2A74"; /// /// 图纸会审记录导入模板文件原始虚拟路径 /// diff --git a/SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs b/SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs index 15db22d..77c747b 100644 --- a/SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs +++ b/SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs @@ -29,14 +29,14 @@ namespace BLL /// /// /// - public static List getHazardRegisterByProjectIdStates(string projectId, string states, int pageIndex) + public static List getHazardRegisterByProjectIdStates(string projectId, string states, int pageIndex ,int pageSize ,string ProblemTypes) { using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) { var hazardRegisters = (from x in db.View_Hazard_HazardRegister_Unit - where (x.ProjectId == projectId || projectId == null) && (x.States == states || states == null) + where (x.ProjectId == projectId || projectId == null) && (x.States == states || states == null) && (x.ProblemTypes == ProblemTypes) orderby x.CheckTime descending - select x).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList(); + select x).Skip(pageSize * (pageIndex - 1)).Take(pageSize).ToList(); return ObjectMapperManager.DefaultInstance.GetMapper, List>().Map(hazardRegisters.ToList()); } } @@ -170,5 +170,40 @@ namespace BLL } } } + + + + + + /// + /// 修改HazardRegister + /// + /// + /// + public static void updateHazardRegister(Model.HazardRegisterItem hazardRegister) + { + using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) + { + var isUpdate = + db.HSSE_Hazard_HazardRegister_Unit.FirstOrDefault(x => + x.HazardRegisterId == hazardRegister.HazardRegisterId); + if (isUpdate != null) + { + isUpdate.ReviewedManId = hazardRegister.ReviewedManId; + isUpdate.RegisterDef = hazardRegister.RegisterDef; + isUpdate.Requirements = hazardRegister.Requirements; + //判断如果查询的会审人和修改的会审人一致，状态改为1 + if (!string.IsNullOrEmpty(isUpdate.CCManIds) && !string.IsNullOrEmpty(hazardRegister.ReviewedManId)) + { + bool areEqual = string.Join(",", isUpdate.CCManIds.Split(',').OrderBy(x => x)) == string.Join(",", hazardRegister.ReviewedManId.Split(',').OrderBy(x => x)); + if (areEqual) + { + isUpdate.States = "1"; + } + } + db.SubmitChanges(); + } + } + } } } \ No newline at end of file diff --git a/SUBQHSE/BLL/Customization/ZJ/HSSE/HiddenInspection/UnitHSSE_Hazard_HazardRegisterService.cs b/SUBQHSE/BLL/Customization/ZJ/HSSE/HiddenInspection/UnitHSSE_Hazard_HazardRegisterService.cs index 4697cf9..f9c299e 100644 --- a/SUBQHSE/BLL/Customization/ZJ/HSSE/HiddenInspection/UnitHSSE_Hazard_HazardRegisterService.cs +++ b/SUBQHSE/BLL/Customization/ZJ/HSSE/HiddenInspection/UnitHSSE_Hazard_HazardRegisterService.cs @@ -193,6 +193,10 @@ namespace BLL public static List GetStatesList() { List handleSteps = new List(); + Model.HandleStep handleStep5 = new Model.HandleStep(); + handleStep5.Id = "4"; + handleStep5.Name = "待会审"; + handleSteps.Add(handleStep5); Model.HandleStep handleStep1 = new Model.HandleStep(); handleStep1.Id = "1"; handleStep1.Name = "待整改"; diff --git a/SUBQHSE/BLL/OpenService/FileInsertService.cs b/SUBQHSE/BLL/OpenService/FileInsertService.cs index 3f19aac..2594188 100644 --- a/SUBQHSE/BLL/OpenService/FileInsertService.cs +++ b/SUBQHSE/BLL/OpenService/FileInsertService.cs @@ -5,11 +5,52 @@ using System.Text; using System.Collections; using System.IO; using System.Web; +using System.Text.RegularExpressions; +using System.Net; namespace BLL { public static class FileInsertService { + /// + /// 获取服务器图片转byte + /// + /// + /// + /// + public static List FilePathTransStream(string fileHost, string attachUrl) + { + List bytes = new List(); + var strs = attachUrl.Trim().Split(','); + + try + { + foreach (var fileUrl in strs) + { + string filepath = $"{fileHost}{fileUrl}"; + // 创建WebClient实例 + using (WebClient webClient = new WebClient()) + { + // 下载图片并保存到内存流 + using (MemoryStream ms = new MemoryStream(webClient.DownloadData(filepath))) + { + // 将MemoryStream转换为byte数组 + byte[] imageBytes = ms.ToArray(); + bytes.Add(imageBytes); + //// 使用byte数组（例如，保存到文件或进行其他处理） + //File.WriteAllBytes("localImage.jpg", imageBytes); + } + } + } + } + catch (Exception ex) + { + Console.WriteLine("Error: " + ex.Message); + } + return bytes; + } + + /// /// 获取附件数据流类 /// @@ -62,17 +103,28 @@ namespace BLL if (strs.Count() > i) { string physicalpath = Funs.RootPath; - //HttpContext.Current.Request.PhysicalApplicationPath; - string fullPath = physicalpath + strs[i]; + string fpath = strs[i]; + string fullPath = physicalpath + fpath; if (!File.Exists(fullPath)) { byte[] fileContext = item; - int index = fullPath.LastIndexOf("\\"); - string filePath = fullPath.Substring(0, index); + string fileName = Regex.Match(fullPath, @"[^/\\?]+(\?.*)?$").Value; + string filePath = fullPath.Replace(fileName, ""); + //int index = fullPath.LastIndexOf("\\"); + //string filePath = fullPath.Substring(0, index) ; + //string filePath = index > 0 ? fullPath.Substring(0, index) : fullPath; - if (!Directory.Exists(filePath)) + try { - Directory.CreateDirectory(filePath); + if (!Directory.Exists(filePath)) + { + Directory.CreateDirectory(filePath); + } + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"附件【{filePath}】获取异常！"); + //continue; } //string savePath = fullPath + fileName; @@ -134,5 +186,45 @@ namespace BLL } } } + + + /// + /// 数据和附件插入到多附件表【不存实际文件，只存地址】 + /// + public static void InsertAttachFileRecord(string attachFileId, string dataId, string attachSource, string attachUrl) + { + var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.AttachFileId == attachFileId); + if (getAtt != null) + { + Funs.DB.AttachFile.DeleteOnSubmit(getAtt); + Funs.DB.SubmitChanges(); + } + //多附件 + var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataId); + if (attachFile == null && !string.IsNullOrEmpty(attachSource)) + { + Model.AttachFile newAttachFile = new Model.AttachFile + { + AttachFileId = attachFileId, + ToKeyId = dataId, + AttachSource = attachSource, + AttachUrl = attachUrl + }; + Funs.DB.AttachFile.InsertOnSubmit(newAttachFile); + Funs.DB.SubmitChanges(); + } + else + { + if (attachFile.AttachUrl != attachUrl) + { + ///删除附件文件 + BLL.UploadAttachmentService.DeleteFile(Funs.RootPath, attachFile.AttachUrl); + attachFile.AttachSource = attachSource; + attachFile.AttachUrl = attachUrl; + Funs.DB.SubmitChanges(); + } + } + } + } } diff --git a/SUBQHSE/BLL/TokenHelper.cs b/SUBQHSE/BLL/TokenHelper.cs new file mode 100644 index 0000000..9ce6b09 --- /dev/null +++ b/SUBQHSE/BLL/TokenHelper.cs @@ -0,0 +1,127 @@ +using System; +using System.IO; +using System.Security.Cryptography; +using System.Text; +using Newtonsoft.Json; + +namespace BLL +{ + /// + /// Token加密解密工具类 + /// 用于iframe跨域自动登录的token处理 + /// + public static class TokenHelper + { + // 默认密钥，建议从配置文件中读取 + private static readonly string SecretKey = "cncec-subqhse-256bit-secret-key-for-auth-token"; + + /// + /// 加密Token + /// + /// 明文 + /// 加密后的Base64字符串 + public static string EncryptToken(string plainText) + { + try + { + // 确保密钥长度为32字节（256位） + string key = SecretKey.PadRight(32, '0').Substring(0, 32); + + using (var aes = Aes.Create()) + { + aes.Key = Encoding.UTF8.GetBytes(key); + aes.IV = new byte[16]; // 使用固定IV，简化实现 + aes.Mode = CipherMode.CBC; + aes.Padding = PaddingMode.PKCS7; + + using (var encryptor = aes.CreateEncryptor()) + using (var msEncrypt = new MemoryStream()) + { + using (var csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write)) + using (var swEncrypt = new StreamWriter(csEncrypt)) + { + swEncrypt.Write(plainText); + } + return Convert.ToBase64String(msEncrypt.ToArray()); + } + } + } + catch (Exception ex) + { + throw new Exception($"Token加密失败: {ex.Message}", ex); + } + } + + /// + /// 解密Token + /// + /// 加密的Base64字符串 + /// 解密后的明文 + public static string DecryptToken(string cipherText) + { + try + { + // 确保密钥长度为32字节（256位） + string key = SecretKey.PadRight(32, '0').Substring(0, 32); + + using (var aes = Aes.Create()) + { + aes.Key = Encoding.UTF8.GetBytes(key); + aes.IV = new byte[16]; // 使用固定IV，与加密一致 + aes.Mode = CipherMode.CBC; + aes.Padding = PaddingMode.PKCS7; + + using (var decryptor = aes.CreateDecryptor()) + using (var msDecrypt = new MemoryStream(Convert.FromBase64String(cipherText))) + using (var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read)) + using (var srDecrypt = new StreamReader(csDecrypt)) + { + return srDecrypt.ReadToEnd(); + } + } + } + catch (Exception ex) + { + throw new Exception($"Token解密失败: {ex.Message}", ex); + } + } + + /// + /// 生成认证Token + /// + /// 用户ID + /// 来源标识 + /// 加密的Token + public static string GenerateAuthToken(string userId, string source = "qhse.cncecoa.com") + { + var tokenData = new + { + user_id = userId, + timestamp = DateTimeOffset.Now.ToUnixTimeSeconds(), + source = source, + random = Guid.NewGuid().ToString("N").Substring(0, 8) // 添加8位随机数增强安全性 + }; + + string json = JsonConvert.SerializeObject(tokenData); + return EncryptToken(json); + } + + /// + /// 验证Token格式 + /// + /// Token字符串 + /// 是否为有效的Base64格式 + public static bool IsValidTokenFormat(string token) + { + try + { + Convert.FromBase64String(token); + return true; + } + catch + { + return false; + } + } + } +} \ No newline at end of file diff --git a/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs b/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs index f266e86..53acc66 100644 --- a/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs +++ b/SUBQHSE/BLL/WebService/CNCECHSSEGetWebService.cs @@ -1687,6 +1687,7 @@ string code = "0"; using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) { + string filePath = Funs.SGGLUrl; try { var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB @@ -1714,8 +1715,9 @@ ToKeyId = x.ToKeyId2, AttachSource = x.AttachSource2, AttachUrl = x.AttachUrl2, - ////附件转为字节传送 - FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2), + FilePath = filePath + //////附件转为字节传送 + //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2), }; string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/UpDCGLCheckRectifyTable"; @@ -1725,9 +1727,12 @@ { "token", ServerService.GetToken().Token } }; var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList()); + + //ErrLogInfo.WriteLog($"【集团检查整改上报数据】：{pushContent}"); var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent); if (!string.IsNullOrEmpty(strJosn)) { + //ErrLogInfo.WriteLog($"【集团检查整改上报数据结果】：{strJosn}"); JObject obj = JObject.Parse(strJosn); code = obj["code"].ToString(); @@ -1741,8 +1746,12 @@ var newCheckRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item); if (newCheckRectify != null) { - newCheckRectify.HandleState = BLL.Const.State_3; //已完成 - db.SubmitChanges(); + var getNoUpdateItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyId == checkRectifyId && !x.RealEndDate.HasValue); + if (getNoUpdateItem == null) + {//问题全部整改完成 + newCheckRectify.HandleState = BLL.Const.State_3; //已完成 + db.SubmitChanges(); + } } } } diff --git a/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs b/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs index 7084edc..b77c22d 100644 --- a/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs +++ b/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs @@ -1103,7 +1103,7 @@ ArchitectureReportId = x.ArchitectureReportId, UnitId = x.UnitId, Year = x.Year, - Quarters = x.Quarters, + Month = x.Month, FillingMan = x.FillingMan, FillingDate = x.FillingDate, DutyPerson = x.DutyPerson, @@ -1139,7 +1139,7 @@ ////更新 当前人要处理的意见 ProjectDataFlowSetService.CloseFlowOperate(Const.ArchitectureReportMenuId, item, string.Empty); // //更新催报信息 - UrgeReportService.SetComplete(report.UnitId, Const.ReportType_1, report.Year.ToString(), report.Quarters.ToString()); + UrgeReportService.SetComplete(report.UnitId, Const.ReportType_1, report.Year.ToString(), report.Month.ToString()); } } LogService.AddSys_Log(CurrUser, "【建筑行业能源节约与生态环境保护汇总表】上传到服务器" + upReport.Count().ToString() + "条数据；", null, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnUploadResources); diff --git a/SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportItemService.cs b/SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportItemService.cs index 39c5b06..1055883 100644 --- a/SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportItemService.cs +++ b/SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportItemService.cs @@ -57,12 +57,12 @@ namespace BLL /// /// 建筑行业能源节约与生态环境保护汇总明细表Id /// 明细记录集合 - public static List GetYearSumItems(string unitId, int? year, int? Quarters) + public static List GetYearSumItems(string unitId, int? year, int? Month) { return (from x in Funs.DB.Environmental_ArchitectureReportItem join y in Funs.DB.Environmental_ArchitectureReport on x.ArchitectureReportId equals y.ArchitectureReportId - where y.UnitId == unitId && y.Year == year && y.Quarters == Quarters + where y.UnitId == unitId && y.Year == year && y.Month == Month orderby x.SortIndex select x).Distinct().ToList(); } diff --git a/SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportService.cs b/SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportService.cs index 4755878..9c66875 100644 --- a/SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportService.cs +++ b/SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportService.cs @@ -25,9 +25,9 @@ namespace BLL /// 年度 /// 月份 /// 建筑行业能源节约与生态环境保护汇总表 - public static Model.Environmental_ArchitectureReport GetArchitectureReportByUnitIdAndYearAndQuarters(string unitId, int year, int Quarters) + public static Model.Environmental_ArchitectureReport GetArchitectureReportByUnitIdAndYearAndQuarters(string unitId, int year, int month) { - return Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == unitId && e.Quarters == Quarters && e.Year == year); + return Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == unitId && e.Month == month && e.Year == year); } /// @@ -50,7 +50,7 @@ namespace BLL { ArchitectureReportId = ArchitectureReport.ArchitectureReportId, Year = ArchitectureReport.Year, - Quarters = ArchitectureReport.Quarters, + Month = ArchitectureReport.Month, UnitId = ArchitectureReport.UnitId, FillingDate = ArchitectureReport.FillingDate, DutyPerson = ArchitectureReport.DutyPerson, @@ -72,7 +72,7 @@ namespace BLL if (newArchitectureReport != null) { newArchitectureReport.Year = ArchitectureReport.Year; - newArchitectureReport.Quarters = ArchitectureReport.Quarters; + newArchitectureReport.Month = ArchitectureReport.Month; newArchitectureReport.UnitId = ArchitectureReport.UnitId; newArchitectureReport.FillingDate = ArchitectureReport.FillingDate; newArchitectureReport.DutyPerson = ArchitectureReport.DutyPerson; @@ -101,9 +101,9 @@ namespace BLL /// /// Id /// - public static Model.Environmental_ArchitectureReport GetArchitectureReportByUnitIdDate(string unitId, int year, int Quarters) + public static Model.Environmental_ArchitectureReport GetArchitectureReportByUnitIdDate(string unitId, int year, int month) { - return Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == unitId && e.Year == year && e.Quarters == Quarters); + return Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == unitId && e.Year == year && e.Month == month); } /// diff --git a/SUBQHSE/BLL/ZHGL/Environmental/ProjectArchitectureReportItemService.cs b/SUBQHSE/BLL/ZHGL/Environmental/ProjectArchitectureReportItemService.cs index c77217e..8d46432 100644 --- a/SUBQHSE/BLL/ZHGL/Environmental/ProjectArchitectureReportItemService.cs +++ b/SUBQHSE/BLL/ZHGL/Environmental/ProjectArchitectureReportItemService.cs @@ -57,12 +57,12 @@ namespace BLL /// /// 建筑行业能源节约与生态环境保护汇总明细表Id /// 明细记录集合 - public static List GetYearSumItems(string projectId, int? year, int? Quarters) + public static List GetYearSumItems(string projectId, int? year, int? Month) { return (from x in Funs.DB.Environmental_ProjectArchitectureReportItem join y in Funs.DB.Environmental_ProjectArchitectureReport on x.ArchitectureReportId equals y.ArchitectureReportId - where y.ProjectId == projectId && y.Year == year && y.Quarters == Quarters + where y.ProjectId == projectId && y.Year == year && y.Month == Month orderby x.SortIndex select x).Distinct().ToList(); } diff --git a/SUBQHSE/BLL/ZHGL/Environmental/ProjectArchitectureReportService.cs b/SUBQHSE/BLL/ZHGL/Environmental/ProjectArchitectureReportService.cs index d58f123..4df3645 100644 --- a/SUBQHSE/BLL/ZHGL/Environmental/ProjectArchitectureReportService.cs +++ b/SUBQHSE/BLL/ZHGL/Environmental/ProjectArchitectureReportService.cs @@ -25,9 +25,9 @@ namespace BLL /// 年度 /// 月份 /// 建筑行业能源节约与生态环境保护汇总表 - public static Model.Environmental_ProjectArchitectureReport GetArchitectureReportByProjectIdAndYearAndQuarters(string projectId, int year, int Quarters) + public static Model.Environmental_ProjectArchitectureReport GetArchitectureReportByProjectIdAndYearAndQuarters(string projectId, int year, int Month) { - return Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == projectId && e.Quarters == Quarters && e.Year == year); + return Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == projectId && e.Month == Month && e.Year == year); } /// @@ -50,7 +50,7 @@ namespace BLL { ArchitectureReportId = ArchitectureReport.ArchitectureReportId, Year = ArchitectureReport.Year, - Quarters = ArchitectureReport.Quarters, + Month = ArchitectureReport.Month, ProjectId = ArchitectureReport.ProjectId, FillingDate = ArchitectureReport.FillingDate, DutyPerson = ArchitectureReport.DutyPerson, @@ -72,7 +72,7 @@ namespace BLL if (newArchitectureReport != null) { newArchitectureReport.Year = ArchitectureReport.Year; - newArchitectureReport.Quarters = ArchitectureReport.Quarters; + newArchitectureReport.Month = ArchitectureReport.Month; newArchitectureReport.ProjectId = ArchitectureReport.ProjectId; newArchitectureReport.FillingDate = ArchitectureReport.FillingDate; newArchitectureReport.DutyPerson = ArchitectureReport.DutyPerson; @@ -101,9 +101,9 @@ namespace BLL /// /// Id /// - public static Model.Environmental_ProjectArchitectureReport GetArchitectureReportByProjectIdDate(string ProjectId, int year, int Quarters) + public static Model.Environmental_ProjectArchitectureReport GetArchitectureReportByProjectIdDate(string ProjectId, int year, int Month) { - return Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == ProjectId && e.Year == year && e.Quarters == Quarters); + return Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == ProjectId && e.Year == year && e.Month == Month); } /// diff --git a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx index a3d62bc..476ed17 100644 --- a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx +++ b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx @@ -49,9 +49,9 @@ - + - + diff --git a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs index 8a00dbc..8051ba2 100644 --- a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs @@ -264,26 +264,23 @@ namespace FineUIPro.Web.CQMS.ProcessControl } } - protected void btnOut_Click(object sender, EventArgs e) { - DateTime dt = DateTime.Now; - string filename = dt.Year.ToString() + dt.Month.ToString() + dt.Day.ToString() + dt.Hour.ToString() + dt.Minute.ToString() + dt.Second.ToString(); - - Response.Clear(); - Response.Buffer = true; - Response.Charset = "GB2312"; + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("控制点检查检测合格率统计" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; - Response.Write(""); - - Response.AppendHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("控制点检查检测合格率统计" + filename, System.Text.Encoding.UTF8) + ".xls"); - Response.ContentType = "application/ms-excel"; - this.EnableViewState = false; - System.IO.StringWriter oStringWriter = new System.IO.StringWriter(); - System.Web.UI.HtmlTextWriter oHtmlTextWriter = new System.Web.UI.HtmlTextWriter(oStringWriter); - this.Grid1.RenderControl(oHtmlTextWriter); - Response.Write(oStringWriter.ToString()); - Response.Flush(); + this.Grid1.PageSize = this.Grid1.RecordCount; + if (this.drpCNProfessional.SelectedValue !=BLL.Const._Null) + { + BindGvInspectionManagement(this.drpCNProfessional.SelectedValue); + } + else + { + BindGvInspectionManagement(null); + } + Response.Write(GetGridTableHtml(Grid1)); Response.End(); } } diff --git a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.designer.cs index edf38b2..10bece3 100644 --- a/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.designer.cs @@ -123,12 +123,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl protected global::FineUIPro.Button btnOut; /// - /// lblPageIndex 控件。 + /// lblNumber 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::System.Web.UI.WebControls.Label lblPageIndex; + protected global::System.Web.UI.WebControls.Label lblNumber; } } diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx index 1bcf78f..e13fc15 100644 --- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx +++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx @@ -78,6 +78,11 @@ AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="250px" LabelWidth="80px"> + + + + @@ -106,6 +111,7 @@ + @@ -159,12 +165,12 @@ - - - - - + <%-- + <%-- TextAlign="Left"> --%> + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> <%-- private void BindGrid() { - string strSql = string.Empty; + StringBuilder sb = new StringBuilder(); + sb.Append($@"SELECT S.CheckRectifyId,S.CheckRectifyCode,S.ProjectId,S.ProjectName,S.UnitId,U.UnitName,S.CheckDate,CASE S.HandleState WHEN '{BLL.Const.State_1}' THEN '未签发' WHEN '{BLL.Const.State_2}' THEN '未上报' ELSE '已上报' END AS HandleState, + S.IssueMan,S.IssueDate,ISNULL(TotalCount.TotalCount,0) AS TotalCount ,ISNULL(CompleteCount.CompleteCount,0) AS CompleteCount,(ISNULL(TotalCount.TotalCount,0) -ISNULL(CompleteCount.CompleteCount,0)) AS UnCompleteCount "); + sb.Append("FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId "); + sb.Append(" LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId "); + sb.Append(" LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId "); + if (!string.IsNullOrWhiteSpace(proType) && proType == "1") + {//只查询本项目检查数据 + sb.Append($"WHERE S.ProjectId='{this.CurrUser.LoginProjectId}' "); + } + sb.Append("ORDER BY HandleState"); SqlParameter[] parameter = new SqlParameter[] { }; - strSql = "SELECT S.CheckRectifyId,S.CheckRectifyCode,S.ProjectId,S.ProjectName,S.UnitId,U.UnitName,S.CheckDate,CASE S.HandleState WHEN '" + BLL.Const.State_1 + "' THEN '未签发' WHEN '" + BLL.Const.State_2 + "' THEN '未上报' ELSE '已上报' END AS HandleState," - + @" S.IssueMan,S.IssueDate,ISNULL(TotalCount.TotalCount,0) AS TotalCount ,ISNULL(CompleteCount.CompleteCount,0) AS CompleteCount,(ISNULL(TotalCount.TotalCount,0) -ISNULL(CompleteCount.CompleteCount,0)) AS UnCompleteCount" - + @" FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId" - + @" LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId" - + @" LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId" - + @" ORDER BY HandleState"; - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter); // 2.获取当前分页数据 //var table = this.GetPagedDataTable(Grid1, tb1); @@ -365,7 +371,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck #endregion #endregion - + /// /// 从集团获取 /// @@ -387,8 +393,9 @@ namespace FineUIPro.Web.DCGL.ServerCheck #region 获取 + /// - /// 获取 + /// 获取督查检查整改 /// /// /// @@ -397,7 +404,239 @@ namespace FineUIPro.Web.DCGL.ServerCheck var responeData = new Model.ResponeData(); try { - string unitId =CommonService.GetThisUnitId(); + string unitId = CommonService.GetThisUnitId(); + string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getDCGLCheckInfoRectify?unitId=" + unitId; + string contenttype = "application/json;charset=unicode"; + Hashtable newToken = new Hashtable + { + { "token", ServerService.GetToken().Token } + }; + + var strJosn = APIGetHttpService.Http(baseurl, "GET", contenttype, newToken, null); + if (!string.IsNullOrEmpty(strJosn)) + { + JObject obj = JObject.Parse(strJosn); + responeData.code = Funs.GetNewIntOrZero(obj["code"].ToString()); + responeData.message = obj["message"].ToString(); + if (responeData.code == 1) + { + JArray getData = JArray.Parse(obj["data"].ToString()); + if (getData.Count() > 0) + { + using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) + { + List ids = new List(); + foreach (var item in getData) + { + string getCheckRectifyId = item["CheckRectifyId"].ToString(); + if (!ids.Contains(getCheckRectifyId)) + { + var newRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == getCheckRectifyId); + if (newRectify == null) + { + ids.Add(getCheckRectifyId); + Model.DCGL_Check_CheckRectify newCheckRectify = new Model.DCGL_Check_CheckRectify + { + CheckRectifyId = getCheckRectifyId, + CheckRectifyCode = item["CheckRectifyCode"].ToString(), + ProjectId = item["ProjectId"].ToString(), + ProjectName = item["ProjectName"].ToString(), + UnitId = unitId, + CheckDate = Funs.GetNewDateTime(item["CheckDate"].ToString()), + IssueMan = item["IssueMan"].ToString(), + IssueDate = Funs.GetNewDateTime(item["IssueDate"].ToString()), + HandleState = item["HandleState"].ToString() + }; + db.DCGL_Check_CheckRectify.InsertOnSubmit(newCheckRectify); + db.SubmitChanges(); + } + else + { + newRectify.CheckRectifyCode = item["CheckRectifyCode"].ToString(); + db.SubmitChanges(); + } + + //获取对应主表主键的明细集合 + string getNoticeItemId = item["NoticeItemId"].ToString(); + var notice = db.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == getNoticeItemId); + if (notice == null) + { + Model.DCGL_Check_CheckInfo_TableNoticeItem newCheckRectifyItem = new Model.DCGL_Check_CheckInfo_TableNoticeItem + { + ID = getNoticeItemId, + CheckInfoId = item["CheckInfoId"].ToString(), + SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()), + Describe = item["Describe"].ToString(), + Standards = item["Standards"].ToString(), + Advice = item["Advice"].ToString(), + LimitTime = Funs.GetNewDateTime(item["LimitTime"].ToString()), + + Situation = item["Situation"].ToString(), + Remark = item["Remark"].ToString(), + Url = item["Url"].ToString(), + AffUrl = item["AffUrl"].ToString(), + RiskLevel = item["RiskLevel"].ToString(), + ProblemTypes = item["ProblemTypes"].ToString(), + ProblemSubTypeId = item["ProblemSubTypeId"].ToString(), + ProblemSubType = item["ProblemSubType"].ToString(), + States = item["States"].ToString(), + + //WorkType = item["WorkType"].ToString(), + //DangerPoint = item["DangerPoint"].ToString(), + //RiskExists = item["RiskExists"].ToString(), + //IsProject = Convert.ToBoolean(item["IsProject"].ToString()), + //CheckMan = item["CheckMan"].ToString(), + //SubjectUnitMan = item["SubjectUnitMan"].ToString(), + }; + db.DCGL_Check_CheckInfo_TableNoticeItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + + BLL.CommonService.DeleteAttachFileById(getNoticeItemId);//删除附件 + ////上传附件 + string getAttachFileId = item["AttachFileId"].ToString(); + if (!string.IsNullOrEmpty(getAttachFileId)) + { + List resultList = new List(); + string filePath = item["FilePath"].ToString(); + string attachSource = item["AttachSource"].ToString(); + string attachUrl = item["AttachUrl"].ToString(); + + BLL.FileInsertService.InsertAttachFileRecord(getAttachFileId, getNoticeItemId, attachSource, attachUrl); + //if (!string.IsNullOrWhiteSpace(filePath) && !string.IsNullOrWhiteSpace(attachSource) && !string.IsNullOrWhiteSpace(attachUrl)) + //{ + // resultList = FileInsertService.FilePathTransStream(filePath, attachUrl); + //} + //BLL.FileInsertService.InsertAttachFile(getAttachFileId, getNoticeItemId, attachSource, attachUrl, resultList); + } + + string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString(); + var oldItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId); + if (oldItem == null) + { + Model.DCGL_Check_CheckRectifyItem newCheckRectifyItem = new Model.DCGL_Check_CheckRectifyItem + { + CheckRectifyItemId = getCheckRectifyItemId, + CheckRectifyId = getCheckRectifyId, + NoticeItemId = getNoticeItemId, + ConfirmMan = item["ConfirmMan"].ToString(), + ConfirmManName = item["ConfirmManName"].ToString(), + ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()), + OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()), + OrderEndPerson = item["OrderEndPerson"].ToString(), + RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()), + }; + + db.DCGL_Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + } + else + { + //获取对应主表主键的明细集合 + string getNoticeItemId = item["NoticeItemId"].ToString(); + var notice = db.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == getNoticeItemId); + if (notice == null) + { + + Model.DCGL_Check_CheckInfo_TableNoticeItem newCheckRectifyItem = new Model.DCGL_Check_CheckInfo_TableNoticeItem + { + ID = getNoticeItemId, + CheckInfoId = item["CheckInfoId"].ToString(), + SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()), + Describe = item["Describe"].ToString(), + Standards = item["Standards"].ToString(), + Advice = item["Advice"].ToString(), + LimitTime = Funs.GetNewDateTime(item["LimitTime"].ToString()), + + Situation = item["Situation"].ToString(), + Remark = item["Remark"].ToString(), + Url = item["Url"].ToString(), + AffUrl = item["AffUrl"].ToString(), + RiskLevel = item["RiskLevel"].ToString(), + ProblemTypes = item["ProblemTypes"].ToString(), + ProblemSubTypeId = item["ProblemSubTypeId"].ToString(), + ProblemSubType = item["ProblemSubType"].ToString(), + States = item["States"].ToString(), + + //WorkType = item["WorkType"].ToString(), + //DangerPoint = item["DangerPoint"].ToString(), + //RiskExists = item["RiskExists"].ToString(), + //IsProject = Convert.ToBoolean(item["IsProject"].ToString()), + //CheckMan = item["CheckMan"].ToString(), + //SubjectUnitMan = item["SubjectUnitMan"].ToString(), + }; + db.DCGL_Check_CheckInfo_TableNoticeItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + + BLL.CommonService.DeleteAttachFileById(getNoticeItemId);//删除附件 + ////上传附件 + string getAttachFileId = item["AttachFileId"].ToString(); + if (!string.IsNullOrEmpty(getAttachFileId)) + { + List resultList = new List(); + string attachSource = item["AttachSource"].ToString(); + string attachUrl = item["AttachUrl"].ToString(); + BLL.FileInsertService.InsertAttachFileRecord(getAttachFileId, getNoticeItemId, attachSource, attachUrl); + //if (!string.IsNullOrWhiteSpace(filePath) && !string.IsNullOrWhiteSpace(attachSource) && !string.IsNullOrWhiteSpace(attachUrl)) + //{ + // resultList = FileInsertService.FilePathTransStream(filePath, attachUrl); + //} + //BLL.FileInsertService.InsertAttachFile(getAttachFileId, getNoticeItemId, attachSource, attachUrl, resultList); + } + + string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString(); + var oldItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId); + if (oldItem == null) + { + Model.DCGL_Check_CheckRectifyItem newCheckRectifyItem = new Model.DCGL_Check_CheckRectifyItem + { + CheckRectifyItemId = getCheckRectifyItemId, + CheckRectifyId = getCheckRectifyId, + NoticeItemId = getNoticeItemId, + ConfirmMan = item["ConfirmMan"].ToString(), + ConfirmManName = item["ConfirmManName"].ToString(), + ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()), + OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()), + OrderEndPerson = item["OrderEndPerson"].ToString(), + RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()), + }; + + db.DCGL_Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + } + } + } + } + responeData.message = "获取成功：整改明细记录" + getData.Count().ToString() + "条"; + } + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = "获取失败：" + ex.Message; + ErrLogInfo.WriteLog("督查检查通知单获取！", ex); + } + + return responeData; + } + #endregion + + #region 获取 + /// + /// 获取 + /// + /// + /// + public static Model.ResponeData getCheck_CheckRectifyListToSUBOld() + { + var responeData = new Model.ResponeData(); + try + { + string unitId = CommonService.GetThisUnitId(); string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getDCGLCheckRectify?unitId=" + unitId; string contenttype = "application/json;charset=unicode"; Hashtable newToken = new Hashtable diff --git a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx index 0276c36..c545431 100644 --- a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx +++ b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx @@ -6,11 +6,36 @@ 隐患整改单 + + + @@ -57,7 +82,7 @@ @@ -74,10 +99,16 @@ - + + + + + <%-- - + --%> @@ -150,5 +181,43 @@ IsModal="true" Width="800px" Height="500px"> +
+ +
+ + diff --git a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs index 5b077a4..27bbbf6 100644 --- a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs @@ -23,6 +23,12 @@ namespace FineUIPro.Web.DCGL.ServerCheck } } + /// + /// 集团服务器路径 + /// + public string CNCECPath = BLL.Funs.CNCECPath; + //public string CNCECPath = "https://qhse.cncecoa.com/QHSE/"; + /// /// 定义集合 /// @@ -74,6 +80,27 @@ namespace FineUIPro.Web.DCGL.ServerCheck } } + + /// + /// 获取整改前图片(放于Img中) + /// + /// + /// + protected string ConvertImageUrlByImage(object id) + { + string url = string.Empty; + if (id != null) + { + var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id.ToString()); + + if (attachFile != null) + { + url = BLL.UploadAttachmentService.ShowImage(CNCECPath, attachFile.AttachUrl); + } + } + return url; + } + /// /// 保存按钮 /// @@ -128,6 +155,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck } if (type == BLL.Const.BtnSaveUp) { + //string code = CNCECHSSEGetWebService.UpReportDCGlCheck_CheckRectify(newCheckRectify.CheckRectifyId, this.CurrUser); string code = CNCECHSSEGetWebService.UpDCGlCheck_CheckRectify(newCheckRectify.CheckRectifyId, this.CurrUser); if (code == "1") { diff --git a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs index e5aeebb..d4dbed1 100644 --- a/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs @@ -149,6 +149,15 @@ namespace FineUIPro.Web.DCGL.ServerCheck /// protected global::System.Web.UI.WebControls.Label Label4; + /// + /// lbImageUrl1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbImageUrl1; + /// /// txtOrderEndPerson 控件。 /// diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（司索信号工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（司索信号工）.doc index 2e3b322..e47a12e 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（司索信号工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（司索信号工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（塔吊司机）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（塔吊司机）.doc index c4d775e..44b1a1b 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（塔吊司机）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（塔吊司机）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（安全员）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（安全员）.doc index 62f5546..e0582cf 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（安全员）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（安全员）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（挖机司机）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（挖机司机）.doc index e7b76ef..e396a56 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（挖机司机）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（挖机司机）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（施工电梯司机）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（施工电梯司机）.doc index 2aa529a..d64383d 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（施工电梯司机）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（施工电梯司机）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（普工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（普工）.doc index c16f113..30a174b 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（普工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（普工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（木工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（木工）.doc index ea203d7..f0c8f90 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（木工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（木工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（架子工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（架子工）.doc index e599665..f52d5f9 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（架子工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（架子工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（桩基）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（桩基）.doc index 0a8a2eb..2dc0e2c 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（桩基）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（桩基）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（水电工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（水电工）.doc index badcf46..dc5fdb7 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（水电工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（水电工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（渣土车司机）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（渣土车司机）.doc index 020a31a..9e5289c 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（渣土车司机）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（渣土车司机）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（班组管理员）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（班组管理员）.doc index aad55e0..2f3a410 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（班组管理员）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（班组管理员）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（瓦工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（瓦工）.doc index c89009a..0955dfa 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（瓦工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（瓦工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（电工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（电工）.doc index 98cdd70..4d8fb3a 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（电工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（电工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（电焊工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（电焊工）.doc index b4111b4..2bdf4a5 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（电焊工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（电焊工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（管理人员）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（管理人员）.doc index 7bd5989..a5e5efc 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（管理人员）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（管理人员）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（装配、灌浆工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（装配、灌浆工）.doc index 5d20478..0ca69ee 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（装配、灌浆工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（装配、灌浆工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（起重机司机）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（起重机司机）.doc index 61f96fe..85da3ef 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（起重机司机）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（起重机司机）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（钢筋工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（钢筋工）.doc index 0821a11..06af975 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（钢筋工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（钢筋工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（防水普工）.doc b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（防水普工）.doc index b530553..fee0160 100644 Binary files a/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（防水普工）.doc and b/SUBQHSE/FineUIPro.Web/File/Word/Person/安全教育培训打印整套（防水普工）.doc differ diff --git a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj index b4569ed..0da815e 100644 --- a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj @@ -729,6 +729,7 @@ + @@ -739,9 +740,11 @@ + + @@ -2592,8 +2595,6 @@ - - diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs index d68435b..e9749b7 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs @@ -34,6 +34,19 @@ namespace FineUIPro.Web.HSSE.Check { if (!IsPostBack) { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + this.ucTree.UnitId = this.CurrUser.UnitId; + this.ucTree.ProjectId = this.ProjectId; + + if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + this.panelLeftRegion.Hidden = true; + // this.Grid1.Columns[0].Hidden = true; + } BindGrid(); } } diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx index e4a1e6b..b50226b 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx @@ -15,7 +15,7 @@ - + - + + + + + + + + + diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs index 73d6b84..14e7cb5 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs @@ -1,6 +1,7 @@ using BLL; using System; using System.Linq; +using System.Text; namespace FineUIPro.Web.HSSE.HiddenInspection { @@ -87,10 +88,21 @@ namespace FineUIPro.Web.HSSE.HiddenInspection UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, true); UserService.InitUserProjectIdUnitTypeDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, null, true); + + var query = (from x in Funs.DB.Technique_Rectify + where x.IsEndLever.Value == true + select new + { + RegisterTypesId = x.RectifyId, + RegisterTypesName = x.RectifyName, + }).ToList(); + this.drpRegisterTypes.DataTextField = "RegisterTypesName"; this.drpRegisterTypes.DataValueField = "RegisterTypesId"; - this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型 + // this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型 + this.drpRegisterTypes.DataSource = query; //安全巡检类型 this.drpRegisterTypes.DataBind(); + Funs.FineUIPleaseSelect(drpRegisterTypes); if (!string.IsNullOrWhiteSpace(type)) { this.drpRegisterTypes.Items.FindByText(type).Selected = true; @@ -127,6 +139,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection if (!string.IsNullOrEmpty(registration.RegisterTypesId)) { this.drpRegisterTypes.SelectedValue = registration.RegisterTypesId; + drpRegisterTypes_SelectedIndexChanged(null, null); } if (!string.IsNullOrEmpty(registration.CheckCycle)) { @@ -144,8 +157,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection { this.txtRectificationPeriod.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", registration.RectificationPeriod); } - - this.txtRegisterDef.Text = registration.RegisterDef; + this.drpRegisterDef.Text = registration.RegisterDef; + this.txtRequirements.Text = registration.Requirements; this.txtCutPayment.Text = registration.CutPayment.ToString(); this.drpCheckMan.SelectedValue = registration.CheckManId; if (registration.CheckTime != null) @@ -168,7 +181,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection if (control != null) { var risk = Funs.DB.HSSE_ConstructionRisk.FirstOrDefault(x => x.ConstructionRiskId == control.ConstructionRiskId); - txtRegisterDef.Text = risk.LicenseDes; + // txtRegisterDef.Text = risk.LicenseDes; drpUnit.SelectedValue = risk.UnitId; drpWorkArea.SelectedValue = risk.WorkAreaId; } @@ -263,7 +276,15 @@ namespace FineUIPro.Web.HSSE.HiddenInspection { register.Place = this.drpWorkArea.SelectedValue; } - register.RegisterDef = this.txtRegisterDef.Text.Trim(); + if (this.drpRegisterDef.SelectedValue != null && this.drpRegisterDef.SelectedValue != BLL.Const._Null) + { + register.RegisterDef = this.drpRegisterDef.SelectedText.Trim(); + } + else + { + register.RegisterDef = this.drpRegisterDef.Text.Trim(); + } + register.Requirements = this.txtRequirements.Text.Trim(); if (this.drpResponsibleMan.SelectedValue != BLL.Const._Null) { register.ResponsibleMan = this.drpResponsibleMan.SelectedValue; @@ -322,5 +343,64 @@ namespace FineUIPro.Web.HSSE.HiddenInspection } #endregion + + + /// + /// 检查项 + /// + /// + /// + protected void drpRegisterTypes_SelectedIndexChanged(object sender, EventArgs e) + { + + string selectedRegisterTypeId = this.drpRegisterTypes.SelectedValue; + + if (!string.IsNullOrEmpty(selectedRegisterTypeId) && selectedRegisterTypeId != BLL.Const._Null) + { + var query = (from x in Funs.DB.Technique_RectifyItem + where x.RectifyId == this.drpRegisterTypes.SelectedValue + select new + { + x.RectifyItemId, + x.HazardSourcePoint, + x.RiskAnalysis, + x.RiskPrevention + }).ToList(); + this.drpRegisterDef.DataTextField = "HazardSourcePoint"; + this.drpRegisterDef.DataValueField = "RectifyItemId"; + this.drpRegisterDef.DataSource = query; //安全巡检类型 + this.drpRegisterDef.DataBind(); + + this.txtRequirements.Text = ""; + } + } + + /// + /// 问题描述下拉列表文本变更事件 + /// + /// + /// + protected void drpRegisterDef_TextChanged(object sender, EventArgs e) + { + //给整改要求赋值 + string selectedRegisterDefId = this.drpRegisterDef.SelectedValue; + if (!string.IsNullOrEmpty(selectedRegisterDefId) && selectedRegisterDefId != BLL.Const._Null) + { + var query = (from x in Funs.DB.Technique_RectifyItem + where x.RectifyItemId == selectedRegisterDefId + select new + { + x.RectifyItemId, + x.HazardSourcePoint, + x.RiskAnalysis, + x.RiskPrevention + }).FirstOrDefault(); + if (query != null) + { + this.txtRequirements.Text = query.RiskPrevention; + } + } + } + } } \ No newline at end of file diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs index 39609dc..dd6cad7 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs @@ -96,13 +96,22 @@ namespace FineUIPro.Web.HSSE.HiddenInspection protected global::FineUIPro.DropDownList DropDownList1; /// - /// txtRegisterDef 控件。 + /// drpRegisterDef 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextArea txtRegisterDef; + protected global::FineUIPro.DropDownList drpRegisterDef; + + /// + /// txtRequirements 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRequirements; /// /// txtHandleIdea 控件。 diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx index 815ac58..b4c6547 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx @@ -106,6 +106,7 @@ + diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx index 08eebd2..e79d3ec 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx @@ -36,6 +36,12 @@ + + + + + + diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.cs index 2bfd330..89f097f 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.cs @@ -93,6 +93,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection // select x).ToList(); //Grid1.DataSource = punishRecords; //Grid1.DataBind(); + this.txtRequirements.Text = registration.Requirements; } } } diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.designer.cs index bacb55c..0ba4e9c 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.designer.cs @@ -86,6 +86,15 @@ namespace FineUIPro.Web.HSSE.HiddenInspection /// protected global::FineUIPro.TextArea txtProblemDescription; + /// + /// txtRequirements 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRequirements; + /// /// txtTakeSteps 控件。 /// diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx index f5329db..263702e 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx +++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx @@ -84,7 +84,7 @@ Width="200px" LabelWidth="70px" LabelAlign="right" ForceSelection="false"> - + @@ -115,9 +115,9 @@ FieldType="String" HeaderText="姓名" HeaderTextAlign="Center" TextAlign="Center"> - + - + <%-- 0) { var personOut = personLists.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsedType == "0").ToList(); - rootNode.ToolTip = "当前项目人员总数：" + personLists.Count() + "；在场人员数：" + (personLists.Count() - personOut.Count()) + "；离场人员数：" + personOut.Count(); + var personIn = personLists.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsedType == "1").ToList(); + rootNode.ToolTip = "当前项目人员总数：" + personLists.Count() + "；在场人员数：" + personIn.Count() + "；离场人员数：" + personOut.Count(); } else { @@ -171,7 +173,8 @@ namespace FineUIPro.Web.HSSE.SitePerson if (personUnitLists.Count() > 0) { var personOut = personUnitLists.Where(x => x.IsUsedType == "0"); - newNode.ToolTip = q.UnitName + "人员总数：" + personUnitLists.Count() + "；在场人员数：" + (personUnitLists.Count() - personOut.Count()) + "；离场人员数：" + personOut.Count(); + var personIn = personUnitLists.Where(x => x.IsUsedType == "1"); + newNode.ToolTip = q.UnitName + "人员总数：" + personUnitLists.Count() + "；在场人员数：" + personIn.Count() + "；离场人员数：" + personOut.Count(); } else { @@ -228,18 +231,18 @@ namespace FineUIPro.Web.HSSE.SitePerson } if (drpIsUsedTypeName.SelectedValue == "待审核") { - strSql += " AND IsUsedType = @IsUsedType"; - listStr.Add(new SqlParameter("@IsUsedType", "2")); + strSql += " AND IsUsedTypeName = @IsUsedTypeName"; + listStr.Add(new SqlParameter("@IsUsedTypeName", "待审核")); } else if (drpIsUsedTypeName.SelectedValue == "在岗") { - strSql += " AND IsUsedType = @IsUsedType"; - listStr.Add(new SqlParameter("@IsUsedType", "1")); + strSql += " AND IsUsedTypeName = @IsUsedTypeName"; + listStr.Add(new SqlParameter("@IsUsedTypeName", "在岗")); } else if (drpIsUsedTypeName.SelectedValue == "离岗") { - strSql += " AND IsUsedType = @IsUsedType"; - listStr.Add(new SqlParameter("@IsUsedType", "0")); + strSql += " AND IsUsedTypeName = @IsUsedTypeName"; + listStr.Add(new SqlParameter("@IsUsedTypeName", "离岗")); } if (!string.IsNullOrEmpty(this.txtPersonName.Text.Trim())) { @@ -301,11 +304,35 @@ namespace FineUIPro.Web.HSSE.SitePerson { string personId = Grid1.Rows[i].DataKeys[0].ToString(); var person = BLL.PersonService.GetPersonById(personId); - - if (person.IsUsedType=="2") //待审批 + var idCard = person.IdentityCard; + //根据身份证号码获取出生日期 + if (!string.IsNullOrEmpty(idCard)) { - Grid1.Rows[i].RowCssClass = "Yellow"; + string birthDateStr = string.Empty; + if (idCard.Length == 18) + { + // 18位身份证号码，出生日期在第7位到第14位 + birthDateStr = idCard.Substring(6, 8); + } + else if (idCard.Length == 15) + { + // 15位身份证号码，出生日期在第7位到第12位，需要加上"19"前缀 + birthDateStr = "19" + idCard.Substring(6, 6); + } + if (!string.IsNullOrEmpty(birthDateStr)) + { + // 解析日期字符串为DateTime对象 + var birthDate = DateTime.ParseExact(birthDateStr, "yyyyMMdd", null); + if (birthDate.AddYears(60) < DateTime.Now) + { + Grid1.Rows[i].RowCssClass = "Yellow"; + } + } } + // if (person.IsUsedType=="2") //待审批 + // { + // Grid1.Rows[i].RowCssClass = "Yellow"; + // } } } @@ -790,10 +817,25 @@ namespace FineUIPro.Web.HSSE.SitePerson string age = string.Empty; if (rirthday != null) { - DateTime? bDate = Funs.GetNewDateTime(rirthday.ToString()); - if (bDate.HasValue) + var idCard = rirthday.ToString(); + string birthDateStr = string.Empty; + if (idCard.Length == 18) { - age = CommonService.CalculateAgeCorrect(bDate.Value).ToString(); + // 18位身份证号码，出生日期在第7位到第14位 + birthDateStr = idCard.Substring(6, 8); + } + else if (idCard.Length == 15) + { + // 15位身份证号码，出生日期在第7位到第12位，需要加上"19"前缀 + birthDateStr = "19" + idCard.Substring(6, 6); + } + if (!string.IsNullOrEmpty(birthDateStr)) + { + // 使用TryParseExact安全地解析日期 + if (DateTime.TryParseExact(birthDateStr, "yyyyMMdd", null, DateTimeStyles.None, out DateTime birthDate)) + { + age = CommonService.CalculateAgeCorrect(birthDate).ToString(); + } } } return age; @@ -1282,6 +1324,11 @@ namespace FineUIPro.Web.HSSE.SitePerson #endregion + if (!string.IsNullOrEmpty(date2) && gTrainingTestRecord != null) + { + DateTime dt = DateTime.Parse(date2); + TestStartTime = dt; + } string[] fieldNames = { }; object[] fieldValues = { }; if (!string.IsNullOrEmpty(Signature)) diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs index f9079b8..db39f96 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs @@ -90,6 +90,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { person.OutTime = Funs.GetNewDateTime(this.txtChangeTime.Text); person.IsUsed = false; + person.IsUsedType = "0"; BLL.PersonService.UpdatePerson(person); } } diff --git a/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx b/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx index 6484787..7d73942 100644 --- a/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx +++ b/SUBQHSE/FineUIPro.Web/SysManage/UserList.aspx @@ -51,7 +51,7 @@ - diff --git a/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx b/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx index d2cb88e..b1c1925 100644 --- a/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx +++ b/SUBQHSE/FineUIPro.Web/SysManage/UserListEdit.aspx @@ -69,7 +69,7 @@ - + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx index 72a72cb..358952a 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx @@ -33,23 +33,26 @@ - - --%> + + + + - + <%-- @@ -155,7 +158,145 @@ FieldType="String" HeaderText="检验批个数" TextAlign="Left" HeaderTextAlign="Center" > - + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs index 396851f..27528f0 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs @@ -4,7 +4,8 @@ using System.Data.SqlClient; using System.Text; using BLL; using AspNet = System.Web.UI.WebControls; - +using System.Collections.Generic; +using System.Linq; namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { public partial class Project_CQMSData_CQMS : PageBase @@ -27,16 +28,24 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// private void BindGrid() { - Model.Project_CQMSData_CQMS table = new Model.Project_CQMSData_CQMS(); - table.ProjectId = this.CurrUser.ProjectId; - var tb = BLL.Project_CQMSDataService.getListData(table, Grid1); - Grid1.RecordCount = Project_CQMSDataService.count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - Grid1.DataSource = tb; + + var list = from x in Funs.DB.View_Project_CQMSData_CQMS select x; + if (!string.IsNullOrEmpty(txtProjectName.Text.Trim())) + { + list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); + } + int count = list.Count(); + list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + + Grid1.RecordCount = count; + Grid1.DataSource = list.ToList(); Grid1.DataBind(); } #endregion - + protected void btSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } #region GV 数据操作 /// /// 过滤表头 @@ -179,7 +188,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnAdd)) { - this.btnNew.Hidden = false; + // this.btnNew.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { @@ -205,7 +214,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("CQMS首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; - this.Grid1.PageSize = 500; + this.Grid1.PageSize = 10000; this.BindGrid(); Response.Write(GetGridTableHtml(Grid1)); Response.End(); diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs index 7db1814..b5b0bcd 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.designer.cs @@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync protected global::FineUIPro.Toolbar Toolbar2; /// - /// btnNew 控件。 + /// txtProjectName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNew; + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; /// /// btnOut 控件。 diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx index 4374672..758d77e 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx @@ -34,23 +34,26 @@ - - --%> + + + + - + <%-- @@ -83,7 +86,41 @@ FieldType="String" HeaderText="合格片数" TextAlign="Left" HeaderTextAlign="Center" > - + --%> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs index 1ee319b..d8dc092 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs @@ -7,7 +7,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using BLL; using AspNet = System.Web.UI.WebControls; - +using System.Data; +using System.Data.SqlClient; namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { public partial class Project_HJGLData_HJGL : PageBase @@ -30,16 +31,26 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// private void BindGrid() { - Model.Project_HJGLData_HJGL table = new Model.Project_HJGLData_HJGL(); - table.ProjectId = this.CurrUser.LoginProjectId; - var tb = BLL.Project_HJGLData_HJGLService.getListData(table, Grid1); - Grid1.RecordCount = Project_HJGLData_HJGLService.count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - Grid1.DataSource = tb; + + var list = from x in Funs.DB.View_Project_HJGLData_HJGL select x; + if (!string.IsNullOrEmpty(txtProjectName.Text.Trim())) + { + list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); + } + int count = list.Count(); + list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + + Grid1.RecordCount = count; + Grid1.DataSource = list.ToList(); Grid1.DataBind(); } #endregion + protected void btSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + #region GV 数据操作 /// /// 过滤表头 @@ -181,7 +192,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnAdd)) { - this.btnNew.Hidden = false; + // this.btnNew.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { @@ -207,7 +218,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊接首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; - this.Grid1.PageSize = 500; + this.Grid1.PageSize = 10000; this.BindGrid(); Response.Write(GetGridTableHtml(Grid1)); Response.End(); diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs index 2c32966..a0f629f 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.designer.cs @@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync protected global::FineUIPro.Toolbar Toolbar2; /// - /// btnNew 控件。 + /// txtProjectName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNew; + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; /// /// btnOut 控件。 diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx index 7bd4035..e2b054e 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx @@ -34,23 +34,26 @@ - - --%> + + + + - + <%-- @@ -280,9 +283,189 @@ - - - + #1# + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs index a2fdade..2573d3b 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs @@ -7,6 +7,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using BLL; using AspNet = System.Web.UI.WebControls; +using System.Data; +using System.Data.SqlClient; namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { public partial class Project_HSSEData_HSSE :PageBase @@ -29,12 +31,17 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// private void BindGrid() { - Model.Project_HSSEData_HSSE table = new Model.Project_HSSEData_HSSE(); - table.ProjectId = this.CurrUser.LoginProjectId; - var tb = BLL.Project_HSSEData_HSSEService.GetListData(table, Grid1); - Grid1.RecordCount = Project_HSSEData_HSSEService.Count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - Grid1.DataSource = tb; + + var list = from x in Funs.DB.View_Project_HSSEData_HSSE select x; + if (!string.IsNullOrEmpty(txtProjectName.Text.Trim())) + { + list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); + } + int count = list.Count(); + list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + + Grid1.RecordCount = count; + Grid1.DataSource = list.ToList(); Grid1.DataBind(); } #endregion @@ -73,6 +80,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync this.BindGrid(); } + protected void btSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + /// /// 分页显示条数下拉框 /// @@ -179,7 +191,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnAdd)) { - this.btnNew.Hidden = false; + // this.btnNew.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify)) { @@ -205,7 +217,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("HSSE首页数据表" + filename, System.Text.Encoding.UTF8) + ".xls"); Response.ContentType = "application/excel"; Response.ContentEncoding = System.Text.Encoding.UTF8; - this.Grid1.PageSize = 500; + this.Grid1.PageSize = 10000; this.BindGrid(); Response.Write(GetGridTableHtml(Grid1)); Response.End(); diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs index e888089..c830834 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.designer.cs @@ -60,13 +60,22 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync protected global::FineUIPro.Toolbar Toolbar2; /// - /// btnNew 控件。 + /// txtProjectName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnNew; + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; /// /// btnOut 控件。 diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx index 89cabc0..af8f324 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx @@ -36,13 +36,13 @@ - + - - @@ -68,6 +68,9 @@ + + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs index 9953853..2f8c802 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs @@ -16,17 +16,24 @@ namespace FineUIPro.Web.ZHGL.Environmental if (!IsPostBack) { - BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, ConstValue.Group_0011, false); + BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, false); BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, false); - + if (this.CurrUser.UserId == BLL.Const.hfnbdId) + { + this.btnState.Hidden = false; + } + else + { + this.btnState.Hidden = true; + } this.drpUnit.DataTextField = "UnitName"; drpUnit.DataValueField = "UnitId"; drpUnit.DataSource = BLL.UnitService.GetThisUnitDropDownList(); drpUnit.DataBind(); this.drpUnit.Readonly = true; ////取上个报表时间 - DateTime showDate = System.DateTime.Now.AddMonths(-3); - this.drpQuarters.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString(); + DateTime showDate = System.DateTime.Now.AddMonths(-1); + drpMonth.SelectedValue = showDate.Month.ToString(); drpYear.SelectedValue = showDate.Year.ToString(); GetValue(); } @@ -48,8 +55,8 @@ namespace FineUIPro.Web.ZHGL.Environmental private void GetValue() { int year = Funs.GetNewIntOrZero(drpYear.SelectedValue); - int Quarters = Funs.GetNewIntOrZero(drpQuarters.SelectedValue); - Model.Environmental_ArchitectureReport r = Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Quarters == Quarters && e.Year == year); + int month = Funs.GetNewIntOrZero(drpMonth.SelectedValue); + Model.Environmental_ArchitectureReport r = Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Month == month && e.Year == year); if (r != null && r.UpState != BLL.Const.UpState_5) { string cncecAPIUrl = string.Empty; @@ -62,7 +69,7 @@ namespace FineUIPro.Web.ZHGL.Environmental { try { - string getUrl = cncecAPIUrl + "/api/InformationData/GetArchitectureAuditState" + "?unitId=" + CommonService.GetThisUnitId() + "&year=" + year + "&quarters=" + Quarters; + string getUrl = cncecAPIUrl + "/api/InformationData/GetArchitectureAuditState" + "?unitId=" + CommonService.GetThisUnitId() + "&year=" + year + "&month=" + month; var strJosn = APIGetHttpService.Http(getUrl); if (!string.IsNullOrEmpty(strJosn)) { @@ -79,7 +86,7 @@ namespace FineUIPro.Web.ZHGL.Environmental } } } - Model.View_Environmental_ArchitectureReport report = Funs.DB.View_Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Quarters == Quarters && e.Year == year); + Model.View_Environmental_ArchitectureReport report = Funs.DB.View_Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Month == month && e.Year == year); if (report != null) { string upState = string.Empty; @@ -95,7 +102,7 @@ namespace FineUIPro.Web.ZHGL.Environmental { upState = "(未上报)"; } - this.SimpleForm1.Title = "企业建筑行业能源节约与生态环境保护汇总表" + report.QuartersStr + report.YearStr + upState; + this.SimpleForm1.Title = "企业建筑行业能源节约与生态环境保护汇总表" + report.MonthStr + report.YearStr + upState; lbUnitName.Text = "填报企业：" + report.UnitName; if (report.FillingDate != null) { @@ -214,7 +221,7 @@ namespace FineUIPro.Web.ZHGL.Environmental } } - var getReport = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + var getReport = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); this.btnAudit1.Hidden = true; this.btnAudit2.Hidden = true; if (getReport != null) @@ -249,7 +256,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnNew_Click(object sender, EventArgs e) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ArchitectureReportSave.aspx?UnitId={0}&&Year={1}&&Quarterss={2}", this.CurrUser.UnitId, this.drpYear.SelectedValue, this.drpQuarters.SelectedValue, "编辑 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ArchitectureReportSave.aspx?UnitId={0}&&Year={1}&&Months={2}", this.CurrUser.UnitId, this.drpYear.SelectedValue, this.drpMonth.SelectedValue, "编辑 - "))); } /// @@ -259,7 +266,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnEdit_Click(object sender, EventArgs e) { - Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ArchitectureReportSave.aspx?ArchitectureReportId={0}", report.ArchitectureReportId, "编辑 - "))); @@ -277,7 +284,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnAudit1_Click(object sender, EventArgs e) { - Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ArchitectureReportSave.aspx?ArchitectureReportId={0}", report.ArchitectureReportId, "编辑 - "))); @@ -295,7 +302,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnAudit2_Click(object sender, EventArgs e) { - Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ArchitectureReportSave.aspx?ArchitectureReportId={0}", report.ArchitectureReportId, "编辑 - "))); @@ -313,7 +320,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnUpdata_Click(object sender, EventArgs e) { - Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ArchitectureReportSave.aspx?ArchitectureReportId={0}&type=Updata", report.ArchitectureReportId, "编辑 - "))); @@ -331,10 +338,10 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnDelete_Click(object sender, EventArgs e) { - Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { - BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Quarters.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnDelete); + BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Month.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnDelete); BLL.ProjectDataFlowSetService.DeleteFlowSetByDataId(report.ArchitectureReportId); BLL.ArchitectureReportItemService.DeleteArchitectureReportItemByArchitectureReportId(report.ArchitectureReportId); BLL.ArchitectureReportService.DeleteArchitectureReportByArchitectureReportId(report.ArchitectureReportId); @@ -377,7 +384,7 @@ namespace FineUIPro.Web.ZHGL.Environmental Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByArchitectureReportId(ArchitectureReportId.ToString()); if (report != null) { - return report.Year + "年" + report.Quarters + "月"; + return report.Year + "年" + report.Month + "月"; } } return ""; @@ -414,7 +421,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void BtnBulletLeft_Click(object sender, EventArgs e) { - SetQuartersChange("-"); + SetMonthChange("-"); } /// @@ -424,30 +431,30 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void BulletRight_Click(object sender, EventArgs e) { - SetQuartersChange("+"); + SetMonthChange("+"); } /// /// 月份加减变化 /// /// - private void SetQuartersChange(string type) + private void SetMonthChange(string type) { - DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + (Funs.GetNewIntOrZero(this.drpQuarters.SelectedValue) * 3).ToString()); + DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + this.drpMonth.SelectedValue); if (nowDate.HasValue) { DateTime showDate = new DateTime(); if (type == "+") { - showDate = nowDate.Value.AddMonths(3); + showDate = nowDate.Value.AddMonths(1); } else { - showDate = nowDate.Value.AddMonths(-3); + showDate = nowDate.Value.AddMonths(-1); } this.drpYear.SelectedValue = showDate.Year.ToString(); - this.drpQuarters.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString(); + drpMonth.SelectedValue = showDate.Month.ToString(); ///值变化 GetValue(); } @@ -462,7 +469,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnSee_Click(object sender, EventArgs e) { - Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("ReportAuditSee.aspx?Id={0}", report.ArchitectureReportId, "查看 - "))); @@ -678,14 +685,14 @@ namespace FineUIPro.Web.ZHGL.Environmental { string info = string.Empty; int year = Funs.GetNewIntOrZero(drpYear.SelectedValue); - int Quarters = Funs.GetNewIntOrZero(drpQuarters.SelectedValue); + int month = Funs.GetNewIntOrZero(drpMonth.SelectedValue); var projects = (from x in Funs.DB.Base_Project where (x.ProjectState == BLL.Const.ProjectState_1 || x.ProjectState == null) && (x.IsDelete == null || x.IsDelete == false) select x).ToList(); foreach (var item in projects) { - var projectArchitectureReport = Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.Year == year && x.Quarters == Quarters); + var projectArchitectureReport = Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.Year == year && x.Month == month); if (projectArchitectureReport == null) { info += item.ProjectName + "，未填写报表；
"; @@ -719,5 +726,21 @@ namespace FineUIPro.Web.ZHGL.Environmental } #endregion + + #region 恢复未上报状态 + /// + /// 恢复未上报状态 + /// + /// + /// + protected void btnState_Click(object sender, EventArgs e) + { + Model.Environmental_ArchitectureReport report = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); + report.UpState = "2"; + BLL.ArchitectureReportService.UpdateArchitectureReport(report); + ShowNotify("恢复成功！", MessageBoxIcon.Success); + GetValue(); + } + #endregion } } \ No newline at end of file diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.designer.cs index be0cb5f..b82157b 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ZHGL.Environmental -{ - - - public partial class ArchitectureReport - { - +namespace FineUIPro.Web.ZHGL.Environmental { + + + public partial class ArchitectureReport { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// RegionPanel1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RegionPanel RegionPanel1; - + /// /// Region2 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Region Region2; - + /// /// SimpleForm1 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// Toolbar1 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpUnit 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpYear 控件。 /// @@ -85,16 +83,16 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpYear; - + /// - /// drpQuarters 控件。 + /// drpMonth 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpQuarters; - + protected global::FineUIPro.DropDownList drpMonth; + /// /// BtnBulletLeft 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnBulletLeft; - + /// /// BtnBulletRight 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnBulletRight; - + /// /// ToolbarFill1 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSee 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSee; - + /// /// btnNew 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnEdit 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnEdit; - + /// /// btnDelete 控件。 /// @@ -157,7 +155,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDelete; - + /// /// btnAudit1 控件。 /// @@ -166,7 +164,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAudit1; - + /// /// btnAudit2 控件。 /// @@ -175,7 +173,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAudit2; - + /// /// btnUpdata 控件。 /// @@ -184,7 +182,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnUpdata; - + /// /// btnView 控件。 /// @@ -193,7 +191,16 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnView; - + + /// + /// btnState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnState; + /// /// lbUnitName 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbUnitName; - + /// /// lbFillingDate 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbFillingDate; - + /// /// lbDutyPerson 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbDutyPerson; - + /// /// lbHandleMan 控件。 /// @@ -229,7 +236,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbHandleMan; - + /// /// Grid1 控件。 /// @@ -238,7 +245,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Window1 控件。 /// @@ -247,7 +254,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window4 控件。 /// @@ -256,7 +263,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window4; - + /// /// Window5 控件。 /// diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx index ce5b7d8..8c0a3b3 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx @@ -36,8 +36,8 @@ - + diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs index 36f7846..ebd28fe 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs @@ -48,7 +48,7 @@ namespace FineUIPro.Web.ZHGL.Environmental this.GetButtonPower(); } items.Clear(); - BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, ConstValue.Group_0011, false); + BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, false); BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, false); this.drpUnit.DataTextField = "UnitName"; drpUnit.DataValueField = "UnitId"; @@ -57,7 +57,7 @@ namespace FineUIPro.Web.ZHGL.Environmental this.drpUnit.Readonly = true; string unitId = Request.QueryString["UnitId"]; string year = Request.QueryString["Year"]; - string quarters = Request.QueryString["Quarterss"]; + string months = Request.QueryString["Months"]; ArchitectureReportId = Request.QueryString["ArchitectureReportId"]; if (!string.IsNullOrEmpty(Request.QueryString["type"])) { @@ -87,7 +87,7 @@ namespace FineUIPro.Web.ZHGL.Environmental this.btnSave.Hidden = true; this.btnUpdata.Hidden = true; } - drpQuarters.SelectedValue = report.Quarters.ToString(); + drpMonth.SelectedValue = report.Month.ToString(); drpYear.SelectedValue = report.Year.ToString(); drpUnit.SelectedValue = report.UnitId; if (report.FillingDate != null) @@ -100,12 +100,12 @@ namespace FineUIPro.Web.ZHGL.Environmental else { //this.btnCopy.Hidden = false; - drpQuarters.SelectedValue = quarters; + drpMonth.SelectedValue = months; drpYear.SelectedValue = year; txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); txtDutyPerson.Text = this.CurrUser.UserName; //增加明细集合 - GetNewItems(year, quarters); + GetNewItems(year, months); this.Grid1.DataSource = items; this.Grid1.DataBind(); } @@ -150,336 +150,81 @@ namespace FineUIPro.Web.ZHGL.Environmental Grid1.Rows[58].CellCssClasses[4] = "f-grid-cell-uneditable"; Grid1.Rows[58].CellCssClasses[5] = "f-grid-cell-uneditable"; } - var lastYearReport = ArchitectureReportService.GetArchitectureReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue) - 1, Funs.GetNewIntOrZero(this.drpQuarters.SelectedValue)); - if (lastYearReport != null) + if (string.IsNullOrEmpty(ArchitectureReportId)) { - var lastYearReportItems = ArchitectureReportItemService.GetItems(lastYearReport.ArchitectureReportId); - Grid1.Rows[1].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[2].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[3].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[4].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[5].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[6].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[7].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[8].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[9].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[10].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[11].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[12].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[13].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[15].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[16].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[17].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[19].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[20].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[21].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[22].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[23].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[24].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[25].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[26].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[27].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[28].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[29].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[30].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[31].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[32].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[33].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[34].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[35].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[36].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[37].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[38].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[39].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[40].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[41].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[42].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[43].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[44].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[45].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[46].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[47].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[48].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[49].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[50].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[51].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[52].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[53].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[54].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[55].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[56].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[57].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[59].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[60].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - SetLastYearUnEditableRow(); - //获取项目级数据 - string year = Request.QueryString["Year"]; - string quarters = Request.QueryString["Quarterss"]; - var items = (from x in Funs.DB.Environmental_ProjectArchitectureReportItem - join y in Funs.DB.Environmental_ProjectArchitectureReport - on x.ArchitectureReportId equals y.ArchitectureReportId - where y.Year == Funs.GetNewIntOrZero(year) && y.Quarters == Funs.GetNewIntOrZero(quarters) - orderby x.SortIndex - select x).ToList(); - if (items.Count() > 0) + var lastYearReport = ArchitectureReportService.GetArchitectureReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue) - 1, Funs.GetNewIntOrZero(this.drpMonth.SelectedValue)); + if (lastYearReport != null) { - Grid1.Rows[0].Values[5] = items.Where(x => x.SortIndex == "01").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[1].Values[5] = items.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[2].Values[5] = items.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[3].Values[5] = items.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[4].Values[5] = items.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[5].Values[5] = items.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[6].Values[5] = items.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[7].Values[5] = items.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[8].Values[5] = items.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[9].Values[5] = items.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[10].Values[5] = items.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[11].Values[5] = items.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[12].Values[5] = items.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[13].Values[5] = items.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[15].Values[5] = items.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[16].Values[5] = items.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[17].Values[5] = items.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[19].Values[5] = items.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[20].Values[5] = items.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[21].Values[5] = items.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[22].Values[5] = items.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[23].Values[5] = items.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[24].Values[5] = items.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[25].Values[5] = items.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[26].Values[5] = items.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[27].Values[5] = items.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[28].Values[5] = items.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[29].Values[5] = items.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[30].Values[5] = items.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[31].Values[5] = items.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[32].Values[5] = items.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[33].Values[5] = items.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[34].Values[5] = items.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[35].Values[5] = items.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[36].Values[5] = items.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[37].Values[5] = items.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[38].Values[5] = items.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[39].Values[5] = items.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[40].Values[5] = items.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[41].Values[5] = items.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[42].Values[5] = items.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[43].Values[5] = items.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[44].Values[5] = items.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[45].Values[5] = items.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[46].Values[5] = items.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[47].Values[5] = items.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[48].Values[5] = items.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[49].Values[5] = items.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[50].Values[5] = items.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[51].Values[5] = items.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[52].Values[5] = items.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[53].Values[5] = items.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[54].Values[5] = items.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[55].Values[5] = items.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[56].Values[5] = items.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[57].Values[5] = items.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[59].Values[5] = items.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[60].Values[5] = items.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - } - } - else - { - DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + (Funs.GetNewIntOrZero(this.drpQuarters.SelectedValue) * 3).ToString()); - DateTime lastQuarters = nowDate.Value.AddMonths(-3); - Environmental_ArchitectureReport lastQuartersReport = ArchitectureReportService.GetArchitectureReportByUnitIdDate(drpUnit.SelectedValue, lastQuarters.Year, Funs.GetNowQuarterlyByTime(lastQuarters)); - if (lastQuartersReport != null) - { - var lastQuartersReportItems = BLL.ArchitectureReportItemService.GetItems(lastQuartersReport.ArchitectureReportId); - Grid1.Rows[1].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[2].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[3].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[4].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[5].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[6].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[7].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[8].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[9].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[10].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[11].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[12].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[13].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[15].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[16].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[17].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[19].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[20].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[21].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[22].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[23].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[24].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[25].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[26].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[27].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[28].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[29].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[30].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[31].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[32].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[33].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[34].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[35].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[36].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[37].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[38].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[39].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[40].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[41].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[42].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[43].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[44].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[45].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[46].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[47].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[48].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[49].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[50].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[51].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[52].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[53].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[54].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[55].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[56].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[57].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[59].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); - Grid1.Rows[60].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + var lastYearReportItems = ArchitectureReportItemService.GetItems(lastYearReport.ArchitectureReportId); + Grid1.Rows[1].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[2].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[3].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[4].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[5].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[6].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[7].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[8].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[9].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[10].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[11].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[12].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[13].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[15].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[16].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[17].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[19].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[20].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[21].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[22].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[23].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[24].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[25].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[26].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[27].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[28].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[29].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[30].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[31].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[32].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[33].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[34].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[35].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[36].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[37].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[38].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[39].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[40].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[41].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[42].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[43].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[44].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[45].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[46].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[47].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[48].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[49].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[50].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[51].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[52].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[53].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[54].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[55].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[56].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[57].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[59].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[60].Values[4] = lastYearReportItems.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); SetLastYearUnEditableRow(); - } - else - { + //获取项目级数据 string year = Request.QueryString["Year"]; - string quarters = Request.QueryString["Quarterss"]; + string months = Request.QueryString["Months"]; var items = (from x in Funs.DB.Environmental_ProjectArchitectureReportItem join y in Funs.DB.Environmental_ProjectArchitectureReport on x.ArchitectureReportId equals y.ArchitectureReportId - where y.Year == Funs.GetNewIntOrZero(year) && y.Quarters == Funs.GetNewIntOrZero(quarters) + where y.Year == Funs.GetNewIntOrZero(year) && y.Month == Funs.GetNewIntOrZero(months) orderby x.SortIndex select x).ToList(); if (items.Count() > 0) { - Grid1.Rows[0].Values[3] = items.Where(x => x.SortIndex == "01").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[1].Values[3] = items.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[2].Values[3] = items.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[3].Values[3] = items.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[4].Values[3] = items.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[5].Values[3] = items.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[6].Values[3] = items.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[7].Values[3] = items.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[8].Values[3] = items.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[9].Values[3] = items.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[10].Values[3] = items.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[11].Values[3] = items.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[12].Values[3] = items.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[13].Values[3] = items.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[15].Values[3] = items.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[16].Values[3] = items.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[17].Values[3] = items.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[19].Values[3] = items.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[20].Values[3] = items.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[21].Values[3] = items.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[22].Values[3] = items.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[23].Values[3] = items.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[24].Values[3] = items.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[25].Values[3] = items.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[26].Values[3] = items.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[27].Values[3] = items.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[28].Values[3] = items.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[29].Values[3] = items.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[30].Values[3] = items.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[31].Values[3] = items.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[32].Values[3] = items.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[33].Values[3] = items.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[34].Values[3] = items.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[35].Values[3] = items.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[36].Values[3] = items.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[37].Values[3] = items.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[38].Values[3] = items.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[39].Values[3] = items.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[40].Values[3] = items.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[41].Values[3] = items.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[42].Values[3] = items.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[43].Values[3] = items.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[44].Values[3] = items.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[45].Values[3] = items.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[46].Values[3] = items.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[47].Values[3] = items.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[48].Values[3] = items.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[49].Values[3] = items.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[50].Values[3] = items.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[51].Values[3] = items.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[52].Values[3] = items.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[53].Values[3] = items.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[54].Values[3] = items.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[55].Values[3] = items.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[56].Values[3] = items.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[57].Values[3] = items.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[59].Values[3] = items.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - Grid1.Rows[60].Values[3] = items.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); - - Grid1.Rows[0].Values[4] = items.Where(x => x.SortIndex == "01").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[1].Values[4] = items.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[2].Values[4] = items.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[3].Values[4] = items.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[4].Values[4] = items.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[5].Values[4] = items.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[6].Values[4] = items.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[7].Values[4] = items.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[8].Values[4] = items.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[9].Values[4] = items.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[10].Values[4] = items.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[11].Values[4] = items.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[12].Values[4] = items.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[13].Values[4] = items.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[15].Values[4] = items.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[16].Values[4] = items.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[17].Values[4] = items.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[19].Values[4] = items.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[20].Values[4] = items.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[21].Values[4] = items.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[22].Values[4] = items.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[23].Values[4] = items.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[24].Values[4] = items.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[25].Values[4] = items.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[26].Values[4] = items.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[27].Values[4] = items.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[28].Values[4] = items.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[29].Values[4] = items.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[30].Values[4] = items.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[31].Values[4] = items.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[32].Values[4] = items.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[33].Values[4] = items.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[34].Values[4] = items.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[35].Values[4] = items.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[36].Values[4] = items.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[37].Values[4] = items.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[38].Values[4] = items.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[39].Values[4] = items.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[40].Values[4] = items.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[41].Values[4] = items.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[42].Values[4] = items.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[43].Values[4] = items.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[44].Values[4] = items.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[45].Values[4] = items.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[46].Values[4] = items.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[47].Values[4] = items.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[48].Values[4] = items.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[49].Values[4] = items.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[50].Values[4] = items.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[51].Values[4] = items.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[52].Values[4] = items.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[53].Values[4] = items.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[54].Values[4] = items.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[55].Values[4] = items.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[56].Values[4] = items.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[57].Values[4] = items.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[59].Values[4] = items.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[60].Values[4] = items.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); - Grid1.Rows[0].Values[5] = items.Where(x => x.SortIndex == "01").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); Grid1.Rows[1].Values[5] = items.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); Grid1.Rows[2].Values[5] = items.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); @@ -540,6 +285,269 @@ namespace FineUIPro.Web.ZHGL.Environmental Grid1.Rows[60].Values[5] = items.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); } } + else + { + DateTime lastMonth = Convert.ToDateTime(drpYear.SelectedValue + "-" + drpMonth.SelectedValue + "-01").AddYears(-1); + Environmental_ArchitectureReport lastQuartersReport = ArchitectureReportService.GetArchitectureReportByUnitIdDate(drpUnit.SelectedValue, lastMonth.Year, lastMonth.Month); + if (lastQuartersReport != null) + { + var lastQuartersReportItems = BLL.ArchitectureReportItemService.GetItems(lastQuartersReport.ArchitectureReportId); + Grid1.Rows[1].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[2].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[3].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[4].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[5].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[6].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[7].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[8].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[9].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[10].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[11].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[12].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[13].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[15].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[16].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[17].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[19].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[20].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[21].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[22].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[23].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[24].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[25].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[26].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[27].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[28].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[29].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[30].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[31].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[32].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[33].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[34].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[35].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[36].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[37].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[38].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[39].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[40].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[41].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[42].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[43].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[44].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[45].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[46].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[47].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[48].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[49].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[50].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[51].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[52].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[53].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[54].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[55].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[56].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[57].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[59].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[60].Values[4] = lastQuartersReportItems.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + SetLastYearUnEditableRow(); + } + else + { + string year = Request.QueryString["Year"]; + string months = Request.QueryString["Months"]; + var items = (from x in Funs.DB.Environmental_ProjectArchitectureReportItem + join y in Funs.DB.Environmental_ProjectArchitectureReport + on x.ArchitectureReportId equals y.ArchitectureReportId + where y.Year == Funs.GetNewIntOrZero(year) && y.Month == Funs.GetNewIntOrZero(months) + orderby x.SortIndex + select x).ToList(); + if (items.Count() > 0) + { + Grid1.Rows[0].Values[3] = items.Where(x => x.SortIndex == "01").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[1].Values[3] = items.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[2].Values[3] = items.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[3].Values[3] = items.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[4].Values[3] = items.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[5].Values[3] = items.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[6].Values[3] = items.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[7].Values[3] = items.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[8].Values[3] = items.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[9].Values[3] = items.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[10].Values[3] = items.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[11].Values[3] = items.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[12].Values[3] = items.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[13].Values[3] = items.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[15].Values[3] = items.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[16].Values[3] = items.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[17].Values[3] = items.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[19].Values[3] = items.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[20].Values[3] = items.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[21].Values[3] = items.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[22].Values[3] = items.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[23].Values[3] = items.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[24].Values[3] = items.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[25].Values[3] = items.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[26].Values[3] = items.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[27].Values[3] = items.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[28].Values[3] = items.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[29].Values[3] = items.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[30].Values[3] = items.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[31].Values[3] = items.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[32].Values[3] = items.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[33].Values[3] = items.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[34].Values[3] = items.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[35].Values[3] = items.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[36].Values[3] = items.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[37].Values[3] = items.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[38].Values[3] = items.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[39].Values[3] = items.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[40].Values[3] = items.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[41].Values[3] = items.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[42].Values[3] = items.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[43].Values[3] = items.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[44].Values[3] = items.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[45].Values[3] = items.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[46].Values[3] = items.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[47].Values[3] = items.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[48].Values[3] = items.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[49].Values[3] = items.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[50].Values[3] = items.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[51].Values[3] = items.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[52].Values[3] = items.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[53].Values[3] = items.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[54].Values[3] = items.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[55].Values[3] = items.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[56].Values[3] = items.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[57].Values[3] = items.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[59].Values[3] = items.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + Grid1.Rows[60].Values[3] = items.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.BaseNumber)); + + Grid1.Rows[0].Values[4] = items.Where(x => x.SortIndex == "01").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[1].Values[4] = items.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[2].Values[4] = items.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[3].Values[4] = items.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[4].Values[4] = items.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[5].Values[4] = items.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[6].Values[4] = items.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[7].Values[4] = items.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[8].Values[4] = items.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[9].Values[4] = items.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[10].Values[4] = items.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[11].Values[4] = items.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[12].Values[4] = items.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[13].Values[4] = items.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[15].Values[4] = items.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[16].Values[4] = items.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[17].Values[4] = items.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[19].Values[4] = items.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[20].Values[4] = items.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[21].Values[4] = items.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[22].Values[4] = items.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[23].Values[4] = items.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[24].Values[4] = items.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[25].Values[4] = items.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[26].Values[4] = items.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[27].Values[4] = items.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[28].Values[4] = items.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[29].Values[4] = items.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[30].Values[4] = items.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[31].Values[4] = items.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[32].Values[4] = items.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[33].Values[4] = items.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[34].Values[4] = items.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[35].Values[4] = items.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[36].Values[4] = items.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[37].Values[4] = items.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[38].Values[4] = items.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[39].Values[4] = items.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[40].Values[4] = items.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[41].Values[4] = items.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[42].Values[4] = items.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[43].Values[4] = items.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[44].Values[4] = items.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[45].Values[4] = items.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[46].Values[4] = items.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[47].Values[4] = items.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[48].Values[4] = items.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[49].Values[4] = items.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[50].Values[4] = items.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[51].Values[4] = items.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[52].Values[4] = items.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[53].Values[4] = items.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[54].Values[4] = items.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[55].Values[4] = items.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[56].Values[4] = items.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[57].Values[4] = items.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[59].Values[4] = items.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + Grid1.Rows[60].Values[4] = items.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.LastYearValue)); + + Grid1.Rows[0].Values[5] = items.Where(x => x.SortIndex == "01").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[1].Values[5] = items.Where(x => x.SortIndex == "02").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[2].Values[5] = items.Where(x => x.SortIndex == "03").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[3].Values[5] = items.Where(x => x.SortIndex == "04").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[4].Values[5] = items.Where(x => x.SortIndex == "05").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[5].Values[5] = items.Where(x => x.SortIndex == "06").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[6].Values[5] = items.Where(x => x.SortIndex == "07").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[7].Values[5] = items.Where(x => x.SortIndex == "08").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[8].Values[5] = items.Where(x => x.SortIndex == "09").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[9].Values[5] = items.Where(x => x.SortIndex == "10").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[10].Values[5] = items.Where(x => x.SortIndex == "11").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[11].Values[5] = items.Where(x => x.SortIndex == "12").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[12].Values[5] = items.Where(x => x.SortIndex == "13").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[13].Values[5] = items.Where(x => x.SortIndex == "14").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[15].Values[5] = items.Where(x => x.SortIndex == "16").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[16].Values[5] = items.Where(x => x.SortIndex == "17").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[17].Values[5] = items.Where(x => x.SortIndex == "18").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[19].Values[5] = items.Where(x => x.SortIndex == "20").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[20].Values[5] = items.Where(x => x.SortIndex == "21").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[21].Values[5] = items.Where(x => x.SortIndex == "22").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[22].Values[5] = items.Where(x => x.SortIndex == "23").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[23].Values[5] = items.Where(x => x.SortIndex == "24").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[24].Values[5] = items.Where(x => x.SortIndex == "25").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[25].Values[5] = items.Where(x => x.SortIndex == "26").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[26].Values[5] = items.Where(x => x.SortIndex == "27").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[27].Values[5] = items.Where(x => x.SortIndex == "28").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[28].Values[5] = items.Where(x => x.SortIndex == "29").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[29].Values[5] = items.Where(x => x.SortIndex == "30").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[30].Values[5] = items.Where(x => x.SortIndex == "31").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[31].Values[5] = items.Where(x => x.SortIndex == "32").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[32].Values[5] = items.Where(x => x.SortIndex == "33").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[33].Values[5] = items.Where(x => x.SortIndex == "34").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[34].Values[5] = items.Where(x => x.SortIndex == "35").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[35].Values[5] = items.Where(x => x.SortIndex == "36").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[36].Values[5] = items.Where(x => x.SortIndex == "37").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[37].Values[5] = items.Where(x => x.SortIndex == "38").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[38].Values[5] = items.Where(x => x.SortIndex == "39").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[39].Values[5] = items.Where(x => x.SortIndex == "40").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[40].Values[5] = items.Where(x => x.SortIndex == "41").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[41].Values[5] = items.Where(x => x.SortIndex == "42").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[42].Values[5] = items.Where(x => x.SortIndex == "43").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[43].Values[5] = items.Where(x => x.SortIndex == "44").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[44].Values[5] = items.Where(x => x.SortIndex == "45").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[45].Values[5] = items.Where(x => x.SortIndex == "46").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[46].Values[5] = items.Where(x => x.SortIndex == "47").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[47].Values[5] = items.Where(x => x.SortIndex == "48").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[48].Values[5] = items.Where(x => x.SortIndex == "49").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[49].Values[5] = items.Where(x => x.SortIndex == "50").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[50].Values[5] = items.Where(x => x.SortIndex == "51").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[51].Values[5] = items.Where(x => x.SortIndex == "52").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[52].Values[5] = items.Where(x => x.SortIndex == "53").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[53].Values[5] = items.Where(x => x.SortIndex == "54").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[54].Values[5] = items.Where(x => x.SortIndex == "55").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[55].Values[5] = items.Where(x => x.SortIndex == "56").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[56].Values[5] = items.Where(x => x.SortIndex == "57").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[57].Values[5] = items.Where(x => x.SortIndex == "58").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[59].Values[5] = items.Where(x => x.SortIndex == "60").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + Grid1.Rows[60].Values[5] = items.Where(x => x.SortIndex == "61").Sum(x => Funs.GetNewDecimalOrZero(x.ThisYearValue)); + } + } + } + } + else + { + items = BLL.ArchitectureReportItemService.GetShowItems(ArchitectureReportId); + this.Grid1.DataSource = items; + this.Grid1.DataBind(); } } @@ -1302,7 +1310,7 @@ namespace FineUIPro.Web.ZHGL.Environmental { UnitId = drpUnit.SelectedValue, Year = Funs.GetNewIntOrZero(drpYear.SelectedValue), - Quarters = Funs.GetNewIntOrZero(drpQuarters.SelectedValue) + Month = Funs.GetNewIntOrZero(drpMonth.SelectedValue) }; if (!string.IsNullOrEmpty(txtFillingDate.Text.Trim())) { @@ -1311,14 +1319,14 @@ namespace FineUIPro.Web.ZHGL.Environmental report.DutyPerson = txtDutyPerson.Text.Trim(); if (String.IsNullOrEmpty(ArchitectureReportId)) { - Environmental_ArchitectureReport old = ArchitectureReportService.GetArchitectureReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Environmental_ArchitectureReport old = ArchitectureReportService.GetArchitectureReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (old == null) { report.ArchitectureReportId = SQLHelper.GetNewID(typeof(Model.Environmental_ArchitectureReport)); report.UpState = BLL.Const.UpState_2; report.FillingMan = this.CurrUser.UserName; BLL.ArchitectureReportService.AddArchitectureReport(report); - BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Quarters.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnAdd); + BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Month.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnAdd); } else { @@ -1332,7 +1340,7 @@ namespace FineUIPro.Web.ZHGL.Environmental report.ArchitectureReportId = ArchitectureReportId; report.UpState = BLL.Const.UpState_2; BLL.ArchitectureReportService.UpdateArchitectureReport(report); - BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Quarters.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnModify); + BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Month.ToString(), report.ArchitectureReportId, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnModify); } ArchitectureReportId = report.ArchitectureReportId; BLL.ArchitectureReportItemService.DeleteArchitectureReportItemByArchitectureReportId(report.ArchitectureReportId); @@ -1595,12 +1603,12 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnCopy_Click(object sender, EventArgs e) { - DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + (Funs.GetNewIntOrZero(this.drpQuarters.SelectedValue) * 3).ToString()); + DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + this.drpMonth.SelectedValue); if (nowDate.HasValue) { DateTime showDate = new DateTime(); showDate = nowDate.Value.AddMonths(-3); - Model.Environmental_ArchitectureReport ArchitectureReport = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(this.drpUnit.SelectedValue, showDate.Year, Funs.GetNowQuarterlyByTime(showDate)); + Model.Environmental_ArchitectureReport ArchitectureReport = BLL.ArchitectureReportService.GetArchitectureReportByUnitIdAndYearAndQuarters(this.drpUnit.SelectedValue, showDate.Year, showDate.Month); if (ArchitectureReport != null) { Model.Environmental_ArchitectureReport newArchitectureReport = new Environmental_ArchitectureReport(); @@ -1608,7 +1616,7 @@ namespace FineUIPro.Web.ZHGL.Environmental newArchitectureReport.ArchitectureReportId = this.ArchitectureReportId; newArchitectureReport.UnitId = this.drpUnit.SelectedValue; newArchitectureReport.Year = Convert.ToInt32(this.drpYear.SelectedValue); - newArchitectureReport.Quarters = Convert.ToInt32(this.drpQuarters.SelectedValue); + newArchitectureReport.Month = Convert.ToInt32(this.drpMonth.SelectedValue); newArchitectureReport.FillingMan = this.CurrUser.UserName; newArchitectureReport.FillingDate = DateTime.Now; newArchitectureReport.DutyPerson = this.CurrUser.UserName; @@ -1647,7 +1655,7 @@ namespace FineUIPro.Web.ZHGL.Environmental var report = BLL.ArchitectureReportService.GetArchitectureReportByArchitectureReportId(ArchitectureReportId); if (report != null) { - drpQuarters.SelectedValue = report.Quarters.ToString(); + drpMonth.SelectedValue = report.Month.ToString(); drpYear.SelectedValue = report.Year.ToString(); drpUnit.SelectedValue = report.UnitId; if (report.FillingDate != null) diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.designer.cs index 5918d10..a1783d3 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.designer.cs @@ -49,13 +49,13 @@ namespace FineUIPro.Web.ZHGL.Environmental { protected global::FineUIPro.DropDownList drpYear; /// - /// drpQuarters 控件。 + /// drpMonth 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpQuarters; + protected global::FineUIPro.DropDownList drpMonth; /// /// drpUnit 控件。 diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx index dedd78d..7580665 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx @@ -1,4 +1,5 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectArchitectureReport.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Environmental.ProjectArchitectureReport" %> +<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> @@ -18,50 +19,60 @@
- - - - + + + + + + + + + + + + EnableCollapse="true" runat="server" RedStarPosition="BeforeText" LabelAlign="Right"> + Width="150px" LabelWidth="50px" Label="年度" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged"> - + - + - + - @@ -81,37 +92,38 @@ - - - - - - - - - - - - - - - - + BoxFlex="1" DataKeyNames="ArchitectureReportItemId" AllowCellEditing="true" ForceFit="true" + SortField="SortIndex" ClicksToEdit="1" DataIDField="ArchitectureReportItemId" + EnableColumnLines="true"> + + + + + + + + + + + + + + + + - - - + + + +
+ public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion #region 加载页面 protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { - BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, ConstValue.Group_0011, false); - BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, false); + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + this.InitDropDownList(); + this.ucTree.UnitId = this.CurrUser.UnitId; + this.ucTree.ProjectId = this.ProjectId; + if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId) ) + { + this.panelLeftRegion.Hidden = true; + ////权限按钮方法 + this.GetButtonPower(); + } this.drpUnit.DataTextField = "UnitName"; drpUnit.DataValueField = "UnitId"; @@ -24,12 +52,29 @@ namespace FineUIPro.Web.ZHGL.Environmental drpUnit.DataBind(); this.drpUnit.Readonly = true; ////取上个报表时间 - DateTime showDate = System.DateTime.Now.AddMonths(-3); - this.drpQuarters.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString(); + DateTime showDate = System.DateTime.Now.AddMonths(-1); + drpMonth.SelectedValue = showDate.Month.ToString(); drpYear.SelectedValue = showDate.Year.ToString(); GetValue(); } } + private void InitDropDownList() + { + BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, false); + BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, false); + } + /// + /// 公司级树加载 + /// + /// + /// + protected void changeTree(object sender, EventArgs e) + { + this.ProjectId = this.ucTree.ProjectId; + this.GetButtonPower(); + this.InitDropDownList(); + this.GetValue(); + } private void SetEmpty() { @@ -46,9 +91,13 @@ namespace FineUIPro.Web.ZHGL.Environmental #region 获取记录值 private void GetValue() { + if (string.IsNullOrEmpty(this.ProjectId)) + { + return; + } int year = Funs.GetNewIntOrZero(drpYear.SelectedValue); - int Quarters = Funs.GetNewIntOrZero(drpQuarters.SelectedValue); - Model.View_Environmental_ProjectArchitectureReport report = Funs.DB.View_Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == this.CurrUser.LoginProjectId && e.Quarters == Quarters && e.Year == year); + int month = Funs.GetNewIntOrZero(drpMonth.SelectedValue); + Model.View_Environmental_ProjectArchitectureReport report = Funs.DB.View_Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == this.ProjectId && e.Month == month && e.Year == year); if (report != null) { string upState = string.Empty; @@ -60,7 +109,7 @@ namespace FineUIPro.Web.ZHGL.Environmental { upState = "(未上报)"; } - this.SimpleForm1.Title = "企业建筑行业能源节约与生态环境保护汇总表" + report.QuartersStr + report.YearStr + upState; + this.SimpleForm1.Title = "企业建筑行业能源节约与生态环境保护汇总表" + report.MonthStr + report.YearStr + upState; lbUnitName.Text = "填报企业：" + report.ProjectName; if (report.FillingDate != null) { @@ -162,7 +211,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// private void GetButtonPower() { - var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectArchitectureReportMenuId); + var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectArchitectureReportMenuId); if (buttonList.Count() > 0) { if (buttonList.Contains(BLL.Const.BtnAdd)) @@ -179,7 +228,7 @@ namespace FineUIPro.Web.ZHGL.Environmental } } - var getReport = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.CurrUser.LoginProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + var getReport = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.ProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); this.btnAudit1.Hidden = true; this.btnAudit2.Hidden = true; if (getReport != null) @@ -203,6 +252,12 @@ namespace FineUIPro.Web.ZHGL.Environmental // } //} } + if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + btnNew.Hidden = true; + btnEdit.Hidden = true; + btnDelete.Hidden = true; + } } #endregion @@ -214,7 +269,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnNew_Click(object sender, EventArgs e) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectArchitectureReportSave.aspx?UnitId={0}&&Year={1}&&Quarterss={2}", this.CurrUser.UnitId, this.drpYear.SelectedValue, this.drpQuarters.SelectedValue, "编辑 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectArchitectureReportSave.aspx?UnitId={0}&&Year={1}&&Months={2}", this.CurrUser.UnitId, this.drpYear.SelectedValue, this.drpMonth.SelectedValue, "编辑 - "))); } /// @@ -224,7 +279,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnEdit_Click(object sender, EventArgs e) { - Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.CurrUser.LoginProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.ProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectArchitectureReportSave.aspx?ArchitectureReportId={0}", report.ArchitectureReportId, "编辑 - "))); @@ -242,7 +297,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnAudit1_Click(object sender, EventArgs e) { - Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.CurrUser.LoginProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.ProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectArchitectureReportSave.aspx?ArchitectureReportId={0}", report.ArchitectureReportId, "编辑 - "))); @@ -260,7 +315,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnAudit2_Click(object sender, EventArgs e) { - Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.CurrUser.LoginProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.ProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectArchitectureReportSave.aspx?ArchitectureReportId={0}", report.ArchitectureReportId, "编辑 - "))); @@ -278,7 +333,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnUpdata_Click(object sender, EventArgs e) { - Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.CurrUser.LoginProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.ProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectArchitectureReportSave.aspx?ArchitectureReportId={0}&type=Updata", report.ArchitectureReportId, "编辑 - "))); @@ -296,10 +351,10 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnDelete_Click(object sender, EventArgs e) { - Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.CurrUser.LoginProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.ProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { - BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Quarters.ToString(), report.ArchitectureReportId, BLL.Const.ProjectArchitectureReportMenuId, BLL.Const.BtnDelete); + BLL.LogService.AddSys_Log(this.CurrUser, report.Year.ToString() + "-" + report.Month.ToString(), report.ArchitectureReportId, BLL.Const.ProjectArchitectureReportMenuId, BLL.Const.BtnDelete); BLL.ProjectDataFlowSetService.DeleteFlowSetByDataId(report.ArchitectureReportId); BLL.ProjectArchitectureReportItemService.DeleteArchitectureReportItemByArchitectureReportId(report.ArchitectureReportId); BLL.ProjectArchitectureReportService.DeleteArchitectureReportByArchitectureReportId(report.ArchitectureReportId); @@ -342,7 +397,7 @@ namespace FineUIPro.Web.ZHGL.Environmental Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByArchitectureReportId(ArchitectureReportId.ToString()); if (report != null) { - return report.Year + "年" + report.Quarters + "月"; + return report.Year + "年" + report.Month + "月"; } } return ""; @@ -380,7 +435,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void BtnBulletLeft_Click(object sender, EventArgs e) { - SetQuartersChange("-"); + SetMonthChange("-"); } /// @@ -390,30 +445,30 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void BulletRight_Click(object sender, EventArgs e) { - SetQuartersChange("+"); + SetMonthChange("+"); } /// /// 月份加减变化 /// /// - private void SetQuartersChange(string type) + private void SetMonthChange(string type) { - DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + (Funs.GetNewIntOrZero(this.drpQuarters.SelectedValue) * 3).ToString()); + DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + this.drpMonth.SelectedValue); if (nowDate.HasValue) { DateTime showDate = new DateTime(); if (type == "+") { - showDate = nowDate.Value.AddMonths(3); + showDate = nowDate.Value.AddMonths(1); } else { - showDate = nowDate.Value.AddMonths(-3); + showDate = nowDate.Value.AddMonths(-1); } this.drpYear.SelectedValue = showDate.Year.ToString(); - this.drpQuarters.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString(); + drpMonth.SelectedValue = showDate.Month.ToString(); ///值变化 GetValue(); } @@ -428,7 +483,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// protected void btnSee_Click(object sender, EventArgs e) { - Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.CurrUser.LoginProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarters.SelectedValue)); + Model.Environmental_ProjectArchitectureReport report = BLL.ProjectArchitectureReportService.GetArchitectureReportByProjectIdAndYearAndQuarters(this.ProjectId, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue)); if (report != null) { PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("ReportAuditSee.aspx?Id={0}", report.ArchitectureReportId, "查看 - "))); diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.designer.cs index 526d2f5..80064cc 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.designer.cs +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ZHGL.Environmental -{ - - - public partial class ProjectArchitectureReport - { - +namespace FineUIPro.Web.ZHGL.Environmental { + + + public partial class ProjectArchitectureReport { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,25 +29,52 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// - /// RegionPanel1 控件。 + /// Panel1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RegionPanel RegionPanel1; - + protected global::FineUIPro.Panel Panel1; + /// - /// Region2 控件。 + /// panelLeftRegion 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Region Region2; - + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// ucTree 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + /// /// SimpleForm1 控件。 /// @@ -58,7 +83,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// Toolbar1 控件。 /// @@ -67,7 +92,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpUnit 控件。 /// @@ -76,7 +101,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// drpYear 控件。 /// @@ -85,16 +110,16 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpYear; - + /// - /// drpQuarters 控件。 + /// drpMonth 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpQuarters; - + protected global::FineUIPro.DropDownList drpMonth; + /// /// BtnBulletLeft 控件。 /// @@ -103,7 +128,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnBulletLeft; - + /// /// BtnBulletRight 控件。 /// @@ -112,7 +137,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnBulletRight; - + /// /// ToolbarFill1 控件。 /// @@ -121,7 +146,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSee 控件。 /// @@ -130,7 +155,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSee; - + /// /// btnNew 控件。 /// @@ -139,7 +164,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnEdit 控件。 /// @@ -148,7 +173,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnEdit; - + /// /// btnDelete 控件。 /// @@ -157,7 +182,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDelete; - + /// /// btnAudit1 控件。 /// @@ -166,7 +191,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAudit1; - + /// /// btnAudit2 控件。 /// @@ -175,7 +200,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAudit2; - + /// /// lbUnitName 控件。 /// @@ -184,7 +209,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbUnitName; - + /// /// lbFillingDate 控件。 /// @@ -193,7 +218,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbFillingDate; - + /// /// lbDutyPerson 控件。 /// @@ -202,7 +227,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbDutyPerson; - + /// /// lbHandleMan 控件。 /// @@ -211,7 +236,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbHandleMan; - + /// /// Grid1 控件。 /// @@ -220,7 +245,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Window1 控件。 /// @@ -229,7 +254,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window4 控件。 /// @@ -238,7 +263,7 @@ namespace FineUIPro.Web.ZHGL.Environmental /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window4; - + /// /// Window5 控件。 /// diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReportSave.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReportSave.aspx index 66d2ab7..895af80 100644 --- a/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReportSave.aspx +++ b/SUBQHSE/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReportSave.aspx @@ -31,8 +31,8 @@ - +