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/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;