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

20230921新增安全巡检新增分部分项选择、质量巡检新增分部分项选择

Browse Source
This commit is contained in:
杨红卫
2023-09-21 17:34:59 +08:00
parent 017edfa146
commit 9fb8e5e030
35 changed files with 1076 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
+2
View File
@@ -82,6 +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),
};
var isUpdate = db.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == newHazardRegister.HazardRegisterId);
if (isUpdate == null)
SGGL/BLL/CQMS/Check/CheckControlService.cs
+17 -4
View File
@@ -62,6 +62,9 @@ namespace BLL
newCheckControl.State = CheckControl.State;
newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan;
newCheckControl.WorkPackageId = CheckControl.WorkPackageId;
newCheckControl.WorkPackageName = CheckControl.WorkPackageName;
db.Check_CheckControl.InsertOnSubmit(newCheckControl);
db.SubmitChanges();
}
@@ -93,6 +96,9 @@ namespace BLL
newCheckControl.State = CheckControl.State;
newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan;
newCheckControl.WorkPackageId = CheckControl.WorkPackageId;
newCheckControl.WorkPackageName = CheckControl.WorkPackageName;
db.Check_CheckControl.InsertOnSubmit(newCheckControl);
db.SubmitChanges();
}
@@ -215,6 +221,8 @@ namespace BLL
newCheckControl.State = CheckControl.State;
newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan;
newCheckControl.WorkPackageId = CheckControl.WorkPackageId;
newCheckControl.WorkPackageName = CheckControl.WorkPackageName;
db.SubmitChanges();
}
public static List<Model.Check_CheckControl> GetListDataForApi(string state, string name, string projectId, int index, int page)
@@ -277,7 +285,8 @@ namespace BLL
x.RectifyOpinion,
x.LimitDate,
x.CNProfessionalCode,
x.WorkPackageId,
x.WorkPackageName,
CNProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalCode select y.ProfessionalName).First(),
UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWorkId select y.UnitWorkCode + "-" + y.UnitWorkName + (y.ProjectType == "1" ? "(建筑)" : "(安装)")).First(),
CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First()
@@ -316,6 +325,8 @@ namespace BLL
x.CNProfessionalCode = list[i].CNProfessionalCode + "$" + list[i].CNProfessionalName;
x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode);
x.ReAttachUrl = AttachFileService.getFileUrl(x.CheckControlCode + "r");
x.WorkPackageId = list[i].WorkPackageId;
x.WorkPackageName = list[i].WorkPackageName;
listRes.Add(x);
}
return listRes;
@@ -489,11 +500,11 @@ namespace BLL
x.RectifyOpinion,
x.LimitDate,
x.CNProfessionalCode,
x.WorkPackageId,
x.WorkPackageName,
CNProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalCode select y.ProfessionalName).First(),
UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWorkId select y.UnitWorkCode + "-" + y.UnitWorkName + (y.ProjectType == "1" ? "(建筑)" : "(安装)")).First(),
CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First()
CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First(),
};
var list = qq1.Skip(index * page).Take(page).ToList();
@@ -522,6 +533,8 @@ namespace BLL
x.CNProfessionalCode = list[i].CNProfessionalCode + "$" + list[i].CNProfessionalName;
x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode);
x.ReAttachUrl = AttachFileService.getFileUrl(x.CheckControlCode + "r");
x.WorkPackageId = list[i].WorkPackageId;
x.WorkPackageName = list[i].WorkPackageName;
listRes.Add(x);
}
return listRes;
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
+78
View File
@@ -751,6 +751,84 @@ namespace BLL
}
#endregion
#region 根据工作包ID获取wbs节点及父节点名称字符串
/// <summary>
/// 根据工作包ID获取wbs节点及父节点字符串
/// </summary>
/// <param name="controlItemAndCycleId"></param>
/// <returns></returns>
public static string getWorkPageNamesByControlItemAndCycle(string workPackageId, string controlItemAndCycleId)
{
string returnValues = string.Empty;
string ControlItemName=string.Empty;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId);
if (getControlItemAndCycle != null)
{
workPackageId = getControlItemAndCycle.WorkPackageId;
ControlItemName = getControlItemAndCycle.ControlItemContent;
}
}
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPackageId);
if (getWorkPackage != null)
{
if (!string.IsNullOrEmpty(ControlItemName))
{
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent + "|" + ControlItemName);
}
else
{
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent);
}
}
return returnValues;
}
/// <summary>
/// id
/// </summary>
/// <param name="node"></param>
/// <param name="id"></param>
/// <returns></returns>
public static string getSelectNames(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.PackageContent + "|" + returnValues;
returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues);
}
}
else
{
var getUnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == getWorkPackage.UnitWorkId);
if (getUnitWork != null)
{
if (getUnitWork.ProjectType == "1")
{
returnValues = "建筑工程|" + getUnitWork.UnitWorkName + "|" + returnValues;
}
else
{
returnValues = "安装工程|" + getUnitWork.UnitWorkName + "|" + returnValues;
}
}
}
}
return returnValues;
}
#endregion
#region 更新分部分项概算费用
/// <summary>
/// 更新分部分项概算费用
SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
+8 -1
View File
@@ -71,7 +71,11 @@ namespace BLL
RegisterTypes2Id = hazardRegister.RegisterTypes2Id,
RegisterTypes3Id = hazardRegister.RegisterTypes3Id,
RegisterTypes4Id = hazardRegister.RegisterTypes4Id,
CCManIds = hazardRegister.CCManIds
CCManIds = hazardRegister.CCManIds,
WorkPackageId = hazardRegister.WorkPackageId,
WorkPackageName = hazardRegister.WorkPackageName,
};
db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
db.SubmitChanges();
@@ -116,6 +120,9 @@ namespace BLL
newHazardRegister.RegisterTypes3Id = hazardRegister.RegisterTypes3Id;
newHazardRegister.RegisterTypes4Id = hazardRegister.RegisterTypes4Id;
newHazardRegister.CCManIds = hazardRegister.CCManIds;
newHazardRegister.WorkPackageId = newHazardRegister.WorkPackageId;
newHazardRegister.WorkPackageName = newHazardRegister.WorkPackageName;
//把附件表的路径复制过来
Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);
if (file != null)