From 2d5e6785f107d1b96c2e18d85fe2faf3656a6c55 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Wed, 26 Mar 2025 09:59:20 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SUBQHSE_V2025-03-25-geh.sql | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/DataBase/版本日志/SUBQHSE_V2025-03-25-geh.sql b/DataBase/版本日志/SUBQHSE_V2025-03-25-geh.sql
index 95c7713c..a28380e3 100644
--- a/DataBase/版本日志/SUBQHSE_V2025-03-25-geh.sql
+++ b/DataBase/版本日志/SUBQHSE_V2025-03-25-geh.sql
@@ -1,4 +1,13 @@
 
+
+ALTER TABLE Solution_LargerHazard
+ADD CONSTRAINT DF_Solution_LargerHazard_TrainPersonNum DEFAULT 0 FOR TrainPersonNum;
+go
+ALTER TABLE Comprehensive_MajorPlanApproval
+ADD CONSTRAINT DF_Comprehensive_MajorPlanApproval_TrainPersonNum DEFAULT 0 FOR TrainPersonNum;
+go
+
+
 ALTER TABLE Solution_LargerHazard ALTER COLUMN Address nvarchar(500);
 go
 

From 2852eb06564c6e287dd37e1fc663a00e8495c8d0 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 26 Mar 2025 10:51:04 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BA=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=EF=BC=8C=E7=BB=99=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A0=8F=E4=BD=8D=E6=B7=BB=E5=8A=A0=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs
index 5ebbdec8..51b87fa7 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs
@@ -535,22 +535,31 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 cell.CellStyle = cellStyle;
                 cell.SetCellValue(tb.Rows[j]["GJSXTypeName"].ToString());
                 cell = row.CreateCell(6);
-                var stateCellStyle = cellStyle;
-                //if (state == "0")
-                //{
-                //    stateCellStyle.FillForegroundColor = IndexedColors.Green.Index;
-                //    //stateCellStyle.FillBackgroundColor = IndexedColors.Green.Index;
-                //}
-                //else if (state == "2" || state == "3")
-                //{
-                //    //stateCellStyle.FillForegroundColor = IndexedColors.Blue.Index;
-                //    stateCellStyle.FillBackgroundColor = IndexedColors.Blue.Index;
-                //}
-                //else if (state == "4")
-                //{
-                //    //stateCellStyle.FillForegroundColor = IndexedColors.Red.Index;
-                //    stateCellStyle.FillBackgroundColor = IndexedColors.Red.Index;
-                //}
+
+                NPOI.SS.UserModel.ICellStyle stateCellStyle = workbook.CreateCellStyle();
+                stateCellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                stateCellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                stateCellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                stateCellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                stateCellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                stateCellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                stateCellStyle.WrapText = true;
+                stateCellStyle.SetFont(font);
+                if (state == "0")
+                {
+                    stateCellStyle.FillForegroundColor = IndexedColors.Green.Index;
+                    stateCellStyle.FillPattern = FillPattern.SolidForeground;	// 填充方式
+                }
+                else if (state == "2" || state == "3")
+                {
+                    stateCellStyle.FillForegroundColor = IndexedColors.SkyBlue.Index;
+                    stateCellStyle.FillPattern = FillPattern.SolidForeground;	// 填充方式
+                }
+                else if (state == "4")
+                {
+                    stateCellStyle.FillForegroundColor = IndexedColors.Red.Index;
+                    stateCellStyle.FillPattern = FillPattern.SolidForeground;	// 填充方式
+                }
                 cell.CellStyle = stateCellStyle;
                 cell.SetCellValue(tb.Rows[j]["StateStr"].ToString());
                 cell = row.CreateCell(7);

From 7724d823a70ea101634443be56b849d2002797de Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 26 Mar 2025 15:43:05 +0800
Subject: [PATCH 3/6] =?UTF-8?q?1=E3=80=81=E5=85=B3=E9=94=AE=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=EF=BC=9A?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BA=8B=E9=A1=B9=E8=B7=9F=E8=B8=AA=E4=B8=80?=
 =?UTF-8?q?=E8=A7=88=E8=A1=A8=202=E3=80=81=E8=B4=A8=E9=87=8F=E6=9C=88?=
 =?UTF-8?q?=E6=8A=A5=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/Common/Const.cs                        |   2 +-
 .../ManageReportNew/MonthReportEdit.aspx.cs     |   9 ++++++++-
 .../File/Excel/DataOut/关键事项.xlsx        | Bin 10232 -> 0 bytes
 .../DataOut/关键事项跟踪一览表.xlsx    | Bin 0 -> 10221 bytes
 SGGL/FineUIPro.Web/common/mainProject2.aspx.cs  |   4 +---
 5 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项.xlsx
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项跟踪一览表.xlsx

diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 9a04a61c..5bbd5c0a 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -4811,7 +4811,7 @@ namespace BLL
         /// <summary>
         /// 关键事项模板文件原始虚拟路径
         /// </summary>
-        public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项.xlsx";
+        public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项跟踪一览表.xlsx";
 
         #endregion
         #endregion
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index b21e65c2..2b098ccf 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -2867,7 +2867,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             }
             SaveMethod();
 
-            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            //ShowNotify("保存成功！", MessageBoxIcon.Success);
             //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
 
             //Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
@@ -3147,14 +3147,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             saveTxtContent();
             #endregion
 
+            bool save = false;
             if (AddOrUpdate == "add")
             {
+                save = true;
                 WeekAndMonthReportNewService.Insert(report);
             }
             else
             {
+                save = true;
                 WeekAndMonthReportNewService.Update(report);
             }
+            if (save)
+            {
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+            }
         }
 
         #region 保存本月质量目标管理情况 
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项.xlsx
deleted file mode 100644
index 2eb95b5a5fe5bd31807c8a015a3f8bcb8566e9e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10232
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
Brh@<g

diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项跟踪一览表.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/关键事项跟踪一览表.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c0a9a83a4c415476fc6cdf10cd25f0d0b3e95818
GIT binary patch
literal 10221
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

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index e853eead..fb70fd73 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -1206,10 +1206,8 @@ namespace FineUIPro.Web.common
             return await Task.Run(() =>
             {
                 string weekGridHtml = string.Empty;
-                //获取当前时间所在周信息
+                //获取当前时间上一个周计划信息
                 var lastWeek = WeekPlanService.GetLastWeekPlan(this.CurrUser.LoginProjectId);
-                ////根据当前时间获取上一个周计划信息
-                //var lastWeekItem = WeekItemService.GetWeekItemByDateNow(this.CurrUser.LoginProjectId);
                 if (lastWeek != null)
                 {
                     Model.SGGLDB db = Funs.DB;

From 10d8aa1ab3c783357b222adc7f675eb1f244b9b3 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Wed, 26 Mar 2025 18:41:39 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=E5=85=AC=E5=8F=B8=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SUBQHSE_V2025-03-26-geh.sql  |  5 +++
 .../HSSE_Hazard_HazardRegisterService.cs      |  2 +-
 SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs  |  8 ++--
 SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs   |  2 +-
 SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs   |  2 +-
 SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs   |  2 +-
 .../DataShow/QualityPerson.aspx.cs            |  2 +-
 .../FineUIPro.Web/DataShow/SafePerson.aspx.cs |  2 +-
 SGGL/FineUIPro.Web/common/main_new.aspx.cs    | 37 +++++++++++++++----
 9 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql

diff --git a/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql b/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql
new file mode 100644
index 00000000..ed3c8b78
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql
@@ -0,0 +1,5 @@
+UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [Risk_Level] = 'һ��' WHERE Risk_Level is null or Risk_Level = '';
+go
+
+UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [ProblemTypes] = '0' WHERE ProblemTypes is null or Risk_Level = '';
+go
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
index 9bc32644..bd63ce76 100644
--- a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
+++ b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
@@ -113,7 +113,7 @@ namespace BLL
                     newHazardRegister.ProblemTypes = hazardRegister.ProblemTypes;
                     newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
                     newHazardRegister.Type = hazardRegister.Type;
-
+                    newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
                     newHazardRegister.HiddenType = hazardRegister.HiddenType;
                     //把附件表的路径复制过来
                     Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
index f40ecda1..d7f72a25 100644
--- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
@@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow
                                 from EduTrain_TrainRecord AS TrainRecord 
                                 LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
                                 LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
-
+                                where  Project.ProjectState ='1'
                                 UNION ALL
 
                                 select 
@@ -91,7 +91,7 @@ namespace FineUIPro.Web.DataShow
                                 TrainDepart as UnitName
                                 From Bo_Sheng_Train F
                                 LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId 
-                                )f WHERE 1=1 ";
+                                )f WHERE 1=1 and Project.ProjectState ='1' ";
 
             #region 总数
             var strSqlSum = @"select Count(*)as allCount from(
@@ -112,7 +112,7 @@ namespace FineUIPro.Web.DataShow
                                 from EduTrain_TrainRecord AS TrainRecord 
                                 LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
                                 LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
-
+                                where Project.ProjectState ='1'
                                 UNION ALL
 
                                 select 
@@ -129,7 +129,7 @@ namespace FineUIPro.Web.DataShow
                                 TrainDepart as UnitName
                                 From Bo_Sheng_Train F
                                 LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId 
-                                )f WHERE 1=1";
+                                )f WHERE 1=1 and Project.ProjectState ='1'" ;
             
             #endregion
             if (this.drpProject.SelectedValue != Const._Null)
diff --git a/SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs
index 292f2d1b..aefd1a78 100644
--- a/SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Person1.aspx.cs
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
                         WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
-where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) ";
+where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23))  and Project.ProjectState ='1'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {
diff --git a/SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs
index bde213cd..e014510a 100644
--- a/SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Person2.aspx.cs
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
                         WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
-where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and (WorkPost.PostType is null or WorkPost.PostType!='1') ";
+where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and (WorkPost.PostType is null or WorkPost.PostType!='1') and Project.ProjectState ='1'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {
diff --git a/SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs
index bda66e82..fc16a286 100644
--- a/SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Person3.aspx.cs
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
                         WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
-where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and WorkPost.PostType='1' ";
+where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and WorkPost.PostType='1' and Project.ProjectState ='1'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
index 878dadc8..7026ead6 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow
                  FROM SitePerson_Person AS Person 
                 LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId 
                 LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId 
-                LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 ";
+                LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 and Project.ProjectState ='1'";
                 if (this.drpProject.SelectedValue  != Const._Null)
                 {
                     strSql += " AND Person.ProjectId = @ProjectId";
diff --git a/SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs
index 9b40d41a..0f966f1c 100644
--- a/SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/SafePerson.aspx.cs
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
-                        WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
+                        WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) and Project.ProjectState ='1' ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
index 2144b5d2..990bea8a 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
@@ -173,7 +173,29 @@ namespace FineUIPro.Web.common
                     .SelectMany(x => x.persons.DefaultIfEmpty(),
                     (x, person) => new { x.post, person })
                 .Where(x => pids.Contains(x.person.ProjectId));
-                divCqmsManageNum.InnerText = qualityQuery.Count().ToString();
+                
+                //企业总部人员和分支机构人员
+                var query = (from person in db.Person_CompanyBranchPerson
+                    join unit in db.Base_Unit on person.UnitId equals unit.UnitId into unitJoin
+                    from unit in unitJoin.DefaultIfEmpty() // 左连接
+                    join workPost in db.Base_WorkPost on person.WorkPostId equals workPost.WorkPostId into workPostJoin
+                    from workPost in workPostJoin.DefaultIfEmpty() // 左连接
+                    where person.IsOnJob == true && workPost.IsCQMS == true
+                    select new
+                    {
+                        ID = person.CompanyBranchPersonId,
+                        UnitName = unit.UnitName,
+                        PersonName = person.PersonName,
+                        SexStr = person.Sex == "1" ? "男" : "女",
+                        IdentityCard = person.IdentityCard,
+                        WorkPostName = workPost.WorkPostName,
+                        Telephone = person.Telephone,
+                        IsOnJob = person.IsOnJob,
+                        Remark = person.Remark,
+                        ProjectName = ""
+                    }).ToList();
+
+                divCqmsManageNum.InnerText = (qualityQuery.Count() + query.Count()).ToString();
                 // 质量培训人员
             divCqmsPxNum.InnerText = db.Comprehensive_InspectionPerson
                 .Where(x => pids.Contains(x.ProjectId))
@@ -674,16 +696,15 @@ namespace FineUIPro.Web.common
                 if (pids == null)
                 {
                     zlallNumber = (from x in Funs.DB.Check_CheckControl
-                                   where x.CheckDate <= DateTime.Now
                                    select x).Count().ToString();
 
                     var num2 = (from x in Funs.DB.Check_CheckControl
-                                where x.CheckDate <= DateTime.Now && x.State == "7"
+                                where  x.State == "7"
                                 select x).Count();
 
                     zlfinishNumber = num2.ToString();
                     var num3 = (from x in Funs.DB.Check_CheckControl
-                                where x.CheckDate <= DateTime.Now && x.State != "7"
+                                where x.State != "7"
                                 select x).Count();
 
                     var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
@@ -695,16 +716,16 @@ namespace FineUIPro.Web.common
                 else
                 {
                     zlallNumber = (from x in Funs.DB.Check_CheckControl
-                                   where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                                   where  pids.Contains(x.ProjectId)
                                    select x).Count().ToString();
 
                     var num2 = (from x in Funs.DB.Check_CheckControl
-                                where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId)
+                                where  x.State == "7" && pids.Contains(x.ProjectId)
                                 select x).Count();
 
                     zlfinishNumber = num2.ToString();
                     var num3 = (from x in Funs.DB.Check_CheckControl
-                                where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId)
+                                where x.State != "7" && pids.Contains(x.ProjectId)
                                 select x).Count();
 
                     var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
@@ -778,7 +799,7 @@ namespace FineUIPro.Web.common
                 List<double> listdata = new List<double>();
                 double result = 0;
                 Model.SGGLDB db = Funs.DB;
-                var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
+                var ndtLists = from x in db.ProcessControl_NondestructiveTest_New  select x;
                 if (pids != null)
                 {
                     ndtLists = ndtLists.Where(x=>pids.Contains(x.ProjectId));

From 0d01ba5cbc5a4fa5c89aa4505af0cfe6c4dd0e86 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 27 Mar 2025 09:46:50 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=B7=A5=E7=A8=8B=E9=87=8F=E5=AE=8C=E6=88=90=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/Common/Funs.cs                       | 53 +++++++++++
 .../App_GlobalResources/Lan.en-US.resx        |  4 +
 .../App_GlobalResources/Lan.resx              |  3 +
 .../App_GlobalResources/Lan.zh-CN.resx        |  3 +
 .../App_GlobalResources/Lan1.designer.cs      | 17 +++-
 SGGL/FineUIPro.Web/common/mainProject2.aspx   | 15 +++
 .../FineUIPro.Web/common/mainProject2.aspx.cs | 89 +++++++++++++++++-
 SGGL/Model/Model.cs                           | 91 ++++++++++++++++++-
 SGGL/Model/SingleSerie.cs                     |  9 ++
 9 files changed, 278 insertions(+), 6 deletions(-)

diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs
index 8721a6eb..1cfd69fd 100644
--- a/SGGL/BLL/Common/Funs.cs
+++ b/SGGL/BLL/Common/Funs.cs
@@ -1250,6 +1250,59 @@ namespace BLL
             //return TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)).AddSeconds(timestamp);
         }
 
+        #region ȥ������������
+
+        /// <summary>
+        /// ȥ������������
+        /// </summary>
+        /// <param name="sResult"></param>
+        /// <returns></returns>
+        public static string RemoveZero(string sResult)
+        {
+            if (sResult.IndexOf(".") < 0)
+                return sResult;
+            int iIndex = sResult.Length - 1;
+            for (int i = sResult.Length - 1; i >= 0; i--)
+            {
+                if (sResult.Substring(i, 1) != "0")
+                {
+                    iIndex = i;
+                    break;
+                }
+            }
+            sResult = sResult.Substring(0, iIndex + 1);
+            if (sResult.EndsWith("."))
+                sResult = sResult.Substring(0, sResult.Length - 1);
+            return sResult;
+        }
+
+        /// <summary>
+        /// ȥ������������
+        /// </summary>
+        /// <param name="dValue"></param>
+        /// <returns></returns>
+        public static string RemoveZero(decimal dValue)
+        {
+            string sResult = dValue.ToString();
+            if (sResult.IndexOf(".") < 0)
+                return sResult;
+            int iIndex = sResult.Length - 1;
+            for (int i = sResult.Length - 1; i >= 0; i--)
+            {
+                if (sResult.Substring(i, 1) != "0")
+                {
+                    iIndex = i;
+                    break;
+                }
+            }
+            sResult = sResult.Substring(0, iIndex + 1);
+            if (sResult.EndsWith("."))
+                sResult = sResult.Substring(0, sResult.Length - 1);
+            return sResult;
+        }
+
+        #endregion
+
         public static string RequestGet(string Baseurl, string Token)
         {
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
index 3e0b1e97..6a7d2faa 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
@@ -1352,4 +1352,8 @@
     <value>Completion status of weekly plan</value>
     <comment>周计划完成情况</comment>
   </data>
+  <data name="mainProject2_QuantityDone" xml:space="preserve">
+    <value>Completion status of engineering quantity</value>
+    <comment>工程量完成情况</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
index c8074f33..6d3f1356 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
@@ -1197,4 +1197,7 @@
   <data name="mainProject2_WeekPlanDone" xml:space="preserve">
     <value>周计划完成情况</value>
   </data>
+  <data name="mainProject2_QuantityDone" xml:space="preserve">
+    <value>工程量完成情况</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
index 0d494478..12f7a492 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
@@ -1194,4 +1194,7 @@
   <data name="mainProject2_WeekPlanDone" xml:space="preserve">
     <value>周计划完成情况</value>
   </data>
+  <data name="mainProject2_QuantityDone" xml:space="preserve">
+    <value>工程量完成情况</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
index 585e3016..e202957b 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
@@ -1185,6 +1185,15 @@ namespace Resources {
             }
         }
         
+        /// <summary>
+        ///   查找类似 工程量完成情况 的本地化字符串。
+        /// </summary>
+        internal static string mainProject2_QuantityDone {
+            get {
+                return ResourceManager.GetString("mainProject2_QuantityDone", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 质量安全预警 的本地化字符串。
         /// </summary>
@@ -3067,7 +3076,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  查找类似 欢迎回来 的本地化字符串。
+        ///   查找类似 欢迎回来 的本地化字符串。
         /// </summary>
         internal static string String1 {
             get {
@@ -3076,7 +3085,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  查找类似 分包管理 的本地化字符串。
+        ///   查找类似 分包管理 的本地化字符串。
         /// </summary>
         internal static string SubManagement {
             get {
@@ -3256,7 +3265,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  查找类似 欢迎回来 的本地化字符串。
+        ///   查找类似 欢迎回来 的本地化字符串。
         /// </summary>
         internal static string Welcome {
             get {
@@ -3265,7 +3274,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  查找类似 焊接管理 的本地化字符串。
+        ///   查找类似 焊接管理 的本地化字符串。
         /// </summary>
         internal static string WeldingManage {
             get {
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx
index 08d48f27..37f61472 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@@ -393,6 +393,9 @@
                             <div class="jdtj-btn jdtj-btn-act" id="span_jdtj" onclick="jdtjOnclick(0)" style="cursor: pointer">
                                 <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_ProgressStatistics %>" />
                             </div>
+                            <div class="jdtj-btn" onclick="jdtjOnclick(3)" id="span_quantityDoneJdtj" style="cursor: pointer">
+                                <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_QuantityDone %>" />
+                            </div>
                             <div class="jdtj-btn" onclick="jdtjOnclick(1)" id="span_weekJdtj" style="cursor: pointer">
                                 <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_WeekPlanDone %>" />
                             </div>
@@ -698,6 +701,7 @@
     function jdtjOnclick(objval) {
         if (objval == 1) {
             $("#span_jdtj").removeClass("jdtj-btn-act");
+            $("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
             $("#span_weekJdtj").addClass("jdtj-btn-act");
             $("#span_monthJdtj").removeClass("jdtj-btn-act");
             $("#jdtj-content").show();
@@ -706,14 +710,25 @@
             $("#div_jdtjList").html('<%=WeekJdtjHtml%>');
         } else if (objval == 2) {
             $("#span_jdtj").removeClass("jdtj-btn-act");
+            $("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
             $("#span_weekJdtj").removeClass("jdtj-btn-act");
             $("#span_monthJdtj").addClass("jdtj-btn-act");
             $("#jdtj-content").show();
             $("#left_one").hide();
             $("#div_jdtjHead").html('<%=MonthJdtjHead%>');
             $("#div_jdtjList").html('<%=MonthJdtjHtml%>');
+        }  else if (objval == 3) {
+            $("#span_jdtj").removeClass("jdtj-btn-act");
+            $("#span_quantityDoneJdtj").addClass("jdtj-btn-act");
+            $("#span_weekJdtj").removeClass("jdtj-btn-act");
+            $("#span_monthJdtj").removeClass("jdtj-btn-act");
+            $("#jdtj-content").show();
+            $("#left_one").hide();
+            $("#div_jdtjHead").html('<%=QuantityDoneJdtjHead%>');
+            $("#div_jdtjList").html('<%=QuantityDoneJdtjHtml%>');
         } else {
             $("#span_jdtj").addClass("jdtj-btn-act");
+            $("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
             $("#span_weekJdtj").removeClass("jdtj-btn-act");
             $("#span_monthJdtj").removeClass("jdtj-btn-act");
             $("#jdtj-content").hide();
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index fb70fd73..f42cbee1 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -109,6 +109,7 @@ namespace FineUIPro.Web.common
                 var personTask = GetPersonAsync();
                 var weekJdtjTask = GetWeekJDAsync();
                 var monthJdtjTask = GetMonthJDAsync();
+                var quantityDoneJDTask = GetQuantityDoneJDAsync();
                 var otherTasks = new List<Task>
                 {
                     BindSafetyStatisticsAsync(),     // 安全统计模块
@@ -148,13 +149,14 @@ namespace FineUIPro.Web.common
 
                     getCNEN(),//中英文翻译
                 };
-                await Task.WhenAll(otherTasks.Concat(new[] { treeTask, personTask }));
+                await Task.WhenAll(otherTasks.Concat(new[] { treeTask, personTask, weekJdtjTask, monthJdtjTask, quantityDoneJDTask }));
 
                 Tree = await treeTask;
                 Person = await personTask;
 
                 WeekJdtjHtml = await weekJdtjTask;
                 MonthJdtjHtml = await monthJdtjTask;
+                QuantityDoneJdtjHtml = await quantityDoneJDTask;
             }
         }
 
@@ -1187,6 +1189,91 @@ namespace FineUIPro.Web.common
 
         #endregion 赢得值曲线
 
+
+        #region 工程量完成情况
+
+        protected string QuantityDoneJdtjHtml;
+        protected string QuantityDoneJdtjHead = "<div class=\"th-p\" >类型</div><div class=\"th-p\" >设计数量</div><div class=\"th-p\"><p>本期</p><p><span>计划</span><span>实际</span><span>完成率</span></p></div><div class=\"th-p\"><p>累计</p><p><span>计划</span><span>实际</span><span>完成率</span></p></div><div class=\"th-p\" >完成率</div>";
+        //protected string QuantityDoneJdtjHead = "<div class=\"th-p\" >类型</div><div class=\"th-p\" >单位</div><div class=\"th-p\" >设计数量</div><div class=\"th-p\"><p>本期</p><p><span>计划完成</span><span>实际完成</span><span>完成率</span></p></div><div class=\"th-p\"><p>累计</p><p><span>计划完成</span><span>实际完成</span><span>完成率</span></p></div><div class=\"th-p\" >完成率</div>";
+
+        /// <summary>
+        /// 工程量完成情况
+        /// </summary>
+        /// <returns></returns>
+        protected async Task<string> GetQuantityDoneJDAsync()
+        {
+            return await Task.Run(() =>
+            {
+                string doneJdtjHtml = string.Empty;
+                string month = string.Format("{0:yyyy-MM-01}", DateTime.Now);
+                //DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
+                if (DateTime.Now.Day < 26)
+                {
+                    month = string.Format("{0:yyyy-MM-01}", DateTime.Now.AddMonths(-1));
+                    //months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
+                }
+                string strSql = @"select qc.QuantityCompletionId,(select PlanNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as PlanNum,
+       (select RealNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as RealNum,
+	   (select NextNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as NextNum,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex,
+                            CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalPlanNum,
+                            CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalRealNum,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(qc.PlanNum, 0) WHEN 0 THEN 0
+
+        ELSE 100 * ISNULL(qc.RealNum, 0) / (1.0 * qc.PlanNum) END AS DECIMAL(9, 2))))) + '%'
+
+        AS Rate,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE(select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) WHEN 0 THEN 0
+
+        ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) END AS DECIMAL(9, 2)))))+'%'
+
+        AS TotalRate,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(ql.DesignNum, 0) WHEN 0 THEN 0
+        ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * ql.DesignNum) END AS DECIMAL(9, 2)))))+'%'
+
+        AS SumRate,
+                            CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalPlanNum, 
+                            CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalRealNum
+                            from[dbo].JDGL_QuantityList ql
+                           left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId
+where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId and q.Months<=@month order by q.Months desc) and qc.ProjectId=@ProjectId order by ql.SortIndex, ql.Name";
+
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@month", month));
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+                StringBuilder sb = new StringBuilder();
+                for (int j = 0; j < tb.Rows.Count; j++)
+                {
+                    string name = tb.Rows[j]["Name"].ToString().Trim();
+                    string unit = tb.Rows[j]["Unit"].ToString().Trim();
+                    string designNum = Funs.RemoveZero(tb.Rows[j]["DesignNum"].ToString().Trim());
+                    string planNum = Funs.RemoveZero(tb.Rows[j]["PlanNum"].ToString().Trim());
+                    string realNum = Funs.RemoveZero(tb.Rows[j]["RealNum"].ToString().Trim());
+                    string rate = tb.Rows[j]["Rate"].ToString().Trim();
+                    string nextNum = Funs.RemoveZero(tb.Rows[j]["NextNum"].ToString().Trim());
+                    string totalPlanNum = Funs.RemoveZero(tb.Rows[j]["TotalPlanNum"].ToString().Trim());
+                    string totalRealNum = Funs.RemoveZero(tb.Rows[j]["TotalRealNum"].ToString().Trim());
+                    string totalRate = tb.Rows[j]["TotalRate"].ToString().Trim();
+                    string sumRate = tb.Rows[j]["SumRate"].ToString().Trim();
+                    sb.Append("<div class=\"row\">");
+                    sb.Append($"<div class=\"tr\" >{name}（{unit}）</div>");
+                    //sb.Append($"<div class=\"tr\" >{unit}</div>");
+                    sb.Append($"<div class=\"tr\" >{designNum}</div>");
+                    sb.Append($"<div class=\"tr\" ><p><span>{planNum}</span><span>{realNum}</span><span>{rate}</span></p></div>");
+                    sb.Append($"<div class=\"tr\" ><p><span>{totalPlanNum}</span><span>{totalRealNum}</span><span>{totalRate}</span></p></div>");
+                    sb.Append($"<div class=\"tr\" >{sumRate}</div>");
+                    sb.Append("</div>");
+                }
+                doneJdtjHtml = sb.ToString();
+                return doneJdtjHtml;
+            });
+        }
+
+
+        #endregion
+
         #region 进度统计
 
         protected string WeekJdtjHtml;
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 555283ec..e6e76a75 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -10367,6 +10367,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_JDGL_QuantityCompletionDone> View_JDGL_QuantityCompletionDone
+		{
+			get
+			{
+				return this.GetTable<View_JDGL_QuantityCompletionDone>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_JDGL_SteelStructureCompletion> View_JDGL_SteelStructureCompletion
 		{
 			get
@@ -350495,7 +350503,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(500)")]
 		public string Address
 		{
 			get
@@ -437486,6 +437494,87 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_JDGL_QuantityCompletionDone")]
+	public partial class View_JDGL_QuantityCompletionDone
+	{
+		
+		private string _QuantityListId;
+		
+		private string _ProjectId;
+		
+		private System.Nullable<System.DateTime> _Months;
+		
+		private System.Nullable<decimal> _Rate;
+		
+		public View_JDGL_QuantityCompletionDone()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuantityListId", DbType="NVarChar(50)")]
+		public string QuantityListId
+		{
+			get
+			{
+				return this._QuantityListId;
+			}
+			set
+			{
+				if ((this._QuantityListId != value))
+				{
+					this._QuantityListId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this._ProjectId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Months", DbType="DateTime")]
+		public System.Nullable<System.DateTime> Months
+		{
+			get
+			{
+				return this._Months;
+			}
+			set
+			{
+				if ((this._Months != value))
+				{
+					this._Months = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rate", DbType="Decimal(25,12)")]
+		public System.Nullable<decimal> Rate
+		{
+			get
+			{
+				return this._Rate;
+			}
+			set
+			{
+				if ((this._Rate != value))
+				{
+					this._Rate = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_JDGL_SteelStructureCompletion")]
 	public partial class View_JDGL_SteelStructureCompletion
 	{
diff --git a/SGGL/Model/SingleSerie.cs b/SGGL/Model/SingleSerie.cs
index 3746047c..829b1d8b 100644
--- a/SGGL/Model/SingleSerie.cs
+++ b/SGGL/Model/SingleSerie.cs
@@ -25,4 +25,13 @@ namespace Model
         public List<PieData> pieData { get; set; }
         public List<string> loc { get; set; }
     }
+
+    public class Serie
+    {
+        public string name { get; set; }
+        public string type { get; set; }
+        public string stack { get; set; }
+        //public List<double> data { get; set; }
+        public List<string> data { get; set; }
+    }
 }

From cd8148326c86b8dccab928215594f4ed8b92e00d Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 27 Mar 2025 09:54:58 +0800
Subject: [PATCH 6/6] 1

---
 DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql b/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql
index ed3c8b78..2f2c435a 100644
--- a/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql
+++ b/DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql
@@ -1,4 +1,4 @@
-UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [Risk_Level] = 'һ��' WHERE Risk_Level is null or Risk_Level = '';
+UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [Risk_Level] = '一般' WHERE Risk_Level is null or Risk_Level = '';
 go
 
 UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [ProblemTypes] = '0' WHERE ProblemTypes is null or Risk_Level = '';