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 2026-05-26 14:54:53 +08:00
commit de1db46811
5 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
View File

@ -326,15 +326,15 @@ namespace APT.FO.WebApi.Controllers.Api.FO
} }
if (!string.IsNullOrEmpty(curUser)) if (!string.IsNullOrEmpty(curUser))
{ {
result.Data = result.Data.Where(t=>t.CURRENT_USER.Contains(curUser)).ToList(); result.Data = result.Data.Where(t=> t.CURRENT_USER!=null && t.CURRENT_USER.Contains(curUser)).ToList();
} }
if (!string.IsNullOrEmpty(changeDept)) if (!string.IsNullOrEmpty(changeDept))
{ {
result.Data = result.Data.Where(t => t.CHANGE_DEPART.Contains(changeDept)).ToList(); result.Data = result.Data.Where(t => t.CHANGE_DEPART!=null && t.CHANGE_DEPART.Contains(changeDept)).ToList();
} }
if (!string.IsNullOrEmpty(changeUser)) if (!string.IsNullOrEmpty(changeUser))
{ {
result.Data = result.Data.Where(t => t.CHANGE_USER.Contains(changeUser)).ToList(); result.Data = result.Data.Where(t => t.CHANGE_USER!=null && t.CHANGE_USER.Contains(changeUser)).ToList();
} }
result.TotalCount = result.Data.Count(); result.TotalCount = result.Data.Count();
} }

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

@ -1349,7 +1349,8 @@ namespace APT.FO.WebApi.Controllers
//上个消息 //上个消息
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
//细表 //细表
List<T_PF_APPROVE_DETAIL> appdetails = new List<T_PF_APPROVE_DETAIL>(); List<T_PF_APPROVE_DETAIL> appdetails = new List<T_PF_APPROVE_DETAIL>();
List<T_PF_APPROVE_DETAIL> appdetailAutos = new List<T_PF_APPROVE_DETAIL>();
Expression<Func<T_PF_APPROVE_TEMP, bool>> express = t => t.FORM_CODE == "FO017" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用; Expression<Func<T_PF_APPROVE_TEMP, bool>> express = t => t.FORM_CODE == "FO017" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用;
if (!string.IsNullOrEmpty(param)) if (!string.IsNullOrEmpty(param))
express = express.And(t => t.PARAM == param); express = express.And(t => t.PARAM == param);
@ -1428,7 +1429,7 @@ namespace APT.FO.WebApi.Controllers
var sendUserIds = new List<Guid>(); var sendUserIds = new List<Guid>();
//var curentApprove = appdetails.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing); //var curentApprove = appdetails.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing);
//如果第一个批的人刚好是自己，加一条已办的审批记录 //如果第一个批的人刚好是自己，加一条已办的审批记录
var applyApprove = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList(); var applyApprove = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Done).ToList();
if (applyApprove != null && applyApprove.Any()) if (applyApprove != null && applyApprove.Any())
{ {
//本人默认审批，存入一条已办 //本人默认审批，存入一条已办
@ -1446,6 +1447,18 @@ namespace APT.FO.WebApi.Controllers
curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME; curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME;
curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE; curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE;
notices.Add(curentTask); notices.Add(curentTask);
T_PF_APPROVE_DETAIL detail = new T_PF_APPROVE_DETAIL();
detail.APPROVE_ID = approve.ID;
detail.IS_CURRENT = false;
detail.ORG_ID = approveTemp.ORG_ID;
detail.NAME = applyApprove.FirstOrDefault()?.NAME;
detail.NUM = applyApprove.FirstOrDefault() != null ? applyApprove.FirstOrDefault().NUM:0;
detail.APPROVE_ROLE_ID = applyApprove.FirstOrDefault()?.APPROVE_ROLE_ID;
detail.IS_ALLOW_UPDATE = applyApprove.FirstOrDefault() != null? applyApprove.FirstOrDefault().IS_ALLOW_UPDATE:false;
detail.APPROVE_USER_ID = applyApprove.FirstOrDefault()?.APPROVE_USER_ID;
detail.NODE_APPROVE_STATUS = (int)NodeApproveStatus.Done;
detail.NODE_APPROVE_TIME = DateTime.Now;
appdetailAutos.Add(detail);
} }
var detailTemps = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList(); var detailTemps = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
if (detailTemps != null && detailTemps.Any()) if (detailTemps != null && detailTemps.Any())
@ -1666,7 +1679,9 @@ namespace APT.FO.WebApi.Controllers
if (approve != null) if (approve != null)
AddEntityNoCommit(approve); AddEntityNoCommit(approve);
if (appdetails != null && appdetails.Any()) if (appdetails != null && appdetails.Any())
BantchAddEntityNoCommit(appdetails); BantchAddEntityNoCommit(appdetails);
if (appdetailAutos != null && appdetailAutos.Any())
BantchAddEntityNoCommit(appdetailAutos);
if (finishNotice != null) if (finishNotice != null)
UpdateEntityNoCommit(finishNotice); UpdateEntityNoCommit(finishNotice);
if (notices != null && notices.Any()) if (notices != null && notices.Any())

19
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
View File

@ -294,7 +294,8 @@ namespace APT.FO.WebApi.Controllers
//上个消息 //上个消息
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
//细表 //细表
List<T_PF_APPROVE_DETAIL> appdetails = new List<T_PF_APPROVE_DETAIL>(); List<T_PF_APPROVE_DETAIL> appdetails = new List<T_PF_APPROVE_DETAIL>();
List<T_PF_APPROVE_DETAIL> appdetailAutos = new List<T_PF_APPROVE_DETAIL>();
Expression<Func<T_PF_APPROVE_TEMP, bool>> express = t => t.FORM_CODE == "FO025" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用; Expression<Func<T_PF_APPROVE_TEMP, bool>> express = t => t.FORM_CODE == "FO025" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用;
if (!string.IsNullOrEmpty(param)) if (!string.IsNullOrEmpty(param))
express = express.And(t => t.PARAM == param); express = express.And(t => t.PARAM == param);
@ -389,7 +390,19 @@ namespace APT.FO.WebApi.Controllers
curentTask.USER_ID = (Guid)applyUserId; curentTask.USER_ID = (Guid)applyUserId;
curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME; curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME;
curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE; curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE;
notices.Add(curentTask); notices.Add(curentTask);
T_PF_APPROVE_DETAIL detail = new T_PF_APPROVE_DETAIL();
detail.APPROVE_ID = approve.ID;
detail.IS_CURRENT = false;
detail.ORG_ID = approveTemp.ORG_ID;
detail.NAME = applyApprove.FirstOrDefault()?.NAME;
detail.NUM = applyApprove.FirstOrDefault() != null ? applyApprove.FirstOrDefault().NUM : 0;
detail.APPROVE_ROLE_ID = applyApprove.FirstOrDefault()?.APPROVE_ROLE_ID;
detail.IS_ALLOW_UPDATE = applyApprove.FirstOrDefault() != null ? applyApprove.FirstOrDefault().IS_ALLOW_UPDATE : false;
detail.APPROVE_USER_ID = applyApprove.FirstOrDefault()?.APPROVE_USER_ID;
detail.NODE_APPROVE_STATUS = (int)NodeApproveStatus.Done;
detail.NODE_APPROVE_TIME = DateTime.Now;
appdetailAutos.Add(detail);
} }
var sendUserIds = new List<Guid>(); var sendUserIds = new List<Guid>();
var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId); var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId);
@ -574,6 +587,8 @@ namespace APT.FO.WebApi.Controllers
AddEntityNoCommit(approve); AddEntityNoCommit(approve);
if (appdetails != null && appdetails.Any()) if (appdetails != null && appdetails.Any())
BantchAddEntityNoCommit(appdetails); BantchAddEntityNoCommit(appdetails);
if (appdetailAutos != null && appdetailAutos.Any())
BantchAddEntityNoCommit(appdetailAutos);
if (finishNotice != null) if (finishNotice != null)
UpdateEntityNoCommit(finishNotice); UpdateEntityNoCommit(finishNotice);
if (notices != null && notices.Any()) if (notices != null && notices.Any())

20
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -350,11 +350,15 @@ namespace APT.FO.WebApi.Controllers
throw new Exception("动火实际结束时间必须填写"); throw new Exception("动火实际结束时间必须填写");
if (entity.LEAVE_DATE == null) if (entity.LEAVE_DATE == null)
throw new Exception("离开现场时间必须填写"); throw new Exception("离开现场时间必须填写");
//if (monitorFileList == null || !monitorFileList.Any()) if (monitorFileList == null || !monitorFileList.Any())
// throw new Exception("必须上传完工验收附件"); throw new Exception("必须上传完工验收附件");
var detailNeed = detailList.FirstOrDefault(t => (t.JOB_STEP == FOJobStepEnum.Ing && t.IS_CONFIRM_NEW == false) || (t.JOB_STEP == FOJobStepEnum.After && t.IS_CONFIRM_NEW == false)); var detailNeed = detailList.FirstOrDefault(t => (t.JOB_STEP == FOJobStepEnum.Ing && t.IS_CONFIRM_NEW == false) || (t.JOB_STEP == FOJobStepEnum.After && t.IS_CONFIRM_NEW == false));
//if (detailNeed != null) if (detailNeed != null)
// throw new Exception("作业中或作业后未全部确认！"); throw new Exception("作业中或作业后未全部确认！");
var detailAfterIds = detailList.Where(t => t.JOB_STEP != FOJobStepEnum.Pre).Select(m=>m.ID).ToList();
var fileAfter = detailFileList.FirstOrDefault(t => detailAfterIds.Contains(t.FIRE_JOB_DETAIL_ID));
if(fileAfter == null)
throw new Exception("作业中或作业后必须上传一个附件！");
//作业前不删 //作业前不删
var noDeleteIds = detailInfos.Where(t => t.JOB_STEP == FOJobStepEnum.Pre).Select(t => t.ID).ToList(); var noDeleteIds = detailInfos.Where(t => t.JOB_STEP == FOJobStepEnum.Pre).Select(t => t.ID).ToList();
detailIds = detailIds.Where(t => !noDeleteIds.Contains(t)).ToList(); detailIds = detailIds.Where(t => !noDeleteIds.Contains(t)).ToList();
@ -387,11 +391,15 @@ namespace APT.FO.WebApi.Controllers
throw new Exception("不可动火请稍后再进行验收"); throw new Exception("不可动火请稍后再进行验收");
if (entity.ACT_DATE == null) if (entity.ACT_DATE == null)
throw new Exception("动火实际开始时间必须填写"); throw new Exception("动火实际开始时间必须填写");
//if (fireFileList == null || !fireFileList.Any()) if (fireFileList == null || !fireFileList.Any())
// throw new Exception("必须上传现场条件验收附件"); throw new Exception("必须上传现场条件验收附件");
var detailNeed = detailList.FirstOrDefault(t => t.JOB_STEP == FOJobStepEnum.Pre && t.IS_CONFIRM_NEW == false); var detailNeed = detailList.FirstOrDefault(t => t.JOB_STEP == FOJobStepEnum.Pre && t.IS_CONFIRM_NEW == false);
if (detailNeed != null) if (detailNeed != null)
throw new Exception("作业前未全部确认！"); throw new Exception("作业前未全部确认！");
var detailPreIds = detailList.Where(t => t.JOB_STEP == FOJobStepEnum.Pre).Select(m => m.ID).ToList();
var filePre = detailFileList.FirstOrDefault(t => detailPreIds.Contains(t.FIRE_JOB_DETAIL_ID));
if (filePre == null)
throw new Exception("作业前必须上传一个附件！");
//作业中后不删 //作业中后不删
var noDeleteIds = detailInfos.Where(t => t.JOB_STEP != FOJobStepEnum.Pre).Select(t => t.ID).ToList(); var noDeleteIds = detailInfos.Where(t => t.JOB_STEP != FOJobStepEnum.Pre).Select(t => t.ID).ToList();
detailIds = detailIds.Where(t => !noDeleteIds.Contains(t)).ToList(); detailIds = detailIds.Where(t => !noDeleteIds.Contains(t)).ToList();

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
View File

@ -990,7 +990,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
riskList.Add(risk); riskList.Add(risk);
} }
} }
result.Data.riskList = riskList; result.Data.riskList = riskList.OrderByDescending(t=>t.totalCount).ToList();
result.Data.riskTypeList = riskTypeList; result.Data.riskTypeList = riskTypeList;
return result; return result;