修改质量月报汇总

DataBase/版本日志/SGGLDB_V2023-09-12.sql

@@ -261,6 +261,45 @@ ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is
 
 
 
+GO
+
+
+
+ALTER PROCEDURE [dbo].[Sp_DigData_CQMSDataCollect]
+(
+   @year int
+)
+AS
+/*°²È«Êý¾Ý»ã×Ü*/
+SELECT CQMSDataCollectItemId
+,CQMSDataCollectId
+,SortIndex
+,CQMSContent
+,MeasureUnit
+,Month1
+,Month2
+,Month3
+,Month4
+,Month5
+,Month6
+,Month7
+,Month8
+,Month9
+,Month10
+,Month11
+,Month12
+,(CASE WHEN  SortIndex=8 or SortIndex=11 or SortIndex=14 or SortIndex=17 or SortIndex=21 or SortIndex=25  
+	THEN ''
+	ELSE  CAST((ISNULL(CAST(Month1 AS int),0)+ISNULL(CAST(Month2 AS int),0)+ISNULL(CAST(Month3 AS int),0)+ISNULL(CAST(Month4 AS int),0)+ISNULL(CAST(Month5 AS int),0)
+	+ISNULL(CAST(Month6 AS int),0)+ISNULL(CAST(Month7 AS int),0)+ISNULL(CAST(Month8 AS int),0)+ISNULL(CAST(Month9 AS int),0)+ISNULL(CAST(Month10 AS int),0)
+	+ISNULL(CAST(Month11 AS int),0)+ISNULL(CAST(Month12 AS int),0)) AS NVARCHAR(50))
+	END) AS MonthSum
+FROM dbo.DigData_CQMSDataCollectItem
+WHERE YEAR=@year
+order by SortIndex
+
+
+
 GO
 
 

SGGL/BLL/ProjectData/ProjectService.cs

@@ -115,6 +115,7 @@
             db.Base_Project.InsertOnSubmit(newProject);
             db.SubmitChanges();
             HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
+            CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject);
         }
 
         /// <summary>
@@ -156,6 +157,7 @@
                 newProject.EnglishRemark = project.EnglishRemark;
                 db.SubmitChanges();
                 HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
+                CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject);
             }
         }
 

SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx.cs

@@ -162,7 +162,7 @@ namespace FineUIPro.Web.JDGL.Check
             }
             else if (e.Node.CommandName == "WorkPackage")   //展开工作包节点
             {
-                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
+                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x;
                 if (workPackages.Count() > 0)   //存在子单位工程
                 {
                     foreach (var workPackage in workPackages)