From 7f3b30c4309e3d66fc686bb159bf14c4e8107aca Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Tue, 26 Sep 2023 14:46:54 +0800 Subject: [PATCH] 20230926 --- SGGL/BLL/CQMS/WBS/WorkPackageService.cs | 4 ++-- SGGL/WebAPI/Controllers/CQMS/CheckListController.cs | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 989db22e..01bd6402 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -775,11 +775,11 @@ namespace BLL { if (!string.IsNullOrEmpty(ControlItemName)) { - returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent + "|" + ControlItemName); + returnValues = getSelectNames(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent + "|" + ControlItemName); } else { - returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent); + returnValues = getSelectNames(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent); } } diff --git a/SGGL/WebAPI/Controllers/CQMS/CheckListController.cs b/SGGL/WebAPI/Controllers/CQMS/CheckListController.cs index 6dcd16ef..fa037c8c 100644 --- a/SGGL/WebAPI/Controllers/CQMS/CheckListController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/CheckListController.cs @@ -81,8 +81,11 @@ namespace Mvc.Controllers { if (string.IsNullOrEmpty(CheckControl.CheckControlCode)) { - CheckControl.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(CheckControl.WorkPackageId, null); - CheckControl.WorkPackageName = WorkPackageService.getWorkPageNamesByControlItemAndCycle(CheckControl.WorkPackageId, null); + string id = CheckControl.WorkPackageId; + + CheckControl.WorkPackageName = WorkPackageService.getWorkPageNamesByControlItemAndCycle(id, null); + CheckControl.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(id, null); + if (string.IsNullOrEmpty(CheckControl.DocCode)) { string prefix = BLL.ProjectService.GetProjectByProjectId(CheckControl.ProjectId).ProjectCode + "-06-CM03-XJ-";