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

20230926

This commit is contained in:
杨红卫 2023-09-26 14:46:54 +08:00
parent dd53b2300a
commit 7f3b30c430
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
View File

@ -775,11 +775,11 @@ namespace BLL
{ {
if (!string.IsNullOrEmpty(ControlItemName)) if (!string.IsNullOrEmpty(ControlItemName))
{ {
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent + "|" + ControlItemName); returnValues = getSelectNames(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent + "|" + ControlItemName);
} }
else else
{ {
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent); returnValues = getSelectNames(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent);
} }
} }

7
SGGL/WebAPI/Controllers/CQMS/CheckListController.cs
View File

@ -81,8 +81,11 @@ namespace Mvc.Controllers
{ {
if (string.IsNullOrEmpty(CheckControl.CheckControlCode)) if (string.IsNullOrEmpty(CheckControl.CheckControlCode))
{ {
CheckControl.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(CheckControl.WorkPackageId, null); string id = CheckControl.WorkPackageId;
CheckControl.WorkPackageName = WorkPackageService.getWorkPageNamesByControlItemAndCycle(CheckControl.WorkPackageId, null);
CheckControl.WorkPackageName = WorkPackageService.getWorkPageNamesByControlItemAndCycle(id, null);
CheckControl.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(id, null);
if (string.IsNullOrEmpty(CheckControl.DocCode)) if (string.IsNullOrEmpty(CheckControl.DocCode))
{ {
string prefix = BLL.ProjectService.GetProjectByProjectId(CheckControl.ProjectId).ProjectCode + "-06-CM03-XJ-"; string prefix = BLL.ProjectService.GetProjectByProjectId(CheckControl.ProjectId).ProjectCode + "-06-CM03-XJ-";