lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APICheckSpecialService.cs
+3 -3
View File
@@ -106,7 +106,7 @@ namespace BLL
{
CheckSpecialId = newItem.CheckSpecialId,
CheckSpecialCode = newItem.CheckSpecialCode,
// CheckItemSetId = newItem.CheckItemSetId,
// CheckItemSetId = newItem.CheckItemSetId,
CheckType = newItem.CheckType,
ProjectId = newItem.ProjectId,
CheckPerson = newItem.CheckPersonId,
@@ -119,7 +119,7 @@ namespace BLL
CompileMan = newItem.CompileManId,
States = Const.State_0,
};
var getCheckSet=db.Technique_CheckItemSet.FirstOrDefault(x=>x.CheckItemSetId == newItem.CheckItemSetId);
var getCheckSet = db.Technique_CheckItemSet.FirstOrDefault(x => x.CheckItemSetId == newItem.CheckItemSetId);
if (getCheckSet != null)
{
newCheckSpecial.CheckItemSetId = newItem.CheckItemSetId;
@@ -318,7 +318,7 @@ namespace BLL
LimitedDate = Funs.GetNewDateTime(newDetail.LimitedDate),
CompletedDate = Funs.GetNewDateTime(newDetail.CompletedDate),
Suggestions = newDetail.Suggestions,
// WorkArea = newDetail.WorkArea,
// WorkArea = newDetail.WorkArea,
CheckArea = newDetail.WorkAreaId,
CheckContent = newDetail.CheckContent,
};
SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
+4 -4
View File
@@ -82,8 +82,8 @@ namespace BLL
RegisterTypes2Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes2Id) ? null : hazardRegister.RegisterTypes2Id,
RegisterTypes3Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes3Id) ? null : hazardRegister.RegisterTypes3Id,
RegisterTypes4Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes4Id) ? null : hazardRegister.RegisterTypes4Id,
WorkPackageId=WorkPackageService.getWorkPageIdsByControlItemAndCycle(hazardRegister.WorkPackageId, null),
WorkPackageName= WorkPackageService.getWorkPageNamesByControlItemAndCycle(hazardRegister.WorkPackageId, null),
WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(hazardRegister.WorkPackageId, null),
WorkPackageName = WorkPackageService.getWorkPageNamesByControlItemAndCycle(hazardRegister.WorkPackageId, null),
};
var isUpdate = db.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == newHazardRegister.HazardRegisterId);
if (isUpdate == null)
@@ -152,7 +152,7 @@ namespace BLL
{
var hazardRegisters = (from x in db.HSSE_Hazard_HazardRegister
join y in db.Base_Project on x.ProjectId equals y.ProjectId
join u in db.Base_Unit on x.ResponsibleUnit equals u.UnitId
join u in db.Base_Unit on x.ResponsibleUnit equals u.UnitId
where x.ProjectId != null && x.States != null
select new Model.HazardRegisterItem
{
@@ -173,7 +173,7 @@ namespace BLL
ResponsibilityUnitName = db.Base_Unit.First(U => x.ResponsibleUnit == U.UnitId).UnitName,
ResponsibilityManName = "",
RectificationTime = x.RectificationTime,
Risk_Level = (x.HazardValue =="3"?"重大":"一般"),
Risk_Level = (x.HazardValue == "3" ? "重大" : "一般"),
}).OrderBy(x => x.CheckTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
return hazardRegisters;
SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs
+12 -13
View File
@@ -1,5 +1,4 @@
using Model;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -195,9 +194,9 @@ namespace BLL
}
var getMaxMonthReport = (from x in Funs.DB.SeDin_MonthReport
where x.ProjectId == projectId && x.ReporMonth < monthD
where x.ProjectId == projectId && x.ReporMonth < monthD
orderby x.ReporMonth descending
select x).FirstOrDefault();
select x).FirstOrDefault();
if (getMaxMonthReport != null)
{
var getMonthReport2 = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == getMaxMonthReport.MonthReportId);
@@ -480,7 +479,7 @@ namespace BLL
///当月费用
var getCostManage = from x in db.CostGoods_CostManageItem
join y in db.CostGoods_CostManage on x.CostManageId equals y.CostManageId
where y.ProjectId ==projectId && y.CostManageDate >= startDateD && y.CostManageDate < endDateD.Value.AddDays(1)
where y.ProjectId == projectId && y.CostManageDate >= startDateD && y.CostManageDate < endDateD.Value.AddDays(1)
&& y.States == Const.State_2
select x;
if (getCostManage.Count() > 0)
@@ -521,11 +520,11 @@ namespace BLL
if (monthD >= Funs.GetNewDateTime("2023-07-01"))
{
getLists.SafetyYear += getLastMonthReport6.SafetyYear;
getLists.SafetyTotal += getLastMonthReport6.SafetyTotal;
getLists.SafetyTotal += getLastMonthReport6.SafetyTotal;
getLists.ProgressYear += getLastMonthReport6.ProgressYear;
getLists.ProgressTotal += getLastMonthReport6.ProgressTotal;
getLists.EducationYear += getLastMonthReport6.EducationYear;
getLists.EducationTotal += getLastMonthReport6.EducationTotal;
getLists.EducationTotal += getLastMonthReport6.EducationTotal;
}
else
{
@@ -540,16 +539,16 @@ namespace BLL
else
{
if (monthD >= Funs.GetNewDateTime("2023-07-01"))
{
{
getLists.SafetyTotal += getLastMonthReport6.SafetyTotal;
getLists.ProgressTotal += getLastMonthReport6.ProgressTotal;
getLists.EducationTotal += getLastMonthReport6.EducationTotal;
}
else
{
getLists.SafetyTotal += (getLastMonthReport6.SafetyTotal + getLastMonthReport6.ProgressTotal + getLastMonthReport6.EducationTotal);
{
getLists.SafetyTotal += (getLastMonthReport6.SafetyTotal + getLastMonthReport6.ProgressTotal + getLastMonthReport6.EducationTotal);
}
getLists.LaborTotal += getLastMonthReport6.LaborTotal;
getLists.SumTotal += getLastMonthReport6.SumTotal;
@@ -557,7 +556,7 @@ namespace BLL
}
}
return getLists;
return getLists;
}
}
#endregion
SGGL/BLL/API/HSSE/APITestRecordService.cs
+2 -2
View File
@@ -94,7 +94,7 @@ namespace BLL
var item = db.Training_TestRecordItem.FirstOrDefault(x => x.TestRecordId == getTestRecord.TestRecordId);
if (item == null)
{
List<Model.Training_TestTrainingItem> getTestTrainingItemList = new List<Model.Training_TestTrainingItem>();
List<Model.Training_TestTrainingItem> getTestTrainingItemList = new List<Model.Training_TestTrainingItem>();
var testPlanTrainings = (from x in db.Training_TestPlanTraining
where x.TestPlanId == getTestPlan.TestPlanId
select new { x.TestPlanId, x.TrainingId, x.TestType1Count, x.TestType2Count, x.TestType3Count }).Distinct();
@@ -522,7 +522,7 @@ namespace BLL
foreach (var item in getTrainingTasks)
{
item.States = "2";
}
getTestPlan.States = "3";
db.SubmitChanges();
SGGL/BLL/API/HSSE/APITrainingTaskService.cs
+1 -1
View File
@@ -102,7 +102,7 @@ namespace BLL
else
{
var person = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId && plan.ProjectId == e.ProjectId);
if (person != null && plan.UnitIds.Contains(person.UnitId)
if (person != null && plan.UnitIds.Contains(person.UnitId)
&& (string.IsNullOrEmpty(plan.WorkPostId) || plan.WorkPostId.Contains(person.WorkPostId)))
{
var trainType = db.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == plan.TrainTypeId);