From 68d5ab68c68eef5e52ba8cea64a59fe9e554ed87 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Fri, 12 Jul 2024 15:54:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=A5=E8=81=8C=E8=8A=82=E7=82=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E9=A9=B3=E5=9B=9E=E8=8A=82=E7=82=B9=20=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E8=AE=B0=E5=BD=95=E9=A9=B3=E5=9B=9E=20=E5=B1=A5?= =?UTF-8?q?=E8=81=8C=E8=AE=B0=E5=BD=95=E5=A4=84=E7=90=86=20=E5=B1=A5?= =?UTF-8?q?=E8=81=8C=E4=BF=AE=E6=94=B9=20=E5=A4=84=E7=90=86=20=E4=BD=BF?= =?UTF-8?q?=E9=80=82=E9=85=8D=20=E5=A4=9A=E8=8A=82=E7=82=B9=20=E5=B1=A5?= =?UTF-8?q?=E8=81=8C=E6=9F=A5=E7=9C=8B=20=E6=98=BE=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/FM/FMFlowPermitService.cs | 11 +++++- .../Services/PF/PFApproveCallBackService.cs | 11 +++++- APT.MS.Domain/Enums/BS/BSEnums.cs | 20 ++++++++--- .../Services/BS/BSOperateLogService.cs | 34 ++++++++++++++++++- .../Controllers/Api/BSOperateLogController.cs | 3 ++ .../Controllers/Api/BSRiskSubmitController.cs | 18 ++++++++++ 6 files changed, 90 insertions(+), 7 deletions(-) diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs index 118eef7..c54f4e6 100644 --- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs +++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs @@ -2337,7 +2337,16 @@ namespace APT.BaseData.Services.Services.FM Expression> expression = e => e.DATA_ID == DATA_ID && e.OPERATEPOINT == OPERATEPOINT && e.USER_ID == UserID; if (DATA_ID_SUB.HasValue) expression = expression.And(e => e.DATA_ID_SUB.HasValue && e.DATA_ID_SUB == DATA_ID_SUB); - var model = GetEntity(expression); + //var model = GetEntity(expression); + var listModel = GetEntities(expression); + T_BS_OPERATE_LOG model = null; + if (listModel != null && listModel.Any()) + { + if (listModel.Count() == 1) + model = listModel.ToList()[0]; + else + model = listModel.OrderByDescending(e => e.CREATE_TIME).ToList()[0]; + } if (model != null) { model.OPERTETIME = DateTime.Now; diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 6337e9f..74b55de 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -8580,7 +8580,16 @@ namespace APT.BaseData.Services.DomainServices Expression> expression = e => e.DATA_ID == DATA_ID && e.OPERATEPOINT == OPERATEPOINT && e.USER_ID == UserID; if (DATA_ID_SUB.HasValue) expression = expression.And(e => e.DATA_ID_SUB.HasValue && e.DATA_ID_SUB == DATA_ID_SUB); - var model = GetEntity(expression); + //var model = GetEntity(expression); + var listModel = GetEntities(expression); + T_BS_OPERATE_LOG model = null; + if (listModel != null && listModel.Any()) + { + if (listModel.Count() == 1) + model = listModel.ToList()[0]; + else + model = listModel.OrderByDescending(e => e.CREATE_TIME).ToList()[0]; + } if (model != null) { model.OPERTETIME = DateTime.Now; diff --git a/APT.MS.Domain/Enums/BS/BSEnums.cs b/APT.MS.Domain/Enums/BS/BSEnums.cs index ab4fee1..e982050 100644 --- a/APT.MS.Domain/Enums/BS/BSEnums.cs +++ b/APT.MS.Domain/Enums/BS/BSEnums.cs @@ -1404,7 +1404,7 @@ namespace APT.MS.Domain.Enums /// /// 表单获取 10 /// - [Description("表单获取")] + [Description("任务获取")] GotCheck = 10, /// @@ -1426,9 +1426,9 @@ namespace APT.MS.Domain.Enums CheckerCheck = 40, /// - /// 跑批检查登记 48 + /// 接收检查登记单 48 /// - [Description("跑批检查登记")] + [Description("接收检查登记单")] CheckRegisterRun = 48, /// @@ -1523,7 +1523,7 @@ namespace APT.MS.Domain.Enums /// /// 验收人确认 175 /// - [Description("验收人确认")] + [Description("延期验收人确认")] RiskDelayApplyCheck = 175, /// @@ -1538,12 +1538,24 @@ namespace APT.MS.Domain.Enums [Description("整改责任人确认")] RiskDealDealCheck = 190, + /// + /// 整改责任人拒绝 195 + /// + [Description("整改责任人拒绝")] + RiskDealDealCheckReject = 195, + /// /// 整改验收人确认 200 /// [Description("整改验收人确认")] RiskDealCheckerCheck = 200, + /// + /// 整改验收人拒绝 205 + /// + [Description("整改验收人拒绝")] + RiskDealCheckerCheckReject = 205, + /// /// 整改审批 210 /// diff --git a/APT.MS.Services/Services/BS/BSOperateLogService.cs b/APT.MS.Services/Services/BS/BSOperateLogService.cs index 39375b9..c45bc52 100644 --- a/APT.MS.Services/Services/BS/BSOperateLogService.cs +++ b/APT.MS.Services/Services/BS/BSOperateLogService.cs @@ -201,6 +201,17 @@ namespace APT.BaseData.Services.DomainServices for (int i = 0; i < ListUserID.Count; i++) listResult.Add(AddModel(OPERATEPOINT_Enums.RiskDealCheckerCheck, DATA_ID, ListUserID[i], ListUserName[i], ORG_ID, i, false, DATA_ID_SUB)); break; + case OPERATEPOINT_Enums.RiskDealDealCheckReject://case OPERATEPOINT_Enums.RiskDealDealCheck: + modelLogUpdate = GetUpdateDeal(OPERATEPOINT_Enums.RiskDealDealCheck, DATA_ID, UserIDLogin, DATA_ID_SUB, TASK_ENDDT);//处理自己的 + if (modelLogUpdate != null) + { + modelLogUpdate.OPERATEPOINT = OPERATEPOINT_Enums.RiskDealDealCheckReject;////状态修改为拒绝 + listResult.Add(modelLogUpdate); + } + if (ListUserID != null && ListUserName != null && ListUserID.Any()) + for (int i = 0; i < ListUserID.Count; i++) + listResult.Add(AddModel(OPERATEPOINT_Enums.RiskDeal, DATA_ID, ListUserID[i], ListUserName[i], ORG_ID, i, false, DATA_ID_SUB)); + break; case OPERATEPOINT_Enums.RiskDealCheckerCheck: modelLogUpdate = GetUpdateDeal(OPERATEPOINT, DATA_ID, UserIDLogin, DATA_ID_SUB, TASK_ENDDT);//处理自己的 if (modelLogUpdate != null) @@ -209,6 +220,17 @@ namespace APT.BaseData.Services.DomainServices for (int i = 0; i < ListUserID.Count; i++) listResult.Add(AddModel(OPERATEPOINT_Enums.RiskDealAudit, DATA_ID, ListUserID[i], ListUserName[i], ORG_ID, i, false, DATA_ID_SUB)); break; + case OPERATEPOINT_Enums.RiskDealCheckerCheckReject: + modelLogUpdate = GetUpdateDeal(OPERATEPOINT_Enums.RiskDealCheckerCheck, DATA_ID, UserIDLogin, DATA_ID_SUB, TASK_ENDDT);//处理自己的 + if (modelLogUpdate != null) + { + modelLogUpdate.OPERATEPOINT = OPERATEPOINT_Enums.RiskDealCheckerCheckReject;//状态修改为拒绝 + listResult.Add(modelLogUpdate); + } + if (ListUserID != null && ListUserName != null && ListUserID.Any()) + for (int i = 0; i < ListUserID.Count; i++) + listResult.Add(AddModel(OPERATEPOINT_Enums.RiskDeal, DATA_ID, ListUserID[i], ListUserName[i], ORG_ID, i, false, DATA_ID_SUB)); + break; case OPERATEPOINT_Enums.RiskDealAudit: modelLogUpdate = GetUpdateDeal(OPERATEPOINT, DATA_ID, UserIDLogin, DATA_ID_SUB, TASK_ENDDT);//处理自己的 if (modelLogUpdate != null) @@ -297,7 +319,17 @@ namespace APT.BaseData.Services.DomainServices if (DATA_ID_SUB.HasValue) expression = expression.And(e => e.DATA_ID_SUB.HasValue && e.DATA_ID_SUB == DATA_ID_SUB); - var model = GetEntity(expression); + + //var model = GetEntity(expression); + var listModel = GetEntities(expression); + T_BS_OPERATE_LOG model = null; + if (listModel != null && listModel.Any()) + { + if (listModel.Count() == 1) + model = listModel.ToList()[0]; + else + model = listModel.OrderByDescending(e => e.CREATE_TIME).ToList()[0]; + } if (model != null) { model.OPERTETIME = DateTime.Now; diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSOperateLogController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSOperateLogController.cs index e746f80..2990a9a 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSOperateLogController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSOperateLogController.cs @@ -298,6 +298,9 @@ namespace APT.BS.WebApi.Controllers.Api foreach (var item in listEnums) { + if (item.ID == 195 || item.ID == 205)//驳回操作 不默认添加 + continue; + if (Start < item.ID && item.ID <= End) { if (!isAddApplyDely && (item.ID == 165 || item.ID == 170 || item.ID == 175)) diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs index 5d60a57..06979ac 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs @@ -4002,6 +4002,22 @@ namespace APT.BS.WebApi.Controllers.Api //给责任人 和落实人添加整改单 content.RiskContentState = (int)RiskContentState.OKNotBack; + + #region 操作日志 + + List listLog = null; + if (APT.Infrastructure.Api.AppContext.CurrentSession.UserID.HasValue && APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value == content.DEAL_USER_ID) + { + listLog = OperateLogService.GetListOperateLog(OPERATEPOINT_Enums.RiskDealDealCheckReject, entity.RISK_SUBMIT_ID.Value, APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value, null, new List() { content.ACTUAL_DEAL_USER_ID.Value }, new List() { content.Nav_UserActualDeal.NAME }, entity.ORG_ID, entity.RISK_SUBMIT_CONTENT_ID, null, false, content.LastDateUser.Value); + } + else + { + listLog = OperateLogService.GetListOperateLog(OPERATEPOINT_Enums.RiskDealCheckerCheckReject, entity.RISK_SUBMIT_ID.Value, APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value, null, new List() { content.ACTUAL_DEAL_USER_ID.Value }, new List() { content.Nav_UserActualDeal.NAME }, entity.ORG_ID, entity.RISK_SUBMIT_CONTENT_ID, null, false, content.LastDateUser.Value); + } + + #endregion + + this.UnifiedCommit(() => { UpdateEntityNoCommit(entity);//审核信息 验收状态修改 审批意见 完成情况 @@ -4013,6 +4029,8 @@ namespace APT.BS.WebApi.Controllers.Api BantchDeleteEntityNoCommit(ids); if (listFiles != null && listFiles.Any()) BantchSaveEntityNoCommit(listFiles); + if (listLog != null && listLog.Any()) + BantchSaveEntityNoCommit(listLog); }); #endregion