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

20230831 WBS

Browse Source
This commit is contained in:
杨红卫
2023-08-31 16:37:09 +08:00
parent d9f8be1463
commit ba6774dbae
44 changed files with 1349 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs
+4
View File
@@ -41,6 +41,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId;
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@@ -58,6 +59,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId;
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@@ -80,6 +82,7 @@ namespace BLL
{
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK;
newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate;
@@ -334,6 +337,7 @@ namespace BLL
newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode;
if (!string.IsNullOrEmpty(SpotCheckDetail.ControlItemAndCycleId))
newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId;
newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId);
if (SpotCheckDetail.IsOnesOK.HasValue)
newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK;
if (SpotCheckDetail.IsOK.HasValue)
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
+57
View File
@@ -626,5 +626,62 @@ namespace BLL
}
}
}
#region 根据工作包ID获取wbs节点及父节点字符串
/// <summary>
/// 根据工作包ID获取wbs节点及父节点字符串
/// </summary>
/// <param name="controlItemAndCycleId"></param>
/// <returns></returns>
public static string getWorkPageIdsByControlItemAndCycle(string controlItemAndCycleId)
{
string returnValues = string.Empty;
var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId);
if (getControlItemAndCycle != null)
{
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getControlItemAndCycle.WorkPackageId);
if (getWorkPackage != null)
{
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.WorkPackageId + "[" + getWorkPackage.InitWorkPackageCode + "]$" + controlItemAndCycleId);
}
}
return returnValues;
}
/// <summary>
/// id
/// </summary>
/// <param name="node"></param>
/// <param name="id"></param>
/// <returns></returns>
public static string getSelectIds(string workPageId, string returnValues)
{
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPageId);
if (getWorkPackage != null)
{
if (!string.IsNullOrEmpty(getWorkPackage.SuperWorkPackageId))
{
var getSupWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getWorkPackage.SuperWorkPackageId);
if (getSupWorkPackage != null)
{
returnValues = getWorkPackage.SuperWorkPackageId + "[" + getWorkPackage.InitWorkPackageCode + "]" + "|" + returnValues;
returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues);
}
}
else
{
var getUnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == getWorkPackage.UnitWorkId);
if (getUnitWork != null)
{
returnValues = ("Type" + getUnitWork.ProjectType ?? "1") + "|" + getUnitWork.UnitWorkId + "|" + returnValues;
}
}
}
return returnValues;
}
#endregion
}
}
SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs
+2
View File
@@ -191,6 +191,7 @@ namespace BLL
LargerHazardListId = LargerHazardListItem.LargerHazardListId,
UnitWorkId = LargerHazardListItem.UnitWorkId,
WorkPackageId = LargerHazardListItem.WorkPackageId,
WorkPackageName = LargerHazardListItem.WorkPackageName,
WorkPackageSize = LargerHazardListItem.WorkPackageSize,
ExpectedStartTime = LargerHazardListItem.ExpectedStartTime,
ExpectedEndTime = LargerHazardListItem.ExpectedEndTime,
@@ -215,6 +216,7 @@ namespace BLL
newLargerHazardListItem.SortIndex = LargerHazardListItem.SortIndex;
newLargerHazardListItem.UnitWorkId = LargerHazardListItem.UnitWorkId;
newLargerHazardListItem.WorkPackageId = LargerHazardListItem.WorkPackageId;
newLargerHazardListItem.WorkPackageName = LargerHazardListItem.WorkPackageName;
newLargerHazardListItem.WorkPackageSize = LargerHazardListItem.WorkPackageSize;
newLargerHazardListItem.ExpectedStartTime = LargerHazardListItem.ExpectedStartTime;
newLargerHazardListItem.ExpectedEndTime = LargerHazardListItem.ExpectedEndTime;
SGGL/BLL/ProjectData/ProjectService.cs
+1 -1
View File
@@ -338,7 +338,7 @@
}
var pcount = (from x in db.Sys_Log
where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-2)
where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-1)
group x by x.ProjectId into g
select new { g.First().ProjectId, count = g.Count() }).Distinct();