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

工作票

Browse Source
This commit is contained in:
何美荣 2025-12-05 16:38:55 +08:00
parent d20e7522a8
commit 1b5850833a
4 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -594,22 +594,8 @@ namespace APT.FO.WebApi.Controllers
return SafeGetPagedData<T_HM_OPERATION_STEP>((result) => return SafeGetPagedData<T_HM_OPERATION_STEP>((result) =>
{ {
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.ToString(); var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.ToString();
var mineType = APT.Infrastructure.Api.AppContext.CurrentSession.MineType;
var tempList = mineType.Split(",").ToList();
Expression<Func<T_HM_OPERATION_STEP, bool>> expressionStep = e => !e.IS_DELETED && e.STATUS == STATUSEnum.启用; Expression<Func<T_HM_OPERATION_STEP, bool>> expressionStep = e => !e.IS_DELETED && e.STATUS == STATUSEnum.启用;
Expression<Func<T_HM_OPERATION_LINK, bool>> expressionLink = t => !t.IS_DELETED && t.STATUS == (int)STATUSEnum.启用; Expression<Func<T_HM_OPERATION_LINK, bool>> expressionLink = t => !t.IS_DELETED && t.STATUS == (int)STATUSEnum.启用 && t.TASK_LEVEL != 1;
if (tempList != null && tempList.Any())
{
var temp = tempList.FirstOrDefault(t => t == "0" || t.Contains("公司"));
if (temp == null)
{
expressionLink = expressionLink.And(t => tempList.Contains(t.MineType.ToString()));
}
}
if (orgId == "8b3c41aa-51b1-7ce9-1879-248a038c1b5c" || orgId == "d9871ba8-0eec-9e4a-bb87-7d5a540d8913")
{
expressionLink = expressionLink.And(t => t.TASK_LEVEL == 3 && t.CYCLE_TYPE == HMCycleTypeEnum.Need);
}
var operationLink = this.GetEntities<T_HM_OPERATION_LINK>(expressionLink, new BaseFilter(pageFilter.OrgId)).Select(t=>t.OPERATION_STEP_ID).Distinct().ToList(); var operationLink = this.GetEntities<T_HM_OPERATION_LINK>(expressionLink, new BaseFilter(pageFilter.OrgId)).Select(t=>t.OPERATION_STEP_ID).Distinct().ToList();
expressionStep = expressionStep.And(e => operationLink.Contains(e.ID)); expressionStep = expressionStep.And(e => operationLink.Contains(e.ID));
var info = this.GetOrderPageEntities<T_HM_OPERATION_STEP>(expressionStep, pageFilter, null); var info = this.GetOrderPageEntities<T_HM_OPERATION_STEP>(expressionStep, pageFilter, null);

11
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -233,7 +233,16 @@ namespace APT.SK.WebApi.Controllers.Api
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
foreach (var d in result.Nav_Details)
{
d.Nav_DetailMeasures = d.Nav_DetailMeasures.OrderBy(m => m.NUM).ToList();
foreach (var m in d.Nav_DetailMeasures)
{
var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；";
d.MEASURE = d.MEASURE + temp;
}
}
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID); result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);

18
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
View File

@ -248,7 +248,23 @@ namespace APT.SK.WebApi.Controllers.Api
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(t => t.RISK_IDENTIFY_RESULT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures", "Nav_DetailPosts.Nav_ResultPostDets.Nav_Post", "Nav_DetailPosts.Nav_Department"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(t => t.RISK_IDENTIFY_RESULT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures", "Nav_DetailPosts.Nav_ResultPostDets.Nav_Post", "Nav_DetailPosts.Nav_Department");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
foreach (var d in result.Nav_Details)
{
d.Nav_DetailMeasures = d.Nav_DetailMeasures.OrderBy(t => t.NUM).ToList();
foreach (var m in d.Nav_DetailMeasures)
{
var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；";
d.MEASURE = d.MEASURE + temp;
}
d.Nav_DetailPosts = d.Nav_DetailPosts.OrderBy(t => t.DEPARTMENT_TYPE).ToList();
var departTypes = d.Nav_DetailPosts.Select(t => t.DEPARTMENT_TYPE.GetDescription()).Distinct().ToList();
d.DEPARTMENT_TYPE = string.Join(",", departTypes);
var departs = d.Nav_DetailPosts.Select(t => t.Nav_Department?.NAME).Distinct().ToList();
d.IDENTIFY_DEPARTMENT = string.Join(",", departs);
var posts = d.Nav_DetailPosts.SelectMany(x=>x.Nav_ResultPostDets).Select(t => t.Nav_Post?.NAME).Distinct().ToList();
d.IDENTIFY_POST = string.Join(",", posts);
}
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID); result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);

18
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs
View File

@ -201,7 +201,23 @@ namespace APT.SK.WebApi.Controllers.Api
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(t => t.IDENTIFY_RESULT_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit","Nav_DetailMeasures", "Nav_DetailPosts.Nav_SumPostDets.Nav_Post", "Nav_DetailPosts.Nav_Department"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(t => t.IDENTIFY_RESULT_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit","Nav_DetailMeasures", "Nav_DetailPosts.Nav_SumPostDets.Nav_Post", "Nav_DetailPosts.Nav_Department");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
foreach (var d in result.Nav_Details)
{
d.Nav_DetailMeasures = d.Nav_DetailMeasures.OrderBy(t => t.NUM).ToList();
foreach (var m in d.Nav_DetailMeasures)
{
var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；";
d.MEASURE = d.MEASURE + temp;
}
d.Nav_DetailPosts = d.Nav_DetailPosts.OrderBy(t => t.DEPARTMENT_TYPE).ToList();
var departTypes = d.Nav_DetailPosts.Select(t => t.DEPARTMENT_TYPE.GetDescription()).Distinct().ToList();
d.DEPARTMENT_TYPE = string.Join(",", departTypes);
var departs = d.Nav_DetailPosts.Select(t => t.Nav_Department?.NAME).Distinct().ToList();
d.IDENTIFY_DEPARTMENT = string.Join(",", departs);
var posts = d.Nav_DetailPosts.SelectMany(x => x.Nav_SumPostDets).Select(t => t.Nav_Post?.NAME).Distinct().ToList();
d.IDENTIFY_POST = string.Join(",", posts);
}
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID); result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);