lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
夏菊 2025-05-26 18:50:25 +08:00
parent cb71838085
commit 763c2ebe18
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SGGL/BLL/CQMS/Check/CheckControlService.cs
View File

@ -289,7 +289,8 @@ namespace BLL
CNProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalCode select y.ProfessionalName).First(), 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(), 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.Sys_User where y.UserId == x.CheckMan select y.UserName).First() CheckMan = (from y in db.Sys_User where y.UserId == x.CheckMan select y.UserName).First(),
x.CCManIds
}; };
var list = qq1.Skip(index * page).Take(page).ToList(); var list = qq1.Skip(index * page).Take(page).ToList();
@ -325,6 +326,8 @@ namespace BLL
x.CNProfessionalCode = list[i].CNProfessionalCode + "$" + list[i].CNProfessionalName; x.CNProfessionalCode = list[i].CNProfessionalCode + "$" + list[i].CNProfessionalName;
x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode); x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode);
x.ReAttachUrl = AttachFileService.getFileUrl(x.CheckControlCode + "r"); x.ReAttachUrl = AttachFileService.getFileUrl(x.CheckControlCode + "r");
var ccManNames = UserService.getUserNamesUserIds(x.CCManIds);
x.CCManIds = (x.CCManIds != null ? x.CCManIds : "") + "$" + ccManNames;
listRes.Add(x); listRes.Add(x);
} }
return listRes; return listRes;

2
SGGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />