wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2025-11-24 18:01:26 +08:00
commit 7a2580ccde
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -5551,6 +5551,7 @@ namespace APT.PP.WebApi.Controllers.Api
enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL; enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL;
enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
enterpriseLib.NUM = entity.NUM; enterpriseLib.NUM = entity.NUM;
enterpriseLib.EMERGENCY = entity.EMERGENCY;
libs.Add(enterpriseLib); libs.Add(enterpriseLib);
var measureTemps = libraryDetails.Where(t=>t.BASIC_LIBRARY_ID == entity.ID).ToList(); var measureTemps = libraryDetails.Where(t=>t.BASIC_LIBRARY_ID == entity.ID).ToList();
if (measureTemps.Any()) if (measureTemps.Any())

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs
View File

@ -55,7 +55,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
var olds = this.GetEntity<T_SK_CHECK_CONTENTS>(t => !t.IS_DELETED && t.CHECKCONTENT == entity.CHECKCONTENT && t.ID != entity.ID); var olds = this.GetEntity<T_SK_CHECK_CONTENTS>(t => !t.IS_DELETED && t.CHECKCONTENT == entity.CHECKCONTENT && t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID);
if (olds != null) if (olds != null)
{ {
throw new Exception("检查内容重复，请先修改"); throw new Exception("检查内容重复，请先修改");

8
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -513,6 +513,7 @@ namespace APT.SK.WebApi.Controllers.Api
enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL; enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL;
enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
enterpriseLib.NUM = entity.NUM; enterpriseLib.NUM = entity.NUM;
enterpriseLib.EMERGENCY = entity.EMERGENCY;
if (details != null && details.Any()) if (details != null && details.Any())
{ {
foreach (var item in details) foreach (var item in details)
@ -1813,7 +1814,7 @@ namespace APT.SK.WebApi.Controllers.Api
DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds); DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
var checkList = new JsonActionResult<List<T_SK_ENTERPRISE_LIBRARY_POST>>(); var checkList = new JsonActionResult<List<T_SK_ENTERPRISE_LIBRARY_POST>>();
List<T_SK_ENTERPRISE_LIBRARY_POST> postLists = new List<T_SK_ENTERPRISE_LIBRARY_POST>(); List<T_SK_ENTERPRISE_LIBRARY_POST> postLists = new List<T_SK_ENTERPRISE_LIBRARY_POST>();
var detailContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_Library", "Nav_PostDetails", "Nav_Department"); var detailContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_Library.Nav_ProductionUnit", "Nav_PostDetails", "Nav_Department");
if (detailContents != null && detailContents.Any()) if (detailContents != null && detailContents.Any())
{ {
foreach (var item in detailContents) foreach (var item in detailContents)
@ -1826,7 +1827,8 @@ namespace APT.SK.WebApi.Controllers.Api
T_SK_ENTERPRISE_LIBRARY_POST part = new T_SK_ENTERPRISE_LIBRARY_POST(); T_SK_ENTERPRISE_LIBRARY_POST part = new T_SK_ENTERPRISE_LIBRARY_POST();
part.DEPARTMENT_ID = item.DEPARTMENT_ID; part.DEPARTMENT_ID = item.DEPARTMENT_ID;
part.ORG_ID = item.ORG_ID; part.ORG_ID = item.ORG_ID;
part.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; part.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
part.Nav_Library = item.Nav_Library;
part.Nav_Department = item.Nav_Department; part.Nav_Department = item.Nav_Department;
part.POST_NAME = posts.FirstOrDefault(t => t.ID == item2.POST_ID)?.NAME; part.POST_NAME = posts.FirstOrDefault(t => t.ID == item2.POST_ID)?.NAME;
part.PHONE = user?.NAME + " " + user?.PHONE; part.PHONE = user?.NAME + " " + user?.PHONE;
@ -1838,7 +1840,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (checkList.Data != null && checkList.Data.Any()) if (checkList.Data != null && checkList.Data.Any())
{ {
var libraryIds = postLists.Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList(); var libraryIds = postLists.Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => libraryIds.Contains(t.ID), new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_Details"); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => libraryIds.Contains(t.ID), new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_Details", "Nav_ProductionUnit");
foreach (var item in checkList.Data) foreach (var item in checkList.Data)
{ {
var tempIds = postLists.Where(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.POST_NAME == item.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList(); var tempIds = postLists.Where(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.POST_NAME == item.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList();