This commit is contained in:
2025-06-04 15:26:39 +08:00
parent 2a5cd03fb9
commit d3da07c131
9 changed files with 756 additions and 65 deletions
@@ -188,7 +188,13 @@ namespace BLL.API.CQMS
inspectionManagement.CheckMan = item.ProcessControl_InspectionManagement.CheckMan;
inspectionManagement.UnqualifiedReason = item.ProcessControl_InspectionManagement.UnqualifiedReason;
inspectionManagement.NoticeCode = item.ProcessControl_InspectionManagement.NoticeCode;
inspectionManagement.AcceptanceCheckMan = item.ProcessControl_InspectionManagement.AcceptanceCheckMan;
var acceptanceCheckMan = BLL.UserService.getUserNamesUserIds(item.ProcessControl_InspectionManagement.AcceptanceCheckMan);
if (string.IsNullOrEmpty(acceptanceCheckMan))
{
acceptanceCheckMan = item.ProcessControl_InspectionManagement.AcceptanceCheckMan.ToString();
}
inspectionManagement.AcceptanceCheckMan = acceptanceCheckMan;
inspectionManagement.ParentDivisionProjectId = item.ProcessControl_InspectionManagement.ParentDivisionProjectId;
inspectionManagement.CompileMan = item.ProcessControl_InspectionManagement.CompileMan;
if (!string.IsNullOrEmpty(inspectionManagement.CompileMan))
@@ -232,7 +238,6 @@ namespace BLL.API.CQMS
List<InspectionManagement> list = new List<InspectionManagement>();
foreach (var item in listRes)
{
InspectionManagement inspectionManagement = new InspectionManagement();
inspectionManagement.InspectionId = item.InspectionId;
@@ -242,9 +247,6 @@ namespace BLL.API.CQMS
inspectionManagement.UnitName = db.Base_Unit.FirstOrDefault(x => x.UnitId == item.UnitId).UnitName;
inspectionManagement.CNProfessionalId = item.CNProfessionalId;
if (!string.IsNullOrEmpty(inspectionManagement.CNProfessionalId))
{
inspectionManagement.CNProfessionalName = db.Base_CNProfessional.FirstOrDefault(x => x.CNProfessionalId == item.CNProfessionalId).ProfessionalName;
@@ -263,10 +265,15 @@ namespace BLL.API.CQMS
inspectionManagement.AttachUrl = item.AttachUrl;
inspectionManagement.CheckDate = item.CheckDate.HasValue ? item.CheckDate.Value.ToString("yyyy-MM-dd") : "";
inspectionManagement.CheckMan = item.CheckMan;
inspectionManagement.CheckMan = item.CheckMan;
inspectionManagement.UnqualifiedReason = item.UnqualifiedReason;
inspectionManagement.NoticeCode = item.NoticeCode;
inspectionManagement.AcceptanceCheckMan = item.AcceptanceCheckMan;
var acceptanceCheckMan = BLL.UserService.getUserNamesUserIds(item.AcceptanceCheckMan);
if (string.IsNullOrEmpty(acceptanceCheckMan))
{
acceptanceCheckMan = item.AcceptanceCheckMan.ToString();
}
inspectionManagement.AcceptanceCheckMan = acceptanceCheckMan;
inspectionManagement.ParentDivisionProjectId = item.ParentDivisionProjectId;
inspectionManagement.CompileMan = item.CompileMan;
if (!string.IsNullOrEmpty(inspectionManagement.CompileMan))
@@ -354,10 +361,15 @@ namespace BLL.API.CQMS
inspectionManagement.CheckDate = item.ProcessControl_InspectionManagement.CheckDate.HasValue ? item.ProcessControl_InspectionManagement.CheckDate.Value.ToString("yyyy-MM-dd") : "";
inspectionManagement.CheckMan = item.ProcessControl_InspectionManagement.CheckMan;
inspectionManagement.CheckMan = item.ProcessControl_InspectionManagement.CheckMan;
inspectionManagement.UnqualifiedReason = item.ProcessControl_InspectionManagement.UnqualifiedReason;
inspectionManagement.NoticeCode = item.ProcessControl_InspectionManagement.NoticeCode;
inspectionManagement.AcceptanceCheckMan = item.ProcessControl_InspectionManagement.AcceptanceCheckMan;
var acceptanceCheckMan = BLL.UserService.getUserNamesUserIds(item.ProcessControl_InspectionManagement.AcceptanceCheckMan);
if (string.IsNullOrEmpty(acceptanceCheckMan))
{
acceptanceCheckMan = item.ProcessControl_InspectionManagement.AcceptanceCheckMan.ToString();
}
inspectionManagement.AcceptanceCheckMan = acceptanceCheckMan;
inspectionManagement.ParentDivisionProjectId = item.ProcessControl_InspectionManagement.ParentDivisionProjectId;
inspectionManagement.CompileMan = item.ProcessControl_InspectionManagement.CompileMan;
if (!string.IsNullOrEmpty(inspectionManagement.CompileMan))