diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs index eb7cdab0..eec67584 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs @@ -177,7 +177,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //序号 value = " " + value; } - + p.ParagraphFormat.Alignment = ParagraphAlignment.Center; p.AppendChild(new Run(doc, value)); @@ -230,8 +230,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //更新书签内容 Document doc = new Aspose.Words.Document(newUrl); DocumentBuilder builder = new DocumentBuilder(doc); - //builder.CellFormat.VerticalAlignment = CellVerticalAlignment.Center; - //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center; + #region 头部静态列 //业主单位 var unitsYz = (from x in db.Base_Unit @@ -343,16 +342,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew row.Cells.Add(CreateCell(item.TargetValue, doc, table.FirstRow.Cells[3].CellFormat.Width)); row.Cells.Add(CreateCell(item.MonthPer, doc, table.FirstRow.Cells[4].CellFormat.Width)); row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[5].CellFormat.Width)); - - table.Rows.Insert(numberIndex, row); - + + table.Rows.Insert(numberIndex, row); numberIndex += 1; } //自动设置表格样式 table.AutoFit(AutoFitBehavior.FixedColumnWidths); - //table.Alignment = Aspose.Words.Tables.TableAlignment.Center; - //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center; - #endregion #region 本月主要工作内容 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs index 82c1a59c..5a534372 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReport.aspx.cs @@ -178,6 +178,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew value = " " + value; } + p.ParagraphFormat.Alignment = ParagraphAlignment.Center; p.AppendChild(new Run(doc, value)); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs index 5c3b48e2..20ded6c8 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs @@ -60,17 +60,40 @@ namespace FineUIPro.Web.CQMS.ProcessControl } //统计所给时间段的全部数量 List managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, string.Empty, StartDate, DateTime.Now, false); - List compileMans = managementListSunNumber.Select(x => x.CompileMan).Distinct().ToList(); - foreach (var item in compileMans) + var checkMans = managementListSunNumber.Select(x => x.AcceptanceCheckMan.Split(',').ToList()); + List compileMans = new List(); + foreach (var item in checkMans) { - Model.Sys_User user = BLL.UserService.GetUserByUserId(item); + string id = item.FirstOrDefault().Trim(); + compileMans.Add(id); + } + checkMans= managementListSunNumber.Select(x => x.AcceptanceCheckMan.Split('、').ToList()); + foreach (var item in checkMans) + { + string name = item.FirstOrDefault().Trim(); + compileMans.Add(name); + } + //List compileMans = managementListSunNumber.Select(x => x.CompileMan).Distinct().ToList(); + foreach (var item in compileMans.Distinct()) + { + Model.NCRStatisc Statistics = new Model.NCRStatisc(); + Model.Sys_User user = BLL.UserService.GetUserByUserId(item);//新数据保存的用户Id if (user != null) { - Model.NCRStatisc Statistics = new Model.NCRStatisc(); Statistics.WorkName = user.UserName; - Statistics.CheckNum = managementListSunNumber.Where(x => x.CompileMan == item).Count(); + Statistics.CheckNum = managementListSunNumber.Where(x => x.AcceptanceCheckMan == item).Count(); StatisticsList.Add(Statistics); } + else + { + Model.Sys_User u = BLL.UserService.GetUserByUserName(item);//老数据保存的姓名 + if (u!=null) + { + Statistics.WorkName = u.UserName; + Statistics.CheckNum = managementListSunNumber.Where(x => x.AcceptanceCheckMan == item).Count(); + StatisticsList.Add(Statistics); + } + } } Model.NCRStatisc StatisticsLast = new Model.NCRStatisc(); StatisticsLast.WorkName = "合计"; diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f50b26d3..9fc55c34 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - +