Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

SGGL/BLL/Common/Funs.cs

@@ -1256,6 +1256,8 @@ namespace BLL
             client.Timeout = -1;
             var request = new RestRequest(Method.GET);
             request.AddHeader("token", Token);
+            request.AddHeader("ClientId", SysConstSetService.ClientId);
+            request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1));
             IRestResponse response = client.Execute(request);
             Console.WriteLine(response.Content);
             return response.Content;
@@ -1268,6 +1270,8 @@ namespace BLL
             client.Timeout = -1;
             var request = new RestRequest(Method.POST);
             request.AddHeader("token", Token);
+            request.AddHeader("ClientId", SysConstSetService.ClientId);
+            request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1));
             if (!string.IsNullOrEmpty(JsonBody))
             {
                 request.AddJsonBody(JsonBody);
@@ -1276,6 +1280,7 @@ namespace BLL
             IRestResponse response = client.Execute(request);
             return response.Content;
         }
+
     }
 }
 

SGGL/BLL/SysManage/SysConstSetService.cs

@@ -8,8 +8,10 @@
     public static class SysConstSetService
     {
         private static string _CNCECPath;
+        private static string _CncecEsbPath;
         private static string _CNCECToken;
         private static string _CNCECTokenExTime;
+        private static string _ClientId;
 
         public static string CNCECPath
         {
@@ -31,6 +33,46 @@
                 _CNCECPath = value;
             }
         }
+        public static string CncecEsbPath
+        {
+            get
+            {
+                var sysSet5 = (from x in Funs.DB.Sys_Const where x.ConstText == "集团ESB地址" select x).ToList().FirstOrDefault();
+                if (sysSet5 != null)
+                {
+                    _CncecEsbPath = sysSet5.ConstValue;
+                }
+                else
+                {
+                    _CncecEsbPath = "";
+                }
+                return _CncecEsbPath;
+            }
+            set
+            {
+                _CncecEsbPath = value;
+            }
+        }
+        public static string ClientId
+        {
+            get
+            {
+                var sysSet5 = (from x in Funs.DB.Sys_Const where x.ConstText == "ClientId" select x).ToList().FirstOrDefault();
+                if (sysSet5 != null)
+                {
+                    _ClientId = sysSet5.ConstValue;
+                }
+                else
+                {
+                    _ClientId = "";
+                }
+                return _ClientId;
+            }
+            set
+            {
+                _ClientId = value;
+            }
+        }
         public static string CNCECToken
         {
             get

SGGL/FineUIPro.Web/BaseInfo/DocType.aspx

@@ -29,7 +29,7 @@
             <f:Grid ID="Grid1" Title="文档类别" ShowHeader="false" EnableCollapse="true" PageSize="10" ForceFit="true"
                 ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px" EnableColumnLines="true"
                 DataKeyNames="DocTypeId" DataIDField="DocTypeId" OnPageIndexChange="Grid1_PageIndexChange" SortField="DocTypeCode" SortDirection="ASC"
-                AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
+                AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True" EnableMultiSelect="false">
                 <Columns>
                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
                     <f:RenderField Width="100px" ColumnID="DocTypeCode" DataField="DocTypeCode"

SGGL/FineUIPro.Web/BaseInfo/DocType.aspx.cs

@@ -166,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            string strRowID = hfFormID.Text;
+            string strRowID = Grid1.SelectedRowID;
             Model.Base_DocType newDocType = new Model.Base_DocType
             {
                 DocTypeCode = this.txtDocTypeCode.Text.Trim(),

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

@@ -76,7 +76,7 @@
                                 <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("UnitId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="ImplementationFrontState" DataField="ImplementationFrontState" FieldType="String" HeaderText="实施前状态" TextAlign="Center"
+                        <f:RenderField ColumnID="ImplementationFrontState" DataField="ImplementationFrontState" FieldType="String" HeaderText="执行情况" TextAlign="Center"
                             HeaderTextAlign="Center" Width="150px">
                         </f:RenderField>
                         <f:RenderField ColumnID="CompleteDate" DataField="CompleteDate" FieldType="Date" Renderer="Date" HeaderText="施工完成日期" TextAlign="Center"

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

@@ -42,7 +42,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtImplementationFrontState" runat="server" Label="实施前状态" MaxLength="50" LabelAlign="right"></f:TextBox>
+                        <f:TextBox ID="txtImplementationFrontState" runat="server" Label="执行情况" MaxLength="50" LabelAlign="right"></f:TextBox>
                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="施工完成日期" ID="txtCompleteDate" LabelWidth="120px"
                             LabelAlign="right">
                         </f:DatePicker>

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs

@@ -140,7 +140,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             txtChangeReason.Readonly = true;
             txtCompleteDate.Readonly = true;
             txtContents.Readonly = true;
-            txtImplementationFrontState.Readonly = true;
+           // txtImplementationFrontState.Readonly = true;
             txtIssuedDate.Readonly = true;
             drpCNProfessionalId.Readonly = true;
             drpUnitIds.Readonly = true;

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs

@@ -506,8 +506,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             if (e.EventArgument == "Confirm_OK")
             {
                 string rootPath = Server.MapPath("~/");
-                string uploadfilepath = rootPath + Const.DesignChangeOrderDataInUrl;
+                string uploadfilepath = rootPath + Const.DesignDrawingsDataInUrl;
-                string filePath = Const.DesignChangeOrderDataInUrl;
+                string filePath = Const.DesignDrawingsDataInUrl;
                 string fileName = Path.GetFileName(filePath);
                 FileInfo info = new FileInfo(uploadfilepath);
                 long fileSize = info.Length;

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

@@ -113,6 +113,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 NCRBindStatisc();//NCR统计
                 DesignChangeOrderBindStatisc();//设计变更统计
                 PassWelderBindStatisc();//合格焊工统计
+                ConstructionStatisticsr();//施工方案统计
             } 
         }
 
@@ -516,44 +517,45 @@ namespace FineUIPro.Web.CQMS.ManageReport
             List<Model.View_CQMS_InspectionManagementDetail> totalManagementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false);
             //专业下当期集合
             List<Model.View_CQMS_InspectionManagementDetail> managementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, startDate, endDate, false);
-            if (cNProfessionalId == BLL.Const.CNProfessionalCVId)    //土建按单位工程统计
+            foreach (var item in totalManagementList)
             {
-                foreach (var item in totalManagementList)
+                Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(item.ControlPointType);
+                if (breakdownProject != null)
                 {
-                    Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(item.ControlPointType);
+                    Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(breakdownProject.DivisionProjectId);
-                    if (breakdownProject != null)
+                    if (divisionProject != null)
                     {
-                        Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(breakdownProject.DivisionProjectId);
+                        Model.WBS_UnitWork ins = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(divisionProject.UnitWorkId);
-                        if (divisionProject != null)
+                        if (ins != null)
                         {
-                            Model.WBS_UnitWork ins = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(divisionProject.UnitWorkId);
+                            if (!workNames.Contains(ins.UnitWorkName))  //新增记录
-                            if (ins != null)
                             {
-                                if (!workNames.Contains(ins.UnitWorkName))  //新增记录
+                                Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
-                                {
+                                checkStatisc.Num = i;
-                                    Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
+                                checkStatisc.WorkName = ins.UnitWorkName;
-                                    checkStatisc.Num = i;
+                                workNames.Add(ins.UnitWorkName);
-                                    checkStatisc.WorkName = ins.UnitWorkName;
+                                checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    workNames.Add(ins.UnitWorkName);
+                                checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
+                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
+                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                StatisticsList.Add(checkStatisc);
-                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                i++;
-                                    StatisticsList.Add(checkStatisc);
+                            }
-                                    i++;
+                            else   //更新已有记录
-                                }
+                            {
-                                else   //更新已有记录
+                                Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
-                                {
+                                checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
+                                checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
+                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
+                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                }
                             }
                         }
                     }
                 }
+            }
+            /*if (cNProfessionalId == BLL.Const.CNProfessionalCVId)    //土建按单位工程统计
+            {
+                
             }
             else
             {
@@ -589,7 +591,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                         }
                     }
                 }
-            }
+            }*/
             foreach (var item in StatisticsList)
             {
                 if (item.CheckNum != 0)//被除数不能为零
@@ -716,7 +718,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -732,7 +734,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -747,7 +749,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -762,7 +764,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -777,7 +779,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -792,7 +794,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -807,7 +809,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -883,8 +885,9 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
                 NCRStatisc.Num = i;
                 NCRStatisc.WorkName = BLL.UnitService.getUnitNamesUnitIds(item);
-                NCRStatisc.OKNum = managementList.Count(x => x.CompleteDate != null);
+                NCRStatisc.CurrentPeriodOkNum = managementList.Count(x => x.CompleteDate != null);
-                NCRStatisc.CheckNum = sumManagementList.Count(x => x.CompleteDate != null);
+                NCRStatisc.OKNum = sumManagementList.Count(x => x.CompleteDate != null);
+                NCRStatisc.CheckNum = sumManagementList.Count;
                 if (NCRStatisc.CheckNum != 0)//被除数不能为零
                 {
                     NCRStatisc.OKRate = Math.Round((double)NCRStatisc.OKNum / (double)NCRStatisc.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
@@ -903,6 +906,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 StatisticsLast.WorkName = "合计";
                 foreach (Model.NCRReportStatisc item in StatisticsList)
                 {
+                    StatisticsLast.CurrentPeriodOkNum += item.CurrentPeriodOkNum;
                     StatisticsLast.OKNum += item.OKNum;
                     StatisticsLast.CheckNum += item.CheckNum;
                 }
@@ -930,7 +934,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#接收单位#本周已完成#累计已完成#累计完成比例";
+                string headerStr = "序号#接收单位#本月已完成#累计已完成#NCR总数#累计完成比例";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -1044,23 +1048,53 @@ namespace FineUIPro.Web.CQMS.ManageReport
                         where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
                         orderby y.UnitCode
                         select new { x.UnitId, y.UnitName };
+            var db = Funs.DB;
             foreach (var item in units)
             {
-                //单位下所有集合
-                List<Model.BS_Welder> totalWelderList = BLL.PersonManageService.GetWelderListByUnitId(this.CurrUser.LoginProjectId, item.UnitId);
-                List<Model.BS_Welder> welderList = BLL.PersonManageService.GetWelderListByUnitIdAndDate(this.CurrUser.LoginProjectId, item.UnitId, startDate, endDate);
 
+                var query = from c in db.Comprehensive_InspectionPerson
+
+                    join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+
+                    from u in unitJoin.DefaultIfEmpty()
+                    join cn in db.Base_CNProfessional on c.CNProfessionalId equals cn.CNProfessionalId into cnJoin
+
+                    from cn in cnJoin.DefaultIfEmpty()
+                    join p in db.Base_Post on c.PostId equals p.PostId into postJoin
+
+                    from p in postJoin.DefaultIfEmpty()
+                    where c.ProjectId == this.CurrUser.LoginProjectId &&  c.UnitId== item.UnitId
+                            select new
+
+                    {
+                        c.InspectionPersonId,
+                        c.ProjectId,
+                        u.UnitId,
+                        u.UnitName,
+                        c.PersonName,
+                        c.ApprovalTime,
+                        cn.ProfessionalName,
+                        p.PostName
+
+                    };
+
+                //单位下所有集合
+                // List<Model.BS_Welder> totalWelderList = BLL.PersonManageService.GetWelderListByUnitId(this.CurrUser.LoginProjectId, item.UnitId);
+                //List<Model.BS_Welder> welderList = BLL.PersonManageService.GetWelderListByUnitIdAndDate(this.CurrUser.LoginProjectId, item.UnitId, startDate, endDate); 
+                var totalWelderList = query.ToList();
+                var welderList = query
+                    .Where(x=> (x.ApprovalTime >= Convert.ToDateTime(startDate) && x.ApprovalTime <= Convert.ToDateTime(endDate)));
                 Model.PassWelderStatisc passWelderStatisc = new Model.PassWelderStatisc();
                 passWelderStatisc.Num = i;
                 passWelderStatisc.UnitName = item.UnitName;
-                passWelderStatisc.PipeMountGuard = welderList.Count(x => x.WED_Remark == "管道");
+                passWelderStatisc.PipeMountGuard = welderList.Count(x => x.ProfessionalName == "管道"&&x.PostName== "焊工");
-                passWelderStatisc.PipeTotal = totalWelderList.Count(x => x.WED_Remark == "管道");
+                passWelderStatisc.PipeTotal = totalWelderList.Count(x => x.ProfessionalName == "管道" && x.PostName == "焊工");
-                passWelderStatisc.SteelStructureMountGuard = welderList.Count(x => x.WED_Remark == "钢结构");
+                passWelderStatisc.SteelStructureMountGuard = welderList.Count(x => x.ProfessionalName == "土建" && x.PostName == "焊工");
-                passWelderStatisc.SteelStructureTotal = totalWelderList.Count(x => x.WED_Remark == "钢结构");
+                passWelderStatisc.SteelStructureTotal = totalWelderList.Count(x => x.ProfessionalName == "土建" && x.PostName == "焊工");
-                passWelderStatisc.EquipmentMountGuard = welderList.Count(x => x.WED_Remark == "设备");
+                passWelderStatisc.EquipmentMountGuard = welderList.Count(x => x.ProfessionalName == "设备" && x.PostName == "焊工");
-                passWelderStatisc.EquipmentTotal = totalWelderList.Count(x => x.WED_Remark == "设备");
+                passWelderStatisc.EquipmentTotal = totalWelderList.Count(x => x.ProfessionalName == "设备" && x.PostName == "焊工");
-                passWelderStatisc.OtherMountGuard = welderList.Count(x => x.WED_Remark == "其他");
+                passWelderStatisc.OtherMountGuard = welderList.Count(x => x.ProfessionalName != "管道" && x.ProfessionalName != "土建" && x.ProfessionalName != "设备" && x.PostName == "焊工");
-                passWelderStatisc.OtherTotal = totalWelderList.Count(x => x.WED_Remark == "其他");
+                passWelderStatisc.OtherTotal = totalWelderList.Count(x => x.ProfessionalName != "管道" && x.ProfessionalName != "土建" && x.ProfessionalName != "设备" && x.PostName == "焊工");
                 StatisticsList.Add(passWelderStatisc);
                 i++;
             }
@@ -1103,6 +1137,70 @@ namespace FineUIPro.Web.CQMS.ManageReport
         }
         #endregion
 
+        #region 施工方案统计
+        public void ConstructionStatisticsr()
+        {
+            var db = Funs.DB;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            DateTime projectStartDate = Convert.ToDateTime("2015-01-01");
+             Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
+            if (project != null)
+            {
+                if (project.StartDate != null)
+                {
+                    projectStartDate = Convert.ToDateTime(project.StartDate);
+                }
+            }
+            int i = 1; 
+            var q = from x in db.Solution_CQMSConstructSolution
+                    where x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)
+                    group x by new { x.UnitId, State = x.State == "3", ProjectId = x.ProjectId == project.ProjectId }
+                into g
+                select new
+                {
+                    UnitName=BLL.UnitService.GetUnitNameByUnitId(g.Key.UnitId),
+                    Count = g.Key.UnitId.Count(),
+                };
+            var result = q.ToList().Select((item, index) => new
+            {
+                Index = index + 1,
+                item.UnitName,
+                item.Count
+
+            });
+            if (result.Count()>0)   //增加总计
+            {
+                int totalCount = result.Sum(item => item.Count);
+                result = result.Concat(new[]
+                {
+                    new
+                    {
+                        Index = result.Count() + 1,
+                        UnitName = "合计",
+                        Count = totalCount
+
+                    }
+                });
+            }
+
+            this.gvConstructionStatistics.DataSource = result;
+            this.gvConstructionStatistics.DataBind();
+
+        }
+
+        protected void gvConstructionStatistics_RowCreated(object sender, GridViewRowEventArgs e)
+        {
+            if (e.Row.RowType == DataControlRowType.Header)
+            {
+                string headerStr = "序号#报审单位#完成数量";
+                DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
+                dHelper.SplitTableHeader(e.Row, headerStr);
+            }
+        }
+
+        #endregion
+
         #region 下月质量控制重点
         /// <summary>
         /// 增加下月质量控制重点
@@ -1186,6 +1284,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 NCRBindStatisc();//NCR统计
                 DesignChangeOrderBindStatisc();//设计变更统计
                 PassWelderBindStatisc();//合格焊工统计
+                ConstructionStatisticsr();//施工方案统计
             }
         }
         #endregion
@@ -1308,5 +1407,6 @@ namespace FineUIPro.Web.CQMS.ManageReport
         #endregion
 
 
+      
     }
 }

SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ManageReport {
+namespace FineUIPro.Web.CQMS.ManageReport
+{
 
 
-    public partial class MonthReportEdit {
+    public partial class MonthReportEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -561,6 +563,24 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView gvPassWelder;
 
+        /// <summary>
+        /// image13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image image13;
+
+        /// <summary>
+        /// gvConstructionStatistics 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvConstructionStatistics;
+
         /// <summary>
         /// Table10 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx

@@ -589,6 +589,23 @@
                 </asp:GridView>
             </td>
         </tr>
+    <tr style="background: url('../Images/bg-1.gif')">
+        <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
+            <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image13" runat="server" />
+            &nbsp;7）施工方案统计
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <asp:GridView ID="gvConstructionStatistics" runat="server" AllowPaging="false" AllowSorting="True"
+                          AutoGenerateColumns="True" HorizontalAlign="Justify" Width="100%" OnRowCreated="gvConstructionStatistics_RowCreated">
+                <AlternatingRowStyle CssClass="GridBgColr" />
+                <HeaderStyle CssClass="GridBgColr" />
+                <PagerStyle HorizontalAlign="Left" />
+                <RowStyle CssClass="GridRow" />
+            </asp:GridView>
+        </td>
+    </tr>
         <tr>
             <td>
                 <table id="Table10" runat="server" width="100%" cellpadding="0" cellspacing="0">

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

@@ -109,6 +109,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 NCRBindStatisc();//NCR统计
                 DesignChangeOrderBindStatisc();//设计变更统计
                 PassWelderBindStatisc();//合格焊工统计
+                ConstructionStatisticsr();//施工方案统计
+
             }
         }
 
@@ -504,45 +506,46 @@ namespace FineUIPro.Web.CQMS.ManageReport
             List<Model.View_CQMS_InspectionManagementDetail> totalManagementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false);
             //专业下当期集合
             List<Model.View_CQMS_InspectionManagementDetail> managementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, startDate, endDate, false);
-            if (cNProfessionalId == BLL.Const.CNProfessionalCVId)    //土建按单位工程统计
+            foreach (var item in totalManagementList)
             {
-                foreach (var item in totalManagementList)
+                Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(item.ControlPointType);
+                if (breakdownProject != null)
                 {
-                    Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(item.ControlPointType);
+                    Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(breakdownProject.DivisionProjectId);
-                    if (breakdownProject != null)
+                    if (divisionProject != null)
                     {
-                        Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(breakdownProject.DivisionProjectId);
+                        Model.WBS_UnitWork ins = BLL.UnitWorkService.getUnitWorkByUnitWorkId(divisionProject.UnitWorkId);
-                        if (divisionProject != null)
+                        if (ins != null)
                         {
-                            Model.WBS_UnitWork ins = BLL.UnitWorkService.getUnitWorkByUnitWorkId(divisionProject.UnitWorkId);
+                            if (!workNames.Contains(ins.UnitWorkName))  //新增记录
-                            if (ins != null)
                             {
-                                if (!workNames.Contains(ins.UnitWorkName))  //新增记录
+                                Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
-                                {
+                                checkStatisc.Num = i;
-                                    Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
+                                checkStatisc.WorkName = ins.UnitWorkName;
-                                    checkStatisc.Num = i;
+                                workNames.Add(ins.UnitWorkName);
-                                    checkStatisc.WorkName = ins.UnitWorkName;
+                                checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    workNames.Add(ins.UnitWorkName);
+                                checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc.CheckNum = managementList.Count(x => x.ControlPointType == item.ControlPointType);
+                                checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
+                                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc.OKNum = managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                StatisticsList.Add(checkStatisc);
-                                    checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
+                                i++;
-                                    StatisticsList.Add(checkStatisc);
+                            }
-                                    i++;
+                            else   //更新已有记录
-                                }
+                            {
-                                else   //更新已有记录
+                                Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
-                                {
+                                checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    Model.CheckStatisc checkStatisc1 = StatisticsList.FirstOrDefault(x => x.WorkName == ins.UnitWorkName);
+                                checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
-                                    checkStatisc1.CheckNum += managementList.Count(x => x.ControlPointType == item.ControlPointType);
+                                checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc1.TotalCheckNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType);
+                                checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc1.OKNum += managementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                    checkStatisc1.TotalOKNum += totalManagementList.Count(x => x.ControlPointType == item.ControlPointType && x.IsOnceQualified == true);
-                                }
                             }
                         }
                     }
                 }
             }
+
+            /*if (cNProfessionalId == BLL.Const.CNProfessionalCVId)    //土建按单位工程统计
+            {
+            }
             else
             {
                 foreach (var item in totalManagementList)
@@ -577,7 +580,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                         }
                     }
                 }
-            }
+            }*/
             foreach (var item in StatisticsList)
             {
                 if (item.CheckNum != 0)//被除数不能为零
@@ -675,7 +678,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -691,7 +694,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -706,7 +709,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -721,7 +724,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -736,7 +739,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -751,7 +754,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -766,7 +769,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#工作名称#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
+                string headerStr = "序号#单位工程#检查（点） 本周,累计#合格（点） 本周,累计#一次合格率 本周,累计";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -842,8 +845,9 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
                 NCRStatisc.Num = i;
                 NCRStatisc.WorkName = BLL.UnitService.getUnitNamesUnitIds(item);
-                NCRStatisc.OKNum = managementList.Count(x => x.CompleteDate != null);
+                NCRStatisc.CurrentPeriodOkNum = managementList.Count(x => x.CompleteDate != null);
-                NCRStatisc.CheckNum = sumManagementList.Count(x => x.CompleteDate != null);
+                NCRStatisc.OKNum = sumManagementList.Count(x => x.CompleteDate != null);
+                NCRStatisc.CheckNum = sumManagementList.Count;
                 if (NCRStatisc.CheckNum != 0)//被除数不能为零
                 {
                     NCRStatisc.OKRate = Math.Round((double)NCRStatisc.OKNum / (double)NCRStatisc.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
@@ -862,6 +866,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 StatisticsLast.WorkName = "合计";
                 foreach (Model.NCRReportStatisc item in StatisticsList)
                 {
+                    StatisticsLast.CurrentPeriodOkNum += item.CurrentPeriodOkNum;
                     StatisticsLast.OKNum += item.OKNum;
                     StatisticsLast.CheckNum += item.CheckNum;
                 }
@@ -889,7 +894,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
         {
             if (e.Row.RowType == DataControlRowType.Header)
             {
-                string headerStr = "序号#接收单位#本周已完成#累计已完成#累计完成比例";
+                string headerStr = "序号#接收单位#本周已完成#累计已完成#NCR总数#累计完成比例";
                 DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
                 dHelper.SplitTableHeader(e.Row, headerStr);
             }
@@ -1004,23 +1009,53 @@ namespace FineUIPro.Web.CQMS.ManageReport
                         orderby y.UnitCode
                         select new { x.UnitId, y.UnitName };
 
+            var db = Funs.DB;
             foreach (var item in units)
             {
-                //单位下所有集合
-                List<Model.BS_Welder> totalWelderList = BLL.PersonManageService.GetWelderListByUnitId(this.CurrUser.LoginProjectId, item.UnitId);
-                List<Model.BS_Welder> welderList = BLL.PersonManageService.GetWelderListByUnitIdAndDate(this.CurrUser.LoginProjectId, item.UnitId, startDate, endDate);
 
+                var query = from c in db.Comprehensive_InspectionPerson
+
+                            join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+
+                            from u in unitJoin.DefaultIfEmpty()
+                            join cn in db.Base_CNProfessional on c.CNProfessionalId equals cn.CNProfessionalId into cnJoin
+
+                            from cn in cnJoin.DefaultIfEmpty()
+                            join p in db.Base_Post on c.PostId equals p.PostId into postJoin
+
+                            from p in postJoin.DefaultIfEmpty()
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
+                            select new
+
+                            {
+                                c.InspectionPersonId,
+                                c.ProjectId,
+                                u.UnitId,
+                                u.UnitName,
+                                c.PersonName,
+                                c.ApprovalTime,
+                                cn.ProfessionalName,
+                                p.PostName
+
+                            };
+
+                //单位下所有集合
+                // List<Model.BS_Welder> totalWelderList = BLL.PersonManageService.GetWelderListByUnitId(this.CurrUser.LoginProjectId, item.UnitId);
+                //List<Model.BS_Welder> welderList = BLL.PersonManageService.GetWelderListByUnitIdAndDate(this.CurrUser.LoginProjectId, item.UnitId, startDate, endDate); 
+                var totalWelderList = query.ToList();
+                var welderList = query
+                    .Where(x => (x.ApprovalTime >= Convert.ToDateTime(startDate) && x.ApprovalTime <= Convert.ToDateTime(endDate)));
                 Model.PassWelderStatisc passWelderStatisc = new Model.PassWelderStatisc();
                 passWelderStatisc.Num = i;
                 passWelderStatisc.UnitName = item.UnitName;
-                passWelderStatisc.PipeMountGuard = welderList.Count(x => x.WED_Remark == "管道");
+                passWelderStatisc.PipeMountGuard = welderList.Count(x => x.ProfessionalName == "管道" && x.PostName == "焊工");
-                passWelderStatisc.PipeTotal = totalWelderList.Count(x => x.WED_Remark == "管道");
+                passWelderStatisc.PipeTotal = totalWelderList.Count(x => x.ProfessionalName == "管道" && x.PostName == "焊工");
-                passWelderStatisc.SteelStructureMountGuard = welderList.Count(x => x.WED_Remark == "钢结构");
+                passWelderStatisc.SteelStructureMountGuard = welderList.Count(x => x.ProfessionalName == "土建" && x.PostName == "焊工");
-                passWelderStatisc.SteelStructureTotal = totalWelderList.Count(x => x.WED_Remark == "钢结构");
+                passWelderStatisc.SteelStructureTotal = totalWelderList.Count(x => x.ProfessionalName == "土建" && x.PostName == "焊工");
-                passWelderStatisc.EquipmentMountGuard = welderList.Count(x => x.WED_Remark == "设备");
+                passWelderStatisc.EquipmentMountGuard = welderList.Count(x => x.ProfessionalName == "设备" && x.PostName == "焊工");
-                passWelderStatisc.EquipmentTotal = totalWelderList.Count(x => x.WED_Remark == "设备");
+                passWelderStatisc.EquipmentTotal = totalWelderList.Count(x => x.ProfessionalName == "设备" && x.PostName == "焊工");
-                passWelderStatisc.OtherMountGuard = welderList.Count(x => x.WED_Remark == "其他");
+                passWelderStatisc.OtherMountGuard = welderList.Count(x => x.ProfessionalName != "管道" && x.ProfessionalName != "土建" && x.ProfessionalName != "设备" && x.PostName == "焊工");
-                passWelderStatisc.OtherTotal = totalWelderList.Count(x => x.WED_Remark == "其他");
+                passWelderStatisc.OtherTotal = totalWelderList.Count(x => x.ProfessionalName != "管道" && x.ProfessionalName != "土建" && x.ProfessionalName != "设备" && x.PostName == "焊工");
                 StatisticsList.Add(passWelderStatisc);
                 i++;
             }
@@ -1063,6 +1098,70 @@ namespace FineUIPro.Web.CQMS.ManageReport
         }
         #endregion
 
+        #region 施工方案统计
+        public void ConstructionStatisticsr()
+        {
+            var db = Funs.DB;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            DateTime projectStartDate = Convert.ToDateTime("2015-01-01");
+            Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
+            if (project != null)
+            {
+                if (project.StartDate != null)
+                {
+                    projectStartDate = Convert.ToDateTime(project.StartDate);
+                }
+            }
+            int i = 1;
+            var q = from x in db.Solution_CQMSConstructSolution
+                    where x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)
+                    group x by new { x.UnitId, State = x.State == "3", ProjectId = x.ProjectId == project.ProjectId }
+                into g
+                    select new
+                    {
+                        UnitName = BLL.UnitService.GetUnitNameByUnitId(g.Key.UnitId),
+                        Count = g.Key.UnitId.Count(),
+                    };
+            var result = q.ToList().Select((item, index) => new
+            {
+                Index = index + 1,
+                item.UnitName,
+                item.Count
+
+            });
+            if (result.Count() > 0)   //增加总计
+            {
+                int totalCount = result.Sum(item => item.Count);
+                result = result.Concat(new[]
+                {
+                    new
+                    {
+                        Index = result.Count() + 1,
+                        UnitName = "合计",
+                        Count = totalCount
+
+                    }
+                });
+            }
+
+            this.gvConstructionStatistics.DataSource = result;
+            this.gvConstructionStatistics.DataBind();
+
+        }
+
+        protected void gvConstructionStatistics_RowCreated(object sender, GridViewRowEventArgs e)
+        {
+            if (e.Row.RowType == DataControlRowType.Header)
+            {
+                string headerStr = "序号#报审单位#完成数量";
+                DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler();
+                dHelper.SplitTableHeader(e.Row, headerStr);
+            }
+        }
+
+        #endregion
+
         #region 下周质量控制重点
         /// <summary>
         /// 增加下周质量控制重点
@@ -1146,6 +1245,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 NCRBindStatisc();//NCR统计
                 DesignChangeOrderBindStatisc();//设计变更统计
                 PassWelderBindStatisc();//合格焊工统计
+                ConstructionStatisticsr();//施工方案统计
+
             }
         }
         #endregion

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ManageReport {
+namespace FineUIPro.Web.CQMS.ManageReport
+{
 
 
-    public partial class WeekReportEdit {
+    public partial class WeekReportEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -561,6 +563,24 @@ namespace FineUIPro.Web.CQMS.ManageReport {
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView gvPassWelder;
 
+        /// <summary>
+        /// image13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image image13;
+
+        /// <summary>
+        /// gvConstructionStatistics 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvConstructionStatistics;
+
         /// <summary>
         /// Table10 控件。
         /// </summary>

SGGL/FineUIPro.Web/DocManage/DocManage.aspx

@@ -78,7 +78,7 @@
                         </f:Toolbar>
                         <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpDocType" runat="server" Label="部门" Width="350px" LabelAlign="Right" EnableEdit="true">
+                                <f:DropDownList ID="drpDocType" runat="server" Label="沟通类型" Width="350px" LabelAlign="Right" EnableEdit="true">
                                 </f:DropDownList>
                                 <%--<f:DropDownList ID="drpCNProfessional" runat="server" Label="专业" Width="350px" LabelAlign="Right" EnableEdit="true">
                                 </f:DropDownList>--%>
@@ -121,7 +121,7 @@
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="DocTypeName" Width="100px" DataField="DocTypeName"
-                            SortField="DocTypeName" FieldType="String" HeaderText="文档类别" TextAlign="Center"
+                            SortField="DocTypeName" FieldType="String" HeaderText="沟通类型" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:TemplateField ColumnID="ProjectSubjectId" Width="80px" HeaderText="装置" HeaderTextAlign="Center" TextAlign="Center"
@@ -177,7 +177,7 @@
                 </f:Grid>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="文档" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="沟通协调" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" OnClose="Window1_Close" runat="server" IsModal="true"
             Width="1300px" Height="660px">
         </f:Window>

SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx

@@ -36,7 +36,7 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:ContentPanel ID="ContentPanel2" Title="文档" ShowBorder="true"
+                        <f:ContentPanel ID="ContentPanel2" Title="沟通协调" ShowBorder="true"
                             BodyPadding="10px" ShowHeader="true" AutoScroll="true"
                             runat="server">
                             <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
@@ -66,7 +66,7 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DropDownList ID="drpDocType" ShowRedStar="true" Required="true" runat="server" Label="部门" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeDocCode">
+                                            <f:DropDownList ID="drpDocType" ShowRedStar="true" Required="true" runat="server" Label="沟通类型" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeDocCode">
                                             </f:DropDownList>
                                             <f:DropDownList ID="drpProSubject" runat="server" Label="装置" LabelAlign="Right" EnableEdit="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="ChangeDocCode">
                                             </f:DropDownList>
@@ -125,9 +125,15 @@
                                                     <f:Tab Title="正文" BodyPadding="10px"
                                                         runat="server">
                                                         <Items>
-                                                            <f:HtmlEditor runat="server" Label=" " ID="txtDocContent" ShowLabel="false"
+                                                            <f:SimpleForm ID="SimpleForm2" ShowBorder="false"
-                                                                          Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="500px" LabelAlign="Right" Text="">
+                                                                ShowHeader="false" Title="SimpleForm1" LabelWidth="120px" runat="server">
-                                                            </f:HtmlEditor>
+                                                                <Items>
+
+                                                                    <f:HtmlEditor runat="server" Label=" " ID="txtDocContent" ShowLabel="false"
+                                                                        Editor="UMEditor" BasePath="~/res/umeditor/" ToolbarSet="Full" Height="500px" LabelAlign="Right" Text="">
+                                                                    </f:HtmlEditor>
+                                                                </Items>
+                                                            </f:SimpleForm>
                                                         </Items>
                                                     </f:Tab>
                                                 </Tabs>
@@ -155,8 +161,8 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:RadioButtonList runat="server" ID="drpHandleType" Label="办理步骤" LabelWidth="120px" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged" AutoColumnWidth="true">
-                                                <f:RadioItem Text="下一步" Value="1" Selected="true" />
+                                                <f:RadioItem Text="请回复和处理" Value="1" Selected="true" />
-                                                <f:RadioItem Text="审批完成" Value="2" />
+                                                <f:RadioItem Text="请知悉了解" Value="2" />
                                             </f:RadioButtonList>
                                             <f:DatePicker ID="txtFinishTime" runat="server" Label="要求完成时间" LabelWidth="120px"  LabelAlign="Right"
                                                 EnableEdit="true">
@@ -171,11 +177,16 @@
                                             </f:DropDownList>
                                         </Items>
                                     </f:FormRow>
+                                    <f:FormRow runat="server">
+                                        <Items>
+                                            <f:TextBox runat="server" ID="txtCopyMan" Label="抄送人员"  Readonly="True" Enabled="False"/>
+                                        </Items>
+                                       
+                                    </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-
                                             <f:Tree ID="trCopyMan" EnableCollapse="true" ShowHeader="false" Title="抄送人员" EnableCheckBox="true"
-                                                AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true"
+                                                AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true" IsFluid="True"
                                                 EnableSingleClickExpand="true" OnNodeCheck="trCopyMan_NodeCheck">
                                             </f:Tree>
                                         </Items>
@@ -202,14 +213,6 @@
                                             <f:Label runat="server" CssStyle="display:none"></f:Label>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                        </Items>
-                                    </f:FormRow>
                                 </Rows>
                             </f:Form>
                         </f:ContentPanel>

SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs

@@ -179,6 +179,8 @@ namespace FineUIPro.Web.DocManage
             {
                 this.trCopyMan.UncheckAllNodes(e.Node.Nodes);
             }
+
+            txtCopyMan.Text = GetCopyManName();
         }
 
         /// <summary>
@@ -601,6 +603,36 @@ namespace FineUIPro.Web.DocManage
                 BLL.DocManageService.UpdateDoc(doc);
             }
         }
+
+        protected string  GetCopyManName()
+        {
+            TreeNode[] nodes = this.trCopyMan.GetCheckedNodes();
+            string copyMan = string.Empty;
+            string copyManName = string.Empty;
+            if (nodes.Length > 0)
+            {
+                foreach (TreeNode tn in nodes)
+                {
+                    if (tn.CommandName == "User")
+                    {
+                        Model.Doc_DocManageApprove approve = new Model.Doc_DocManageApprove();
+                        approve.DocId = DocId;
+                        approve.ApproveMan = tn.NodeID;
+                        approve.Type = "s";
+                        DocManageApproveService.AddDocManageApprove(approve);
+                        copyMan += tn.NodeID + ",";
+                    }
+                }
+            }
+            if (!string.IsNullOrEmpty(copyMan))
+            {
+                copyMan = copyMan.Substring(0, copyMan.Length - 1);
+            }
+
+            copyManName = UserService.getUserNamesUserIds(copyMan);
+            return copyManName;
+        }
+
         protected void btnSubmit_Click(object sender, EventArgs e)
         {
             if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.UserId, Const.DocManageMenuId, Const.BtnSave))

SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.designer.cs

@@ -158,6 +158,15 @@ namespace FineUIPro.Web.DocManage
         /// </remarks>
         protected global::FineUIPro.TabStrip TabStrip1;
 
+        /// <summary>
+        /// SimpleForm2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.SimpleForm SimpleForm2;
+
         /// <summary>
         /// txtDocContent 控件。
         /// </summary>
@@ -248,6 +257,15 @@ namespace FineUIPro.Web.DocManage
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHandleMan;
 
+        /// <summary>
+        /// txtCopyMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCopyMan;
+
         /// <summary>
         /// trCopyMan 控件。
         /// </summary>

SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx

@@ -116,6 +116,15 @@
                                                 </f:Button>
                                             </Items>
                                         </f:FormRow>
+                                        <f:FormRow ColumnWidths="70% 25% 5%">
+                                            <Items>
+                                                <f:TextBox ID="txtESBSerVerUrl" runat="server" Label="集团ESB地址" LabelWidth="230px"></f:TextBox>
+                                                <f:TextBox ID="txtClientId" runat="server" Label="ClientId" LabelWidth="230px"></f:TextBox>
+                                                <f:Button ID="txtTestPost" Icon="SystemSave" Text="测试对接" runat="server" ValidateForms="SimpleForm1"
+                                                          OnClick="txtTestPost_OnClick">
+                                                </f:Button>
+                                            </Items>
+                                        </f:FormRow>
                                         <f:FormRow>
                                             <Items>
                                                 <f:TextArea  runat="server" ID="txtRefererWhitelist" Label="数据穿透白名单"></f:TextArea>

SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs

@@ -373,6 +373,16 @@ namespace FineUIPro.Web.SysManage
             {
                 txtSerVerUrl.Text = sysSet9.SetValue;
             }
+            var sysSet10 = (from x in Funs.DB.Sys_Const where x.ConstText == "集团ESB地址" select x).ToList().FirstOrDefault();
+            if (sysSet10 != null)
+            {
+                txtESBSerVerUrl.Text = sysSet10.ConstValue;
+            }
+            var sysSet11 = (from x in Funs.DB.Sys_Const where x.ConstText == "ClientId" select x).ToList().FirstOrDefault();
+            if (sysSet11 != null)
+            {
+                txtClientId.Text = sysSet11.ConstValue;
+            }
             var sysSet18 = BLL.ConstValue.drpConstItemList(BLL.ConstValue.Group_SafeReferer).Select(x => new { x.ConstText, x.ConstValue }).ToList();
             var txtReferer = "";
             foreach (var item in sysSet18)
@@ -581,6 +591,48 @@ namespace FineUIPro.Web.SysManage
                 Funs.DB.Sys_Set.InsertOnSubmit(newSysSet9);
                 Funs.DB.SubmitChanges();
             }
+            Model.Sys_Const sysSet10 = db.Sys_Const.FirstOrDefault(x => x.ConstText == "集团ESB地址");
+            if (sysSet10 != null)
+            {
+                if (!string.IsNullOrEmpty(this.txtESBSerVerUrl.Text.Trim()))
+                {
+                    sysSet10.ConstValue = this.txtESBSerVerUrl.Text.Trim();
+                }
+                db.SubmitChanges();
+            }
+            else
+            {
+                Model.Sys_Const newSysSet10 = new Model.Sys_Const();
+                newSysSet10.ID = SQLHelper.GetNewID();
+                if (!string.IsNullOrEmpty(this.txtESBSerVerUrl.Text.Trim()))
+                {
+                    newSysSet10.ConstValue = this.txtESBSerVerUrl.Text.Trim();
+                }
+                newSysSet10.ConstText = "集团ESB地址";
+                Funs.DB.Sys_Const.InsertOnSubmit(newSysSet10);
+                Funs.DB.SubmitChanges();
+            }
+            Model.Sys_Const sysSet11 = db.Sys_Const.FirstOrDefault(x => x.ConstText == "ClientId");
+            if (sysSet11 != null)
+            {
+                if (!string.IsNullOrEmpty(this.txtClientId.Text.Trim()))
+                {
+                    sysSet11.ConstValue = this.txtClientId.Text.Trim();
+                }
+                db.SubmitChanges();
+            }
+            else
+            {
+                Model.Sys_Const newSysSet11 = new Model.Sys_Const();
+                newSysSet11.ID = SQLHelper.GetNewID();
+                if (!string.IsNullOrEmpty(this.txtClientId.Text.Trim()))
+                {
+                    newSysSet11.ConstValue = this.txtClientId.Text.Trim();
+                }
+                newSysSet11.ConstText = "ClientId";
+                Funs.DB.Sys_Const.InsertOnSubmit(newSysSet11);
+                Funs.DB.SubmitChanges();
+            }
             ConstValue.DeleteConstValueBygroupId(BLL.ConstValue.Group_SafeReferer);
             var q = txtRefererWhitelist.Text.Split('&');
             foreach (var item in q)
@@ -1115,5 +1167,26 @@ namespace FineUIPro.Web.SysManage
 
 
         }
+
+        protected void txtTestPost_OnClick(object sender, EventArgs e)
+        {
+            System.Net.ServicePointManager.SecurityProtocol = System.Net.SecurityProtocolType.Tls12;
+            string CncecEsbPath = SysConstSetService.CncecEsbPath;
+            string ClientId = SysConstSetService.ClientId;
+
+            string baseurl = CncecEsbPath + "/cn.cncec.group.qhsePROD.common.GetToken";
+            var client = new RestClient(baseurl);
+            client.Timeout = -1;
+            var request = new RestRequest(Method.POST);
+            var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_CWCEC);
+            request.AddHeader("ClientId", ClientId);
+            request.AddHeader("OperationCode", "cn.cncec.group.qhsePROD.common.GetToken");
+            request.AddParameter("UnitName", thisUnit.UnitName);
+            request.AddParameter("CollCropCode", thisUnit.CollCropCode);
+            IRestResponse response = client.Execute(request);
+
+            Alert.Show(response.Content);
+        }
+
     }
 }

SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs

@@ -311,6 +311,33 @@ namespace FineUIPro.Web.SysManage
         /// </remarks>
         protected global::FineUIPro.Button btnApply;
 
+        /// <summary>
+        /// txtESBSerVerUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtESBSerVerUrl;
+
+        /// <summary>
+        /// txtClientId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtClientId;
+
+        /// <summary>
+        /// txtTestPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button txtTestPost;
+
         /// <summary>
         /// txtRefererWhitelist 控件。
         /// </summary>

SGGL/FineUIPro.Web/common/mainProject2.aspx

@@ -173,7 +173,7 @@
                     </div>
                 </div>
                 <div class="y_box">
-                    <div class="y_box_label y_image_default">作业许可</div>
+                    <div class="y_box_label y_image_default">作业许可(<%=getTodayCount() %>/<%=getAllCount() %>)</div>
                     <div class="y_box_main">
                         <div class="zyp">
                             <div class="zyp_box">

SGGL/FineUIPro.Web/common/mainProject2.aspx.cs

@@ -174,7 +174,7 @@ namespace FineUIPro.Web.common
             div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString();
             div_zgywc.InnerHtml = GetGeneralClosedNum().ToString();
             div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString();
-            div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())) + "%";
+            div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())).Replace("NaN","0") + "%";
         }
 
         /// <summary>
@@ -485,6 +485,16 @@ namespace FineUIPro.Web.common
         #endregion
 
         #region 作业许可
+        protected int getTodayCount()
+        {
+            var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.CompileDate.Value.Date == DateTime.Now.Date).ToList().Count;
+            return result;
+        }
+        protected int getAllCount()
+        {
+            var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId ).ToList().Count;
+            return result;
+        }
         /// <summary>
         /// 动火作业许可证
         /// </summary>

SGGL/FineUIPro.Web/index.aspx

@@ -737,12 +737,12 @@
             // refreshWhenExist： 添加选项卡时，如果选项卡已经存在，是否刷新内部IFrame
             // refreshWhenTabChange: 切换选项卡时，是否刷新内部IFrame
             F.initTreeTabStrip(mainMenu, mainTabStrip, true, false, false);
-            var themeTitle = F.cookie('Theme_Pro_Title');
+            <%--var themeTitle = F.cookie('Theme_Pro_Title');
             var themeName = F.cookie('Theme_Pro');
             if (themeTitle) {
                 F.removeCookie('Theme_Pro_Title');
                 //notify('主题更改为：' + themeTitle + '（' + themeName + '）');
-            }
+            }--%>
 
         });
 

SGGL/Model/CQMS/NCRReportStatisc.cs

@@ -26,9 +26,21 @@ namespace Model
            get { return workName; }
            set { workName = value; }
        }
+        /// <summary>
+        /// 本期已完成 
+        /// </summary>
+        private int currentPeriodOkNum;
 
+        /// <summary>
+        /// 本期已完成
+        /// </summary>
+        public int CurrentPeriodOkNum
+        {
+           get { return currentPeriodOkNum; }
+           set { currentPeriodOkNum = value; }
+       }
 
-       private int oKNum;
+        private int oKNum;
        /// <summary>
        /// 已完成
        /// </summary>