20230926
This commit is contained in:
parent
dd53b2300a
commit
7f3b30c430
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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-";
|
||||
|
|
|
|||
Loading…
Reference in New Issue