Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

DataBase/版本日志/SGGLDB_WH_2024-05-13-bwj.sql

@@ -0,0 +1,3 @@
+
+update ProcessControl_InspectionManagement set IsOnceQualified=1
+go

SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx

@@ -85,7 +85,7 @@
                                 <f:RenderField ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发出日期" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="100px">
                                 </f:RenderField>
-                                <f:TemplateField ColumnID="ReceiveUnit" Width="180px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Center">
+                                <f:TemplateField ColumnID="ReceiveUnit" Width="180px" HeaderText="上报接收单位" HeaderTextAlign="Center" TextAlign="Center">
                                     <ItemTemplate>
                                         <asp:Label ID="Label1" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnit")) %>'></asp:Label>
                                     </ItemTemplate>

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs

@@ -230,9 +230,8 @@ 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
@@ -347,13 +346,16 @@ 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);
 
                     numberIndex += 1;
                 }
                 //自动设置表格样式
                 table.AutoFit(AutoFitBehavior.FixedColumnWidths);
-
+                //table.Alignment = Aspose.Words.Tables.TableAlignment.Center;
+                //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;
+               
                 #endregion
 
                 #region 本月主要工作内容

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs

@@ -103,8 +103,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 //加载所有专业
                 CNProfessionals = (from x in db.Base_CNProfessional
                                       where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
-                                         //&& x.CNProfessionalId != BLL.Const.ComprehensiveId
-                                      orderby x.SortIndex
+                                         && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
+                                   orderby x.SortIndex
                                       select new ProfessionalsClass
                                       {
                                           CNProfessionalId=x.CNProfessionalId,

SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs

@@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 //加载所有专业
                 CNProfessionals = (from x in db.Base_CNProfessional
                                    where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
-                                      //&& x.CNProfessionalId != BLL.Const.ComprehensiveId
+                                      && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
                                    orderby x.SortIndex
                                    select new ProfessionalsClass
                                    {
@@ -600,17 +600,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
             int Quantity1Sum = 0;
             int Quantity2Sum = 0;
-            //加载所有专业
-            //var CNProfessionals = from x in db.Base_CNProfessional
-            //                      where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
-            //                         && x.CNProfessionalId != BLL.Const.ComprehensiveId
-            //                      orderby x.SortIndex
-            //                      select new
-            //                      {
-            //                          x.CNProfessionalId,
-            //                          x.ProfessionalName
-            //                      };
-
 
             foreach (var item in CNProfessionals)
             {

SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs

@@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// <param name="cNProfessionalId"></param>
         public void BindGvInspectionManagement()
         {
-            //List<Model.NCRStatisc> StatisticsList = new List<Model.NCRStatisc>();
+            StatisticsList = new List<Model.NCRStatisc>();
             Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
             StartDate = Convert.ToDateTime(project.StartDate);
             EndDate = DateTime.Now;

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs

@@ -3,10 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.CQMS.ProcessControl
 {