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-07-17 15:25:38 +08:00
parent 9d8b4d3983
commit 382ee8b55c
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs
View File

@ -381,7 +381,7 @@ namespace APT.BS.WebApi.Controllers.Api
Guid RISK_AREA_ID = Detail.RISK_AREA_ID.Value; Guid RISK_AREA_ID = Detail.RISK_AREA_ID.Value;
Guid CHECK_PROJECT_ID = Detail.CHECK_PROJECT_ID.Value; Guid CHECK_PROJECT_ID = Detail.CHECK_PROJECT_ID.Value;
Guid CHECK_PROJECT_CATEGORY_ID = Detail.CHECK_PROJECT_CATEGORY_ID.Value; //Guid CHECK_PROJECT_CATEGORY_ID = Detail.CHECK_PROJECT_CATEGORY_ID.Value;
Guid SAFE_CHECK_ID = Detail.SAFE_CHECK_ID; Guid SAFE_CHECK_ID = Detail.SAFE_CHECK_ID;
Guid DEPARTMENT_ID = Detail.DEPARTMENT_ID.Value; Guid DEPARTMENT_ID = Detail.DEPARTMENT_ID.Value;
string CHECKCONTENT = Detail.CHECKCONTENT; string CHECKCONTENT = Detail.CHECKCONTENT;
@ -401,8 +401,8 @@ namespace APT.BS.WebApi.Controllers.Api
CHECKCONTENTSearch = rulesSearch.ToList()[0].Value.ToString(); CHECKCONTENTSearch = rulesSearch.ToList()[0].Value.ToString();
} }
//wyw1114 expression && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == DEPARTMENT_ID //wyw1114 expression && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == DEPARTMENT_ID && e.CHECK_PROJECT_CATEGORY_ID == CHECK_PROJECT_CATEGORY_ID
Expression<Func<T_BS_CHECK_MAIN, bool>> expression = e => e.RISK_AREA_ID == RISK_AREA_ID && e.CHECK_TYPE_LEVEL_ID == CHECK_TYPE_LEVEL_ID && e.CHECK_PROJECT_ID == CHECK_PROJECT_ID && e.CHECK_PROJECT_CATEGORY_ID == CHECK_PROJECT_CATEGORY_ID && e.CHECKCONTENT == CHECKCONTENT && !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.CHECK_QUESTION_ID.HasValue; Expression<Func<T_BS_CHECK_MAIN, bool>> expression = e => e.RISK_AREA_ID == RISK_AREA_ID && e.CHECK_TYPE_LEVEL_ID == CHECK_TYPE_LEVEL_ID && e.CHECK_PROJECT_ID == CHECK_PROJECT_ID && e.CHECKCONTENT == CHECKCONTENT && !e.IS_DELETED && e.ENABLE_STATUS == 0 && e.CHECK_QUESTION_ID.HasValue;
if (!string.IsNullOrEmpty(CHECKCONTENTSearch)) if (!string.IsNullOrEmpty(CHECKCONTENTSearch))
{ {

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

@ -245,7 +245,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();//&& e.CHECK_PROJECT_CATEGORY_ID.HasValue
if (safecheck.CHECKOBJECT != 0) if (safecheck.CHECKOBJECT != 0)
{ {
expression = expression.And(e => e.CHECKOBJECT == safecheck.CHECKOBJECT); expression = expression.And(e => e.CHECKOBJECT == safecheck.CHECKOBJECT);
@ -8125,12 +8125,12 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
IEnumerable<T_BS_SAFE_CHECK_PROJECT> listCheakProject = null; IEnumerable<T_BS_SAFE_CHECK_PROJECT> listCheakProject = null;
IEnumerable<T_BS_SAFE_CHECK_RISK_AREA> listCheakArea = null; IEnumerable<T_BS_SAFE_CHECK_RISK_AREA> listCheakArea = null;
IEnumerable<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategory = null; //IEnumerable<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategory = null;
if (entity.SAFE_CHECK_ID != Guid.Empty) if (entity.SAFE_CHECK_ID != Guid.Empty)
{ {
listCheakProject = GetEntities<T_BS_SAFE_CHECK_PROJECT>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null); listCheakProject = GetEntities<T_BS_SAFE_CHECK_PROJECT>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
listCheakArea = GetEntities<T_BS_SAFE_CHECK_RISK_AREA>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null); listCheakArea = GetEntities<T_BS_SAFE_CHECK_RISK_AREA>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
listCheakCategory = GetEntities<T_BS_SAFE_CHECK_PROJECT_CATEGORY>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null); //listCheakCategory = GetEntities<T_BS_SAFE_CHECK_PROJECT_CATEGORY>(e => e.SAFE_CHECK_ID == entity.SAFE_CHECK_ID, null, null);
} }
return SafeExecute(() => return SafeExecute(() =>
{ {
@ -8195,7 +8195,7 @@ namespace APT.BS.WebApi.Controllers.Api
T_BS_SAFE_CHECK_RISK_AREA cheakAreaAdd = null; T_BS_SAFE_CHECK_RISK_AREA cheakAreaAdd = null;
List<T_BS_SAFE_CHECK_PROJECT> listCheakProjectAdd = new List<T_BS_SAFE_CHECK_PROJECT>(); List<T_BS_SAFE_CHECK_PROJECT> listCheakProjectAdd = new List<T_BS_SAFE_CHECK_PROJECT>();
List<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategoryAdd = new List<T_BS_SAFE_CHECK_PROJECT_CATEGORY>(); //List<T_BS_SAFE_CHECK_PROJECT_CATEGORY> listCheakCategoryAdd = new List<T_BS_SAFE_CHECK_PROJECT_CATEGORY>();
foreach (var item in entity.Nav_ListCheckDetail) foreach (var item in entity.Nav_ListCheckDetail)
{ {
@ -8212,7 +8212,7 @@ namespace APT.BS.WebApi.Controllers.Api
item.SERIOUS_RISK = item.QUESTION_LEVEL.Value == 10 ? BSSeriousRiskEnum.是 : BSSeriousRiskEnum.否; item.SERIOUS_RISK = item.QUESTION_LEVEL.Value == 10 ? BSSeriousRiskEnum.是 : BSSeriousRiskEnum.否;
item.IS_REJECTING = false; item.IS_REJECTING = false;
item.DEPARTMENT_ID = entity.DEPARTMENT_ID; item.DEPARTMENT_ID = entity.DEPARTMENT_ID;
modelMain = listMain.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID && e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID && e.QUESTION_LEVEL == item.QUESTION_LEVEL); modelMain = listMain.FirstOrDefault(e => e.CHECK_PROJECT_ID == item.CHECK_PROJECT_ID && e.QUESTION_LEVEL == item.QUESTION_LEVEL);// && e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID
if (modelMain == null) if (modelMain == null)
{ {
modelMain = new T_BS_CHECK_MAIN(); modelMain = new T_BS_CHECK_MAIN();
@ -8220,7 +8220,7 @@ namespace APT.BS.WebApi.Controllers.Api
modelMain.ORG_ID = entity.ORG_ID; modelMain.ORG_ID = entity.ORG_ID;
modelMain.CHECKOBJECT = (int)entity.CHECKOBJECT; modelMain.CHECKOBJECT = (int)entity.CHECKOBJECT;
modelMain.CHECK_PROJECT_ID = item.CHECK_PROJECT_ID; modelMain.CHECK_PROJECT_ID = item.CHECK_PROJECT_ID;
modelMain.CHECK_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_CATEGORY_ID; //modelMain.CHECK_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_CATEGORY_ID;
modelMain.QUESTION_LEVEL = item.QUESTION_LEVEL.Value; modelMain.QUESTION_LEVEL = item.QUESTION_LEVEL.Value;
modelMain.CHECK_QUESTION_ID = item.CHECK_QUESTION_ID; modelMain.CHECK_QUESTION_ID = item.CHECK_QUESTION_ID;
modelMain.CHECKCONTENT = entity.CHECKCONTENT; modelMain.CHECKCONTENT = entity.CHECKCONTENT;
@ -8326,22 +8326,22 @@ namespace APT.BS.WebApi.Controllers.Api
CHECK_PROJECT_ID = item.CHECK_PROJECT_ID.Value CHECK_PROJECT_ID = item.CHECK_PROJECT_ID.Value
}); });
} }
var checkCategory = listCheakCategory.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID); //var checkCategory = listCheakCategory.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID);
if (checkCategory == null) //if (checkCategory == null)
checkCategory = listCheakCategoryAdd.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID); // checkCategory = listCheakCategoryAdd.FirstOrDefault(e => e.CHECK_PROJECT_CATEGORY_ID == item.CHECK_PROJECT_CATEGORY_ID);
if (checkCategory == null) //if (checkCategory == null)
{ //{
listCheakCategoryAdd.Add(new T_BS_SAFE_CHECK_PROJECT_CATEGORY() // listCheakCategoryAdd.Add(new T_BS_SAFE_CHECK_PROJECT_CATEGORY()
{ // {
ID = Guid.NewGuid(), // ID = Guid.NewGuid(),
ORG_ID = entity.ORG_ID, // ORG_ID = entity.ORG_ID,
CREATER_ID = loginId, // CREATER_ID = loginId,
CREATE_TIME = dtNow, // CREATE_TIME = dtNow,
SAFE_CHECK_ID = entity.SAFE_CHECK_ID, // SAFE_CHECK_ID = entity.SAFE_CHECK_ID,
CHECK_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_CATEGORY_ID.Value // CHECK_PROJECT_CATEGORY_ID = item.CHECK_PROJECT_CATEGORY_ID.Value
}); // });
} //}
} }
foreach (var item in listMain) foreach (var item in listMain)
@ -8401,8 +8401,8 @@ namespace APT.BS.WebApi.Controllers.Api
UpdateEntity(cheakAreaAdd);//检查区域 UpdateEntity(cheakAreaAdd);//检查区域
if (listCheakProjectAdd != null && listCheakProjectAdd.Any()) if (listCheakProjectAdd != null && listCheakProjectAdd.Any())
BantchSaveEntityNoCommit(listCheakProjectAdd);//检查项目 BantchSaveEntityNoCommit(listCheakProjectAdd);//检查项目
if (listCheakCategoryAdd != null && listCheakCategoryAdd.Any()) //if (listCheakCategoryAdd != null && listCheakCategoryAdd.Any())
BantchSaveEntityNoCommit(listCheakCategoryAdd);//检查项目分类 // BantchSaveEntityNoCommit(listCheakCategoryAdd);//检查项目分类
}); });
return true; return true;
}); });