diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-07-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-07-phf.sql
new file mode 100644
index 00000000..3a427d9a
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-05-07-phf.sql
@@ -0,0 +1,34 @@
+--廷ѯЧ
+CREATE NONCLUSTERED INDEX [QualityAudit_PersonQuality_LimitDate_Index]
+ON [dbo].[QualityAudit_PersonQuality] ([LimitDate])
+INCLUDE ([PersonId])
+GO
+
+CREATE NONCLUSTERED INDEX [Bo_Sheng_TrainPerson_ProjectId_DeleteTag_Index]
+ON [dbo].[Bo_Sheng_TrainPerson] ([ProjectId],[DeleteTag])
+INCLUDE ([ID],[DeleteUser],[DeleteDate],[EmpName],[IdentifyId],[Photo],[Station],[Category],[CategoryName],[RecordId],[SignName],[DepartId],[DepartName],[SignInDate],[SignInType],[TrainPeriod],[State],[TotalScore],[PassScore],[Score],[IsPass],[GroupNo],[ExamNo],[ExamCount],[DeviceNo],[OwnerDepartId],[UploadTime],[Answers],[CreateDate],[CreateUser],[OperDate],[OperUser])
+GO
+
+CREATE NONCLUSTERED INDEX [License_LicenseManager_ProjectId_Index]
+ON [dbo].[License_LicenseManager] ([ProjectId])
+INCLUDE ([LicenseManagerId],[LicenseTypeId],[LicenseManagerCode],[LicenseManageName],[UnitId],[LicenseManageContents],[CompileMan],[CompileDate],[States],[WorkAreaId],[StartDate],[EndDate],[ApplicantMan],[WorkStates],[IsHighRisk])
+GO
+
+CREATE NONCLUSTERED INDEX [GJSX_ProjectId_Index]
+ON [dbo].[GJSX] ([ProjectId])
+GO
+
+CREATE NONCLUSTERED INDEX [WBS_BreakdownProject_ProjectId_IsSelected_Class_Index]
+ON [dbo].[WBS_BreakdownProject] ([ProjectId],[IsSelected],[Class])
+
+GO
+
+CREATE NONCLUSTERED INDEX [ProcessControl_InspectionManagement_ProjectId_IsOnceQualified_Index]
+ON [dbo].[ProcessControl_InspectionManagement] ([ProjectId],[IsOnceQualified])
+INCLUDE ([InspectionId])
+Go
+
+CREATE NONCLUSTERED INDEX [Hazard_HazardSelectedItem_ProjectId_Index]
+ON [dbo].[Hazard_HazardSelectedItem] ([ProjectId])
+INCLUDE ([HazardLevel])
+GO
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
index 428b6f9f..e44e6139 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
@@ -402,7 +402,7 @@
-
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index 3ec68e33..8459a6b6 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -103,7 +103,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
CNProfessionals = (from x in db.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
- && x.CNProfessionalId != BLL.Const.ComprehensiveId
+ //&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new ProfessionalsClass
{
@@ -1542,19 +1542,28 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// orderby y.UnitCode
// select new { x.UnitId, y.UnitName };
units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+ var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
+ join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+ from u in unitJoin.DefaultIfEmpty()
+ select new
+ {
+ c.CheckDate,
+ c.ProjectId,
+ u.UnitId,
+ u.UnitName,
+ c.IsOnceQualified
+ };
foreach (var item in units)
{
- var query = from c in db.View_CQMS_InspectionManagementDetail
- join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
- from u in unitJoin.DefaultIfEmpty()
- where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
+ var query = from x in cqmsDetail
+ where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
select new
{
- c.CheckDate,
- c.ProjectId,
- u.UnitId,
- u.UnitName,
- c.IsOnceQualified
+ x.CheckDate,
+ x.ProjectId,
+ x.UnitId,
+ x.UnitName,
+ x.IsOnceQualified
};
var AllList = query.ToList();
var monethCount = query
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
index 898e1075..2aa7e32d 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
@@ -401,7 +401,7 @@
-
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index bcc1e45d..0bbb6454 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
CNProfessionals = (from x in db.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
- && x.CNProfessionalId != BLL.Const.ComprehensiveId
+ //&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new ProfessionalsClass
{
@@ -1546,19 +1546,28 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// orderby y.UnitCode
// select new { x.UnitId, y.UnitName };
units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
+ var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
+ join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+ from u in unitJoin.DefaultIfEmpty()
+ select new
+ {
+ c.CheckDate,
+ c.ProjectId,
+ u.UnitId,
+ u.UnitName,
+ c.IsOnceQualified
+ };
foreach (var item in units)
{
- var query = from c in db.View_CQMS_InspectionManagementDetail
- join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
- from u in unitJoin.DefaultIfEmpty()
- where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
+ var query = from x in cqmsDetail
+ where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
select new
{
- c.CheckDate,
- c.ProjectId,
- u.UnitId,
- u.UnitName,
- c.IsOnceQualified
+ x.CheckDate,
+ x.ProjectId,
+ x.UnitId,
+ x.UnitName,
+ x.IsOnceQualified
};
var AllList = query.ToList();
var monethCount = query
diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc
index e8240f66..97ea9d3e 100644
--- a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc
+++ b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc
@@ -1,96 +1,122 @@
PK
- N@ docProps/PK N@vDs docProps/app.xmlRN0#Qi)'YζHl6=vf\}]+i14eTeiЍez@^3X;c>/6{I-O3!B'fSo|QB|F#n0=:^6Fs}10{ۉa9Mo>0أgs 5Ѣ\ 9[q{46pt/K *:w¶EժGd' ):qG `lmn(Vvch9# VvJmכ`/Ϙ9]%_