diff --git a/DataBase/版本日志/SUBQHSE_V2026-06-10-xiaj(集团主数据在建项目数据分析).sql b/DataBase/版本日志/SUBQHSE_V2026-06-10-xiaj(集团主数据在建项目数据分析).sql new file mode 100644 index 00000000..2cc52921 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-06-10-xiaj(集团主数据在建项目数据分析).sql @@ -0,0 +1,77 @@ + + + + + --˾ڽĿݷ + --ӢĵļӢIJ˵ơMenuEnName +--Analysis of master data project +--ע˵ڡڽĿʹ˵棻ݶƵλ봦 +--SELECT SuperMenu,MenuType,* FROM Sys_Menu WHERE MenuName='ڽĿʹ' + + +--˾ڽĿݷ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '204ACA82-15B4-4C80-AE9F-ACF25CE79888') +BEGIN + INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) + VALUES (N'204ACA82-15B4-4C80-AE9F-ACF25CE79888', N'ڽĿݷ', N'ProjectData/MasterProjectDataAnalysis.aspx', 16, '75AA6177-8AAD-4AA4-BC4E-3883FB095A65', 'Menu_SysSet', 1,1, 1); +END +GO + + + + + --ɾѹĿдԭ +delete from Project_MasterDataUsage +where pro_id in (select distinct MasterSysId from Base_Project) +GO + +--drop table Project_MasterDataAnalysis +--GO + +--ڽĿݷ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Project_MasterDataAnalysis') AND type = N'U') +BEGIN + CREATE TABLE [dbo].[Project_MasterDataAnalysis]( + [Id] [nvarchar](50) NOT NULL, + [CollCropCode] [nvarchar](100) NOT NULL, + [UnitId] [nvarchar](50) NOT NULL, + [ReportDate] [datetime] NOT NULL, + [DataDate] [datetime] NOT NULL, + [Total] [int] NOT NULL, + [MasterTotal] [int] NOT NULL, + [QHSETotal] [int] NOT NULL, + [ZhengChang] [int] NOT NULL, + [DaiJian] [int] NOT NULL, + [BuYong] [int] NOT NULL, + [YuLiXiang] [int] NOT NULL, + [CreateUser] [nvarchar](200) NOT NULL, + CONSTRAINT [PK_Project_MasterDataAnalysis] PRIMARY KEY CLUSTERED + ( + [Id] ASC + )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] + ) ON [PRIMARY] + ALTER TABLE [dbo].[Project_MasterDataAnalysis] ADD CONSTRAINT [DF_Project_MasterDataAnalysis_DataDate] DEFAULT (getdate()) FOR [DataDate] + ALTER TABLE [dbo].[Project_MasterDataAnalysis] ADD CONSTRAINT [DF_Project_MasterDataAnalysis_Total] DEFAULT ((0)) FOR [Total] + ALTER TABLE [dbo].[Project_MasterDataAnalysis] ADD CONSTRAINT [DF_Project_MasterDataAnalysis_MasterTotal] DEFAULT ((0)) FOR [MasterTotal] + ALTER TABLE [dbo].[Project_MasterDataAnalysis] ADD CONSTRAINT [DF_Project_MasterDataAnalysis_QHSETotal] DEFAULT ((0)) FOR [QHSETotal] + ALTER TABLE [dbo].[Project_MasterDataAnalysis] ADD CONSTRAINT [DF_Project_MasterDataAnalysis_ZhengChang] DEFAULT ((0)) FOR [ZhengChang] + ALTER TABLE [dbo].[Project_MasterDataAnalysis] ADD CONSTRAINT [DF_Project_MasterDataAnalysis_DaiJian] DEFAULT ((0)) FOR [DaiJian] + ALTER TABLE [dbo].[Project_MasterDataAnalysis] ADD CONSTRAINT [DF_Project_MasterDataAnalysis_BuYong] DEFAULT ((0)) FOR [BuYong] + ALTER TABLE [dbo].[Project_MasterDataAnalysis] ADD CONSTRAINT [DF_Project_MasterDataAnalysis_YuLiXiang] DEFAULT ((0)) FOR [YuLiXiang] + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'Id' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'CollCropCode' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'UnitId' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'ReportDate' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ݻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'DataDate' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'++Ԥ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'Total' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ڽĿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'MasterTotal' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵڽĿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'QHSETotal' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'ZhengChang' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'DaiJian' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'벻' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'BuYong' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ԥ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'YuLiXiang' +END +GO + + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 257a981d..b5410b5a 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -711,6 +711,7 @@ + diff --git a/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyService.cs b/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyService.cs index 01b1c0aa..640c34a9 100644 --- a/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyService.cs +++ b/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyService.cs @@ -18,6 +18,22 @@ namespace BLL return Funs.DB.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == checkRectifyId); } + /// + /// 根据主表ID撤回整改 + /// + /// 主表ID + public static void RevokeByRectifyId(string checkRectifyId) + { + var items = (from x in Funs.DB.DCGL_Check_CheckRectify + where x.CheckRectifyId == checkRectifyId && x.HandleState == "3" + select x).ToList(); + foreach (var item in items) + { + item.HandleState = "2"; + Funs.DB.SubmitChanges(); + } + } + /// /// 添加督查检查整改 /// diff --git a/SGGL/BLL/ProjectData/ProjectMasterDataAnalysisService.cs b/SGGL/BLL/ProjectData/ProjectMasterDataAnalysisService.cs new file mode 100644 index 00000000..2cbe7874 --- /dev/null +++ b/SGGL/BLL/ProjectData/ProjectMasterDataAnalysisService.cs @@ -0,0 +1,244 @@ + +using Model; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 集团主数据在建项目数据分析 + /// + public static class ProjectMasterDataAnalysisService + { + /// + /// 根据主键获取分析数据 + /// + /// + /// + public static Model.Project_MasterDataAnalysis GetProjectMasterDataAnalysisById(string Id) + { + return Funs.DB.Project_MasterDataAnalysis.FirstOrDefault(e => e.Id == Id); + } + + /// + /// 根据CollCropCode获取分析数据【取最近一条】 + /// + /// + /// + public static Model.Project_MasterDataAnalysis GetProjectMasterDataAnalysisByCollCropCode(string CollCropCode) + { + return Funs.DB.Project_MasterDataAnalysis.OrderByDescending(x => x.DataDate).FirstOrDefault(e => e.CollCropCode == CollCropCode); + } + + /// + /// 获取分析数据【取最近一条】 + /// + /// + public static Model.Project_MasterDataAnalysis GetLastProjectMasterDataAnalysis() + { + return Funs.DB.Project_MasterDataAnalysis.OrderByDescending(x => x.DataDate).FirstOrDefault(); + } + + /// + /// 添加分析数据 + /// + /// + public static void AddProjectMasterDataAnalysis(Model.Project_MasterDataAnalysis model) + { + Model.SGGLDB db = Funs.DB; + Model.Project_MasterDataAnalysis newModel = new Model.Project_MasterDataAnalysis + { + Id = model.Id, + CollCropCode = model.CollCropCode, + UnitId = model.UnitId, + ReportDate = model.ReportDate, + DataDate = model.DataDate, + Total = model.Total, + MasterTotal = model.MasterTotal, + QHSETotal = model.QHSETotal, + ZhengChang = model.ZhengChang, + DaiJian = model.DaiJian, + BuYong = model.BuYong, + YuLiXiang = model.YuLiXiang, + //ZiJian = model.ZiJian, + CreateUser = model.CreateUser, + }; + db.Project_MasterDataAnalysis.InsertOnSubmit(newModel); + db.SubmitChanges(); + } + + /// + /// 修改分析数据 + /// + /// + public static void UpdateProjectMasterDataAnalysis(Model.Project_MasterDataAnalysis model) + { + Model.SGGLDB db = Funs.DB; + Model.Project_MasterDataAnalysis newModel = db.Project_MasterDataAnalysis.FirstOrDefault(e => e.Id == model.Id); + if (newModel != null) + { + //newModel.Id = model.Id; + //newModel.CollCropCode = model.CollCropCode; + //newModel.UnitId = model.UnitId; + //newModel.ReportDate = model.ReportDate; + //newModel.DataDate = model.DataDate; + newModel.Total = model.Total; + newModel.MasterTotal = model.MasterTotal; + newModel.QHSETotal = model.QHSETotal; + newModel.ZhengChang = model.ZhengChang; + newModel.DaiJian = model.DaiJian; + newModel.BuYong = model.BuYong; + newModel.YuLiXiang = model.YuLiXiang; + //newModel.ZiJian = model.ZiJian; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除分析数据 + /// + /// + public static void DeleteProjectMasterDataAnalysisById(string Id) + { + Model.SGGLDB db = Funs.DB; + Model.Project_MasterDataAnalysis model = db.Project_MasterDataAnalysis.FirstOrDefault(e => e.Id == Id); + if (model != null) + { + db.Project_MasterDataAnalysis.DeleteOnSubmit(model); + db.SubmitChanges(); + } + } + + /// + /// 获取最近的汇总记录【近一小时】 + /// + /// + public static List GetRecentHourAnalysisReportList() + { + var list = (from x in Funs.DB.Project_MasterDataAnalysis + where x.DataDate > DateTime.Now.AddHours(-1) + orderby x.DataDate descending + select x).ToList(); + return list; + } + + #region 汇总上报 + + /// + /// 集团主数据在建项目使用情况上报 + /// + /// + /// + /// + public static string ReportProjectMasterDataAnalysis(string userName,ref string message) + { + string code = "0"; + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + #region 汇总数据 + + //获取集团在建主数据 + List masterProDatas = ProjectService.GetMasterProjectDataInfos(); + //获取集团在建主数据 + List projects = ProjectService.GetProjectWorkList(); + + int masterTotal = masterProDatas.Count(); + int qhseTotal = projects.Count(); + + //1、正常 + int zhengChang = (from x in masterProDatas + join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup + from pro in proGroup.DefaultIfEmpty() + where pro != null && pro.MasterSysId != null + //&& pro.ProjectState == Const.ProjectState_1 + select x).Count(); + //2、待建 + int daiJian = (from x in masterProDatas + join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup + from pro in proGroup.DefaultIfEmpty() + join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup + from use in useGroup.DefaultIfEmpty() + where pro == null && (use == null || (use != null && (use.Reason == null || use.Reason == ""))) + select x).Count(); + //3、申请不用 + int buYong = (from x in masterProDatas + join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup + from pro in proGroup.DefaultIfEmpty() + join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup + from use in useGroup.DefaultIfEmpty() + where pro == null && use != null && use.Reason != null && use.Reason != "" + select x).Count(); + //4、预立项 + int yuLiXiang = (from x in projects where x.MasterSysId == null select x).Count(); + + var thisUnit = CommonService.GetIsThisUnit(); + var now = DateTime.Now; + //保存汇总数据 + Model.Project_MasterDataAnalysis analysis = new Project_MasterDataAnalysis + { + Id = SQLHelper.GetNewID(typeof(Model.Project_MasterDataAnalysis)), + CollCropCode = thisUnit.CollCropCode, + UnitId = thisUnit.UnitId, + ReportDate = now.Date, + DataDate = now, + Total = zhengChang + daiJian + yuLiXiang, + MasterTotal = masterTotal, + QHSETotal = qhseTotal, + ZhengChang = zhengChang, + DaiJian = daiJian, + BuYong = buYong, + YuLiXiang = yuLiXiang, + CreateUser = userName + }; + + #endregion + + #region 上报数据 + + string filePath = Funs.SGGLUrl; + try + { + //var upReport = GetLastProjectMasterDataAnalysis(); + var upReport = analysis; + + string baseurl = SysConstSetService.CNCECPath + "/api/Common/ProjectMasterDataAnalysis"; + string contenttype = "application/json;charset=unicode"; + Hashtable newToken = new Hashtable + { + { "token", ServerService.GetToken().Token } + }; + var pushContent = JsonConvert.SerializeObject(upReport); + + //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(); + message = obj["message"].ToString(); + + if (code == "1") + { + AddProjectMasterDataAnalysis(upReport); + } + } + } + catch (Exception ex) + { + ErrLogInfo.WriteLog("【集团主数据在建项目使用情况上报】上传到服务器", ex); + } + + #endregion + + return code; + } + } + + #endregion + } +} diff --git a/SGGL/BLL/ZHGL/Supervise/UnitHazardRegisterItemService.cs b/SGGL/BLL/ZHGL/Supervise/UnitHazardRegisterItemService.cs index 2e206567..24edb297 100644 --- a/SGGL/BLL/ZHGL/Supervise/UnitHazardRegisterItemService.cs +++ b/SGGL/BLL/ZHGL/Supervise/UnitHazardRegisterItemService.cs @@ -1,7 +1,8 @@ -using System; using Model; +using System; using System.Collections.Generic; using System.Linq; +using static BLL.UnitHazardRegisterService; namespace BLL { @@ -38,6 +39,46 @@ namespace BLL } } + /// + /// 根据主表ID驳回所有明细 + /// + /// 主表ID + public static void RejectItemsByRegisterId(string registerId) + { + var items = (from x in Funs.DB.Supervise_UnitHazardRegisterItem + where x.UnitHazardRegisterId == registerId && x.CompleteStatus == 1 + select x).ToList(); + foreach (var item in items) + { + item.CompleteStatus = 0; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据ItemID驳回明细整改 + /// + /// 主表ID + public static void RejectItemByRegisterItemId(string ItemId) + { + var item = (from x in Funs.DB.Supervise_UnitHazardRegisterItem + where x.UnitHazardRegisterItemId == ItemId && x.CompleteStatus == 1 + select x).FirstOrDefault(); + if (item != null) + { + item.CompleteStatus = 0; + Funs.DB.SubmitChanges(); + var obj = (from x in Funs.DB.Supervise_UnitHazardRegister + where x.UnitHazardRegisterId == item.UnitHazardRegisterId && x.States == (int)StateInt.已闭环 + select x).FirstOrDefault(); + if (obj != null) + { + obj.States = (int)StateInt.部分整改; + Funs.DB.SubmitChanges(); + } + } + } + /// /// 删除明细记录 /// @@ -214,10 +255,10 @@ namespace BLL ProjectId = r.ProjectId, CheckUnitName = u.UnitName, States = r.States, - ProblemStatesName = i.CompleteStatus==1 ? "已整改":"未整改", + ProblemStatesName = i.CompleteStatus == 1 ? "已整改" : "未整改", ProblemStates = i.CompleteStatus, InsResponsibleUserId = r.InsResponsibleUserId, - InsResponsibleUserName= user.UserName + InsResponsibleUserName = user.UserName }; // 应用检查大类过滤 @@ -281,17 +322,24 @@ namespace BLL var thisUnit = BLL.CommonService.GetIsThisUnit(); if (thisUnit.UnitId != input.UnitId) { - // 先获取用户有权限的项目ID列表 - var projectIds = (from p in Funs.DB.Base_Project - where p.UnitId == input.UnitId - select p.ProjectId).ToList(); + //// 先获取用户有权限的项目ID列表 + //var projectIds = (from p in Funs.DB.Base_Project + // where p.UnitId == input.UnitId + // select p.ProjectId).ToList(); + + //// 过滤查询结果 + //query = query.Where(x => Funs.DB.Supervise_UnitHazardRegister + // .Any(r => Funs.DB.Supervise_UnitHazardRegisterItem + // .Any(i => i.UnitHazardRegisterItemId == x.UnitHazardRegisterItemId && + // i.UnitHazardRegisterId == r.UnitHazardRegisterId && + // projectIds.Contains(r.ProjectId)))); // 过滤查询结果 query = query.Where(x => Funs.DB.Supervise_UnitHazardRegister .Any(r => Funs.DB.Supervise_UnitHazardRegisterItem .Any(i => i.UnitHazardRegisterItemId == x.UnitHazardRegisterItemId && i.UnitHazardRegisterId == r.UnitHazardRegisterId && - projectIds.Contains(r.ProjectId)))); + input.UnitId == r.CheckUnitId))); } } diff --git a/SGGL/BLL/ZHGL/Supervise/UnitHazardRegisterService.cs b/SGGL/BLL/ZHGL/Supervise/UnitHazardRegisterService.cs index 3c5116eb..b717a080 100644 --- a/SGGL/BLL/ZHGL/Supervise/UnitHazardRegisterService.cs +++ b/SGGL/BLL/ZHGL/Supervise/UnitHazardRegisterService.cs @@ -26,10 +26,10 @@ namespace BLL public enum StateInt : int { - 待提交 = 0, - 待整改= 1, - 部分整改 = 2, - 已闭环 = 3, + 待提交 = 0, + 待整改 = 1, + 部分整改 = 2, + 已闭环 = 3, } #endregion Enums @@ -51,6 +51,7 @@ namespace BLL CheckDate = register.CheckDate, CheckMainType = register.CheckMainType, CheckType = register.CheckType, + InspectionUnit = register.InspectionUnit, ProjectId = register.ProjectId, CheckUnitId = register.CheckUnitId, CheckTeam = register.CheckTeam, @@ -59,7 +60,7 @@ namespace BLL InsResponsibleUserId = register.InsResponsibleUserId, EvaluationResult = register.EvaluationResult, AttachUrl = register.AttachUrl, - States = register.States??0, + States = register.States ?? 0, CompileMan = register.CompileMan, CreateDate = DateTime.Now }; @@ -102,6 +103,22 @@ namespace BLL } } } + /// + /// 驳回企业级检查记录 + /// + /// 检查记录ID + public static void RejectUnitHazardRegisterById(string registerId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var register = db.Supervise_UnitHazardRegister.FirstOrDefault(e => e.UnitHazardRegisterId == registerId); + if (register != null) + { + register.States = (int)StateInt.待整改; + db.SubmitChanges(); + } + } + } /// /// 根据项目和时间段获取检查数量 @@ -118,8 +135,8 @@ namespace BLL } public static int GetCount(string checkMainType) { - return (from x in Funs.DB.Supervise_UnitHazardRegister - where x.CheckMainType ==checkMainType + return (from x in Funs.DB.Supervise_UnitHazardRegister + where x.CheckMainType == checkMainType select x.UnitHazardRegisterId).Count(); } /// @@ -143,11 +160,27 @@ namespace BLL if (register == null) { return false; - } + } // 只有"待提交"状态可以删除，其他状态不能删除 return register.States <= (int)StateInt.待提交; } + /// + /// 判断是否可以驳回检查记录整改结果 + /// + /// 检查记录ID + /// true=可以驳回，false=不能驳回 + public static bool CanRejectRegister(string registerId) + { + var register = GetUnitHazardRegisterById(registerId); + if (register == null) + { + return false; + } + // 只有"已闭环"和"部分整改"状态可以撤回，其他状态不能撤回 + return register.States == (int)StateInt.已闭环 || register.States == (int)StateInt.部分整改; + } + /// /// 获取企业级检查列表（使用input对象，返回总数） /// @@ -171,6 +204,9 @@ namespace BLL on new { MainType = x.CheckMainType, TypeCode = x.CheckType } equals new { MainType = ct.CheckMainType, TypeCode = ct.CheckTypeCode } into ctGroup from ct in ctGroup.DefaultIfEmpty() + join inu in db.Base_Unit + on x.InspectionUnit equals inu.UnitId into inuGroup + from inu in inuGroup.DefaultIfEmpty() join u in db.Base_Unit on x.CheckUnitId equals u.UnitId into uGroup from u in uGroup.DefaultIfEmpty() @@ -185,7 +221,9 @@ namespace BLL CheckMainTypeName = x.CheckMainType == "0" ? "安全" : "质量", CheckType = x.CheckType, CheckTypeName = ct.CheckTypeName, + InspectionUnitName = inu.UnitName, CheckObjectText = p.ProjectName, + CheckUnitId = x.CheckUnitId, CheckUnitName = u.UnitName, CheckTeam = x.CheckTeam, EvaluationResult = x.EvaluationResult, @@ -219,6 +257,10 @@ namespace BLL { query = query.Where(x => x.ProjectId != null && x.ProjectId == input.ProjectId); } + if (input != null && !string.IsNullOrEmpty(input.CheckUnitId) && input.CheckUnitId != CommonService.GetThisUnitId()) + { + query = query.Where(x => x.CheckUnitId != null && x.CheckUnitId == input.CheckUnitId); + } // 获取总数 totalCount = query.Count(); @@ -235,7 +277,7 @@ namespace BLL .Skip(pageIndex * pageSize) .Take(pageSize) .ToList(); - } + } /// /// 更新企业级检查记录 @@ -253,6 +295,7 @@ namespace BLL newRegister.CheckDate = register.CheckDate; newRegister.CheckMainType = register.CheckMainType; newRegister.CheckType = register.CheckType; + newRegister.InspectionUnit = register.InspectionUnit; newRegister.ProjectId = register.ProjectId; newRegister.CheckUnitId = register.CheckUnitId; newRegister.CheckTeam = register.CheckTeam; diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx index bd6fe967..d6376f07 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx @@ -40,6 +40,8 @@ + diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs index dad09ccb..ea2ea3df 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs @@ -18,6 +18,10 @@ namespace FineUIPro.Web.DCGL.ServerCheck { if (!IsPostBack) { + if (this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sysglyId) + {//管理员有权限驳回 + this.btnRevoke.Hidden = false; + } getCheck(); proType = Request.Params["proType"] ?? string.Empty; this.GetButtonPower(); @@ -27,6 +31,28 @@ namespace FineUIPro.Web.DCGL.ServerCheck BindGrid(); } } + protected void btnRevoke_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string itemId = Grid1.DataKeys[rowIndex][0].ToString(); + var item = BLL.DCGLCheckRectifyService.GetCheckRectifyByCheckRectifyId(itemId); + if (item != null) + { + BLL.DCGLCheckRectifyService.RevokeByRectifyId(itemId); + } + } + BindGrid(); + ShowNotify("操作成功!", MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + } /// /// 绑定数据 diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.designer.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.designer.cs index 002cc9c5..a71c72f7 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.designer.cs @@ -68,6 +68,15 @@ namespace FineUIPro.Web.DCGL.ServerCheck /// protected global::FineUIPro.Button btnGet; + /// + /// btnRevoke 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRevoke; + /// /// btnOut 控件。 /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d3c9c225..087b40fa 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1721,6 +1721,7 @@ + @@ -16250,6 +16251,13 @@ MasterProjectData.aspx + + MasterProjectDataAnalysis.aspx + ASPXCodeBehind + + + MasterProjectDataAnalysis.aspx + MasterProjectDataUsage.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx index 736be566..e6db8919 100644 --- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx @@ -19,23 +19,18 @@ } .ThreeMonthPause { - /*background-color: darkgray;*/ background-color: blueviolet; } .MonthPause { - /*background-color: darkgray;*/ background-color: red; } .WeekPause { - /*background-color: darkgray;*/ background-color: deeppink; } .DayPause { - /*background-color: darkgray;*/ background-color: hotpink; } .Pause { - /*background-color: darkgray;*/ background-color: red; } @@ -170,9 +165,9 @@ - + <%-- - + --%> @@ -260,9 +255,9 @@ - + <%-- - + --%> @@ -288,11 +283,11 @@ __doPostBack(null, 'reloadGrid'); } - function onGridDataLoad(event) { - this.mergeColumns(['Pro_name', 'Pro_code', 'Start_date', 'Pro_status'], { - depends: true - }); - } + // function onGridDataLoad(event) { + // this.mergeColumns(['Pro_name', 'Pro_code', 'Start_date', 'Pro_status'], { + // depends: true + // }); + // } diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs index ea72515b..106bfc62 100644 --- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs @@ -83,7 +83,7 @@ namespace FineUIPro.Web.ProjectData Relate = pro != null && pro.MasterSysId != null ? 1 : 2, RelateName = pro != null && pro.MasterSysId != null ? "已关联" : "未关联", UseId = use != null ? use.Id : null, - //Use = use == null ? "" : (use != null && use.Is_use == true) ? "已使用" : "未使用", + //Use = use == null ? "" : (use != null && use.Is_use == true) ? "已使用" : "未使用", ReasonType = use != null ? use.ReasonType : "", Reason = use != null ? use.Reason : "", //Situation = use != null ? use.Situation : "", diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx new file mode 100644 index 00000000..f66137c1 --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx @@ -0,0 +1,390 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MasterProjectDataAnalysis.aspx.cs" Inherits="FineUIPro.Web.ProjectData.MasterProjectDataAnalysis" %> + + + + + + 集团在建项目清单 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.cs new file mode 100644 index 00000000..e9c6111e --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.cs @@ -0,0 +1,857 @@ +using BLL; +using Model; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.ProjectData +{ + public partial class MasterProjectDataAnalysis : PageBase + { + /// + /// 集团在建主数据 + /// + public static List masterProDatas = new List(); + ///// + ///// QHSE施工中项目集合 + ///// + //public static List getProjects = new List(); + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + //获取集团在建主数据 + masterProDatas = ProjectService.GetMasterProjectDataInfos(); + ////获取QHSE施工中项目集合 + //getProjects = ProjectService.GetProjectWorkList(); + + TabStrip1_TabIndexChanged(null, null); + } + } + + /// + /// 页签切换事件 + /// + /// + /// + protected void TabStrip1_TabIndexChanged(object sender, EventArgs e) + { + if (TabStrip1.ActiveTabIndex == 0) + { + this.Panel1.Title = "已关联"; + this.BindGrid(); + } + else if (TabStrip1.ActiveTabIndex == 1) + { + this.Panel1.Title = "待建"; + this.BindGrid2(); + } + else if (TabStrip1.ActiveTabIndex == 2) + { + this.Panel1.Title = "申请不用"; + this.BindGrid3(); + } + else if (TabStrip1.ActiveTabIndex == 3) + { + this.Panel1.Title = "预立项"; + this.BindGrid4(); + } + else if (TabStrip1.ActiveTabIndex == 4) + { + this.Panel1.Title = "数据汇总"; + this.BindGrid9(); + } + //else if (TabStrip1.ActiveTabIndex == 4) + //{ + // this.Panel1.Title = "自建"; + // //this.BindGrid5(); + //} + } + + #endregion + + #region 已关联数据 + + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + var list = new List(); + var db = Funs.DB; + var query = (from x in masterProDatas + join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup + from pro in proGroup.DefaultIfEmpty() + //join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup + //from use in useGroup.DefaultIfEmpty() + where pro != null && pro.MasterSysId != null + //&& pro.ProjectState == Const.ProjectState_1 + select new MasterProjectDataInfo + { + //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}", + Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}", + Pro_id = x.Pro_id, + Pro_name = x.Pro_name, + Pro_code = x.Pro_code, + Start_date = x.Start_date, + Con_mode_desc = x.Con_mode_desc, + Pro_nature = x.Pro_nature, + Pro_status = x.Pro_status, + Org_name = x.Org_name, + Amount = ConvertAmount(x.Ori_amt_sum_vat_fc, x.Amt_add_sum_vat_fc_local), + ProjectId = pro != null ? pro.ProjectId : null, + ProjectName = pro != null ? pro.ProjectName : "", + ProjectCode = pro != null ? pro.ProjectCode : "", + StartDate = pro != null ? pro.StartDate : null, + ProjectState = pro != null ? pro.ProjectState : "", + Relate = pro != null && pro.MasterSysId != null ? 1 : 2, + RelateName = pro != null && pro.MasterSysId != null ? "已关联" : "未关联", + }).ToList(); + + string startDate = this.txtStartTime.Text.Trim(); + string endDate = this.txtEndTime.Text.Trim(); + if (!string.IsNullOrWhiteSpace(startDate)) + { + query = query.Where(x => Funs.GetNewDateTime(x.Start_date) >= Funs.GetNewDateTime(startDate)).ToList(); + } + if (!string.IsNullOrWhiteSpace(endDate)) + { + query = query.Where(x => Funs.GetNewDateTime(x.Start_date) <= Funs.GetNewDateTime(endDate)).ToList(); + } + query = query.OrderByDescending(x => x.StartDate).ToList(); + list.AddRange(query); + + + ////// 获取施工中的项目 + //getProjects = getProjects.Where(x => x.MasterSysId == null).OrderByDescending(x => x.StartDate).ToList(); + //foreach (var pro in getProjects) + //{ + // list.Add(new MasterProjectDataInfo + // { + // Pid = $"|{pro.ProjectId}", + // Pro_id = "", + // Pro_name = "", + // Pro_code = "", + // Start_date = "", + // Con_mode_desc = "", + // Pro_nature = "", + // Pro_status = "", + // Org_name = "", + // Amount = "", + // ProjectId = pro != null ? pro.ProjectId : null, + // ProjectName = pro != null ? pro.ProjectName : "", + // ProjectCode = pro != null ? pro.ProjectCode : "", + // StartDate = pro != null ? pro.StartDate : null, + // ProjectState = pro != null ? pro.ProjectState : "", + // Relate = 3, + // RelateName = "未对应", + // UseId = null, + // //Use = use == null ? "" : (use != null && use.Is_use == true) ? "已使用" : "未使用", + // ReasonType = "", + // Reason = "", + // //Situation = use != null ? use.Situation : "", + // //Remark = use != null ? use.Remark : "", + // }); + //} + + string proName = this.txtProName.Text.Trim(); + string proCode = this.txtProCode.Text.Trim(); + string projectName = this.txtProjectName.Text.Trim(); + string projectCode = this.txtProjectCode.Text.Trim(); + //int relate = int.Parse(this.rblIsRelate.SelectedValue); + + if (!string.IsNullOrEmpty(proName)) + { + list = list.Where(x => x.Pro_name.Contains(proName)).ToList(); + } + if (!string.IsNullOrEmpty(proCode)) + { + list = list.Where(x => x.Pro_code.Contains(proCode)).ToList(); + } + if (!string.IsNullOrEmpty(projectName)) + { + list = list.Where(x => x.ProjectName.Contains(projectName)).ToList(); + } + if (!string.IsNullOrEmpty(projectCode)) + { + list = list.Where(x => x.ProjectCode.Contains(projectCode)).ToList(); + } + //if (relate > 0) + //{ + // list = list.Where(x => x.Relate == relate).ToList(); + //} + + DataTable tb = Funs.LINQToDataTable(list); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + + int totalNum = list.Count(); + JObject summary = new JObject(); + summary.Add("tfNumber", "合计"); + summary.Add("Pro_name", totalNum); + + Grid1.SummaryData = summary; + } + + /// + /// 合同额（亿） + /// + /// 合同含税金额原始存档（元） + /// 增补合同本币含税金额（元） + /// + protected string ConvertAmount(decimal? Ori_amt, decimal? Amt_add) + { + string result = string.Empty; + Ori_amt = Ori_amt == null ? 0 : Ori_amt; + Amt_add = Amt_add == null ? 0 : Amt_add; + decimal? all = Amt_add + Ori_amt; + if (all != null) + { + double amount = all == null ? 0 : (Math.Round((double)(all / 100000000m), 2)); + result = amount.ToString(); + } + return result; + } + + /// + /// 项目状态 + /// + /// + /// + protected string ConvertProjectState(object state) + { + string result = string.Empty; + string stateStr = state.ToString(); + if (state != null && !string.IsNullOrWhiteSpace(stateStr)) + { + result = stateStr == "2" ? "暂停中" : stateStr == "3" ? "已完工" : "施工中"; + } + return result; + } + #endregion + + #region Grid + + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + /// + /// + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 导出按钮 + + /// + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + 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; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridMultiHeaderTableHtml2(Grid1)); + //Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + + #endregion + + #region 待建数据 + + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid2() + { + var list = new List(); + var db = Funs.DB; + var query = (from x in masterProDatas + join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup + from pro in proGroup.DefaultIfEmpty() + join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup + from use in useGroup.DefaultIfEmpty() + where pro == null && (use == null || (use != null && (use.Reason == null || use.Reason == ""))) + select new MasterProjectDataInfo + { + //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}", + //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}", + Pid = x.Pro_id, + Pro_id = x.Pro_id, + Pro_name = x.Pro_name, + Pro_code = x.Pro_code, + Start_date = x.Start_date, + Con_mode_desc = x.Con_mode_desc, + Pro_nature = x.Pro_nature, + Pro_status = x.Pro_status, + Org_name = x.Org_name, + Amount = ConvertAmount(x.Ori_amt_sum_vat_fc, x.Amt_add_sum_vat_fc_local) + }).ToList(); + + string startDate = this.txtStartTime2.Text.Trim(); + string endDate = this.txtEndTime2.Text.Trim(); + if (!string.IsNullOrWhiteSpace(startDate)) + { + query = query.Where(x => Funs.GetNewDateTime(x.Start_date) >= Funs.GetNewDateTime(startDate)).ToList(); + } + if (!string.IsNullOrWhiteSpace(endDate)) + { + query = query.Where(x => Funs.GetNewDateTime(x.Start_date) <= Funs.GetNewDateTime(endDate)).ToList(); + } + query = query.OrderByDescending(x => x.StartDate).ToList(); + list.AddRange(query); + + string proName = this.txtProName2.Text.Trim(); + string proCode = this.txtProCode2.Text.Trim(); + + if (!string.IsNullOrEmpty(proName)) + { + list = list.Where(x => x.Pro_name.Contains(proName)).ToList(); + } + if (!string.IsNullOrEmpty(proCode)) + { + list = list.Where(x => x.Pro_code.Contains(proCode)).ToList(); + } + + DataTable tb = Funs.LINQToDataTable(list); + Grid2.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid2, tb); + Grid2.DataSource = table; + Grid2.DataBind(); + + int totalNum = list.Count(); + JObject summary = new JObject(); + summary.Add("tfPageIndex", "合计"); + summary.Add("Pro_name", totalNum); + + Grid2.SummaryData = summary; + } + + #endregion + + #region Grid + + protected void TextBox2_TextChanged(object sender, EventArgs e) + { + this.BindGrid2(); + } + + /// + /// + /// + /// + /// + protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid2(); + } + + + protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid2(); + } + #endregion + + #region 导出按钮 + + /// + /// 导出按钮 + /// + /// + /// + protected void btnOut2_Click(object sender, EventArgs e) + { + 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; + this.Grid2.PageSize = this.Grid2.RecordCount; + this.BindGrid2(); + Response.Write(GetGridMultiHeaderTableHtml2(Grid2)); + //Response.Write(GetGridTableHtml(Grid2)); + Response.End(); + } + #endregion + + #endregion + + #region 申请不用数据 + + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid3() + { + var list = new List(); + var db = Funs.DB; + var query = (from x in masterProDatas + join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup + from pro in proGroup.DefaultIfEmpty() + join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup + from use in useGroup.DefaultIfEmpty() + where pro == null && use != null && use.Reason != null && use.Reason != "" + select new MasterProjectDataInfo + { + //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}", + //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}", + Pid = x.Pro_id, + Pro_id = x.Pro_id, + Pro_name = x.Pro_name, + Pro_code = x.Pro_code, + Start_date = x.Start_date, + Con_mode_desc = x.Con_mode_desc, + Pro_nature = x.Pro_nature, + Pro_status = x.Pro_status, + Org_name = x.Org_name, + Amount = ConvertAmount(x.Ori_amt_sum_vat_fc, x.Amt_add_sum_vat_fc_local), + ReasonType = use != null ? use.ReasonType : "", + Reason = use != null ? use.Reason : "", + }).ToList(); + + string startDate = this.txtStartTime3.Text.Trim(); + string endDate = this.txtEndTime3.Text.Trim(); + if (!string.IsNullOrWhiteSpace(startDate)) + { + query = query.Where(x => Funs.GetNewDateTime(x.Start_date) >= Funs.GetNewDateTime(startDate)).ToList(); + } + if (!string.IsNullOrWhiteSpace(endDate)) + { + query = query.Where(x => Funs.GetNewDateTime(x.Start_date) <= Funs.GetNewDateTime(endDate)).ToList(); + } + //query = query.OrderByDescending(x => x.StartDate).ToList(); + list.AddRange(query); + + string proName = this.txtProName3.Text.Trim(); + string proCode = this.txtProCode3.Text.Trim(); + + if (!string.IsNullOrEmpty(proName)) + { + list = list.Where(x => x.Pro_name.Contains(proName)).ToList(); + } + if (!string.IsNullOrEmpty(proCode)) + { + list = list.Where(x => x.Pro_code.Contains(proCode)).ToList(); + } + + DataTable tb = Funs.LINQToDataTable(list); + Grid3.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid3, tb); + Grid3.DataSource = table; + Grid3.DataBind(); + + int totalNum = list.Count(); + JObject summary = new JObject(); + summary.Add("tfPageNo", "合计"); + summary.Add("Pro_name", totalNum); + + Grid3.SummaryData = summary; + } + + #endregion + + #region Grid + + protected void TextBox3_TextChanged(object sender, EventArgs e) + { + this.BindGrid3(); + } + + /// + /// + /// + /// + /// + protected void Grid3_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid3(); + } + + + protected void Grid3_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid3(); + } + #endregion + + #region 导出按钮 + + /// + /// 导出按钮 + /// + /// + /// + protected void btnOut3_Click(object sender, EventArgs e) + { + 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; + this.Grid3.PageSize = this.Grid3.RecordCount; + this.BindGrid3(); + Response.Write(GetGridMultiHeaderTableHtml2(Grid3)); + //Response.Write(GetGridTableHtml(Grid3)); + Response.End(); + } + #endregion + + #endregion + + #region 预立项数据 + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid4() + { + //var list = new List(); + var db = Funs.DB; + var projects = ProjectService.GetProjectWorkList(); + var list = (from x in projects + where x.MasterSysId == null + select new MasterProjectDataInfo + { + Pid = x.ProjectId, + ProjectId = x.ProjectId, + ProjectName = x.ProjectName, + ProjectCode = x.ProjectCode, + StartDate = x.StartDate, + ProjectState = x.ProjectState, + }).ToList(); + + string projectName = this.txtProjectName4.Text.Trim(); + string projectCode = this.txtProjectCode4.Text.Trim(); + if (!string.IsNullOrEmpty(projectName)) + { + list = list.Where(x => x.ProjectName.Contains(projectName)).ToList(); + } + if (!string.IsNullOrEmpty(projectCode)) + { + list = list.Where(x => x.ProjectCode.Contains(projectCode)).ToList(); + } + string startDate = this.txtStartTime4.Text.Trim(); + string endDate = this.txtEndTime4.Text.Trim(); + if (!string.IsNullOrWhiteSpace(startDate)) + { + list = list.Where(x => x.StartDate >= Funs.GetNewDateTime(startDate)).ToList(); + } + if (!string.IsNullOrWhiteSpace(endDate)) + { + list = list.Where(x => x.StartDate <= Funs.GetNewDateTime(endDate)).ToList(); + } + //list = list.OrderByDescending(x => x.StartDate).ToList(); + //list.AddRange(query); + + DataTable tb = Funs.LINQToDataTable(list); + Grid4.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid4, tb); + Grid4.DataSource = table; + Grid4.DataBind(); + + int totalNum = list.Count(); + JObject summary = new JObject(); + summary.Add("tfPageNum", "合计"); + summary.Add("ProjectCode", totalNum); + + Grid4.SummaryData = summary; + } + + #endregion + + #region Grid + + protected void TextBox4_TextChanged(object sender, EventArgs e) + { + this.BindGrid4(); + } + + /// + /// + /// + /// + /// + protected void Grid4_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid4(); + } + + + protected void Grid4_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid4(); + } + #endregion + + #region 导出按钮 + + /// + /// 导出按钮 + /// + /// + /// + protected void btnOut4_Click(object sender, EventArgs e) + { + 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; + this.Grid4.PageSize = this.Grid4.RecordCount; + this.BindGrid4(); + Response.Write(GetGridMultiHeaderTableHtml2(Grid4)); + //Response.Write(GetGridTableHtml(Grid4)); + Response.End(); + } + #endregion + + #endregion + + #region 数据汇总 + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid9() + { + var db = Funs.DB; + var list = (from x in db.Project_MasterDataAnalysis + orderby x.ReportDate descending,x.DataDate descending + select x).ToList().Take(30); + + string startDate = this.txtStartTime9.Text.Trim(); + string endDate = this.txtEndTime9.Text.Trim(); + if (!string.IsNullOrWhiteSpace(startDate)) + { + list = list.Where(x => x.ReportDate >= Funs.GetNewDateTime(startDate)).ToList(); + } + if (!string.IsNullOrWhiteSpace(endDate)) + { + list = list.Where(x => x.ReportDate <= Funs.GetNewDateTime(endDate)).ToList(); + } + + DataTable tb = Funs.LINQToDataTable(list); + Grid9.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid9, tb); + Grid9.DataSource = table; + Grid9.DataBind(); + } + + #endregion + + #region Grid + + protected void TextBox9_TextChanged(object sender, EventArgs e) + { + this.BindGrid9(); + } + + /// + /// + /// + /// + /// + protected void Grid9_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid9(); + } + + + protected void Grid9_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid9(); + } + #endregion + + #region 导出按钮 + + /// + /// 导出按钮 + /// + /// + /// + protected void btnOut9_Click(object sender, EventArgs e) + { + 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; + this.Grid9.PageSize = this.Grid9.RecordCount; + this.BindGrid9(); + Response.Write(GetGridMultiHeaderTableHtml2(Grid9)); + //Response.Write(GetGridTableHtml(Grid9)); + Response.End(); + } + #endregion + + + #region 汇总上报 + + /// + /// 汇总上报 + /// + /// + /// + protected void btnReport_Click(object sender, EventArgs e) + { + var reportList = ProjectMasterDataAnalysisService.GetRecentHourAnalysisReportList(); + if (reportList.Any()) + { + Alert.ShowInTop("近一小时内已汇总上报，请勿频繁上报！", MessageBoxIcon.Warning); + return; + } + else + { + string message = string.Empty; + string code = ProjectMasterDataAnalysisService.ReportProjectMasterDataAnalysis(this.CurrUser.UserName,ref message); + if (code == "1") + { + this.BindGrid9(); + ShowNotify(message, MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + return; + } + else + { + Alert.ShowInParent(message, MessageBoxIcon.Error); + } + } + } + + #endregion + + #endregion + + #region 多表头导出方法 + /// + /// 多表头导出方法 + /// + /// + /// + public string GetGridMultiHeaderTableHtml2(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + MultiHeaderTable mht = new MultiHeaderTable(); + mht.ResolveMultiHeaderTable(grid.Columns); + + foreach (List rows in mht.MultiTable) + { + sb.Append(""); + foreach (object[] cell in rows) + { + int rowspan = Convert.ToInt32(cell[0]); + int colspan = Convert.ToInt32(cell[1]); + GridColumn column = cell[2] as GridColumn; + if (column.Hidden == false) + { + sb.AppendFormat("{3}", + rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "", + colspan != 1 ? " colspan=\"" + colspan + "\"" : "", + colspan != 1 ? " style=\"text-align:center;\"" : "", + column.HeaderText); + } + } + sb.Append(""); + } + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + //if (row.Grid.gr.Hidden == false) { + foreach (GridColumn column in mht.Columns) + { + if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del") + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("lblNumber") as AspNet.Label).Text; + } + else if (column.ColumnID == "tfPageIndex") + { + html = (row.FindControl("lblPageIndex") as AspNet.Label).Text; + } + else if (column.ColumnID == "tfPageNo") + { + html = (row.FindControl("lblPageNo") as AspNet.Label).Text; + } + else if (column.ColumnID == "tfPageNum") + { + html = (row.FindControl("lblPageNum") as AspNet.Label).Text; + } + else if (column.ColumnID == "tfNum") + { + html = (row.FindControl("lblNum") as AspNet.Label).Text; + } + else if (column.ColumnID == "tfState") + { + html = (row.FindControl("lblState") as AspNet.Label).Text; + } + else if (column.ColumnID == "tfProState") + { + html = (row.FindControl("lblProState") as AspNet.Label).Text; + } + else if (column.ColumnID == "tfStatus") + { + html = (row.FindControl("lblStatus") as AspNet.Label).Text; + } + sb.AppendFormat("", html); + } + } + //} + sb.Append(""); + } + + sb.Append("
{0}
"); + + return sb.ToString(); + } + + + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.designer.cs new file mode 100644 index 00000000..b62f4133 --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.designer.cs @@ -0,0 +1,494 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ProjectData +{ + + + public partial class MasterProjectDataAnalysis + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// TabStrip1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TabStrip TabStrip1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtProCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProCode; + + /// + /// txtProName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProName; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// lblState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblState; + + /// + /// Grid2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid2; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtProCode2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProCode2; + + /// + /// txtProName2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProName2; + + /// + /// txtStartTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime2; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// txtEndTime2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime2; + + /// + /// btnOut2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut2; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// Grid3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid3; + + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// txtProCode3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProCode3; + + /// + /// txtProName3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProName3; + + /// + /// txtStartTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime3; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// txtEndTime3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime3; + + /// + /// btnOut3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut3; + + /// + /// lblPageNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageNo; + + /// + /// Grid4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid4; + + /// + /// Toolbar5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// txtProjectCode4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode4; + + /// + /// txtProjectName4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName4; + + /// + /// txtStartTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime4; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label3; + + /// + /// txtEndTime4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime4; + + /// + /// btnOut4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut4; + + /// + /// lblPageNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageNum; + + /// + /// lblProState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblProState; + + /// + /// Grid9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid9; + + /// + /// Toolbar6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar6; + + /// + /// txtStartTime9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime9; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label4; + + /// + /// txtEndTime9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime9; + + /// + /// btnReport 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnReport; + + /// + /// btnOut9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut9; + + /// + /// lblNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNum; + } +} diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx index 3b112ae8..fca31a41 100644 --- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx @@ -32,38 +32,38 @@ - + - + - + - + - + - + - + - + - + - + - + <%-- @@ -74,7 +74,7 @@ --%> - + @@ -83,15 +83,15 @@ - + - + <%-- --%> - + <%-- @@ -106,32 +106,32 @@ --%> - + - + - - + + - + - + - + diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs index 19fe61dc..edc9cb1e 100644 --- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; -using System.Linq; namespace FineUIPro.Web.ProjectData { diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index 65d706ef..13ecd9b9 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -75,7 +75,7 @@ + EnableMultiSelect="false" MatchFieldWidth="false" AutoPostBack="true" OnTextChanged="MasterData_Changed"> @@ -85,11 +88,11 @@ - + -