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

检查项目分类处理

Browse Source
This commit is contained in:
wyw 2024-10-09 09:00:52 +08:00
parent 6943fabb6d
commit a2399db9bd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
View File

@ -259,7 +259,7 @@ namespace APT.BS.WebApi.Controllers.Api
//wyw1114-1 && e.DEPARTMENT_ID.HasValue //wyw1114-1 && e.DEPARTMENT_ID.HasValue
//&& e.CHECK_PROJECT_ID.HasValue && e.CHECK_PROJECT_CATEGORY_ID.HasValue wyw 2023-05-15 //&& e.CHECK_PROJECT_ID.HasValue && e.CHECK_PROJECT_CATEGORY_ID.HasValue wyw 2023-05-15
Expression<Func<T_BS_CHECK_MAIN, bool>> expression = e => !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.CHECK_QUESTION_ID.HasValue && e.CHECK_TYPE_ID.HasValue && e.CHECK_PROJECT_ID.HasValue && e.CHECK_PROJECT_CATEGORY_ID.HasValue && e.CHECK_TYPE_ID == safecheck.CHECK_TYPE_ID && e.CHECK_TYPE_LEVEL_ID == safecheck.CHECK_TYPE_LEVEL_ID && e.Nav_ListMainDep.Any(); Expression<Func<T_BS_CHECK_MAIN, bool>> expression = e => !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.CHECK_QUESTION_ID.HasValue && e.CHECK_TYPE_ID.HasValue && e.CHECK_PROJECT_ID.HasValue && e.CHECK_TYPE_ID == safecheck.CHECK_TYPE_ID && e.CHECK_TYPE_LEVEL_ID == safecheck.CHECK_TYPE_LEVEL_ID && e.Nav_ListMainDep.Any();
if (safecheck.CHECKOBJECT != 0) if (safecheck.CHECKOBJECT != 0)
{ {
expression = expression.And(e => e.CHECKOBJECT == safecheck.CHECKOBJECT); expression = expression.And(e => e.CHECKOBJECT == safecheck.CHECKOBJECT);
@ -270,8 +270,7 @@ namespace APT.BS.WebApi.Controllers.Api
} }
//wyw1114-1 //wyw1114-1
var listCheckMain = GetEntities(expression, null, new string[] { "Nav_RiskArea", "Nav_CheckProject", "Nav_CheckProjectCategory", "Nav_ListMainDep" }).OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.NUM); var listCheckMain = GetEntities(expression, null, new string[] { "Nav_RiskArea", "Nav_CheckProject", "Nav_ListMainDep" }).OrderBy(e => e.RISK_AREA_ID).ThenBy(e => e.NUM);//, "Nav_CheckProjectCategory"
if (listCheckMain != null && listCheckMain.Any()) if (listCheckMain != null && listCheckMain.Any())
{ {
var listMainID = listCheckMain.Where(e => e.CHECKPROOF != null && e.CHECKPROOF.Length > 0).Select(e => e.ID);//where 减少信息 var listMainID = listCheckMain.Where(e => e.CHECKPROOF != null && e.CHECKPROOF.Length > 0).Select(e => e.ID);//where 减少信息
@ -9003,7 +9002,7 @@ namespace APT.BS.WebApi.Controllers.Api
// 检查单 按区域 拆分导出 // 检查单 按区域 拆分导出
//检查人员 获取 //检查人员 获取
var listDetailUser = GetEntities<T_BS_SAFE_CHECK_DETAIL_USER>(e => listIDs.Contains(e.SAFE_CHECK_ID), null, null).OrderByDescending(e=>e.ISMAINCHECK); var listDetailUser = GetEntities<T_BS_SAFE_CHECK_DETAIL_USER>(e => listIDs.Contains(e.SAFE_CHECK_ID), null, null).OrderByDescending(e => e.ISMAINCHECK);
var listUserID = listDetailUser.Select(e => e.USER_ID).Distinct().ToList(); var listUserID = listDetailUser.Select(e => e.USER_ID).Distinct().ToList();
var listUser = GetEntities<T_FM_USER>(e => listUserID.Contains(e.ID), null, null); var listUser = GetEntities<T_FM_USER>(e => listUserID.Contains(e.ID), null, null);