ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

履职节点添加 驳回节点

Browse Source 
整改记录驳回 履职记录处理
履职修改 处理 使适配 多节点
履职查看 显示优化
This commit is contained in:
wyw 2024-07-12 15:54:38 +08:00
parent eba7e9ada9
commit 68d5ab68c6
6 changed files with 90 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
View File

@ -2337,7 +2337,16 @@ namespace APT.BaseData.Services.Services.FM
Expression<Func<T_BS_OPERATE_LOG, bool>> 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;

11
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -8580,7 +8580,16 @@ namespace APT.BaseData.Services.DomainServices
Expression<Func<T_BS_OPERATE_LOG, bool>> 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;

20
APT.MS.Domain/Enums/BS/BSEnums.cs
View File

@ -1404,7 +1404,7 @@ namespace APT.MS.Domain.Enums
/// <summary>
/// 表单获取 10
/// </summary>
[Description("表单获取")]
[Description("任务获取")]
GotCheck = 10,
/// <summary>
@ -1426,9 +1426,9 @@ namespace APT.MS.Domain.Enums
CheckerCheck = 40,
/// <summary>
/// 跑批检查登记 48
/// 接收检查登记单 48
/// </summary>
[Description("跑批检查登记")]
[Description("接收检查登记单")]
CheckRegisterRun = 48,
/// <summary>
@ -1523,7 +1523,7 @@ namespace APT.MS.Domain.Enums
/// <summary>
/// 验收人确认 175
/// </summary>
[Description("验收人确认")]
[Description("延期验收人确认")]
RiskDelayApplyCheck = 175,
/// <summary>
@ -1538,12 +1538,24 @@ namespace APT.MS.Domain.Enums
[Description("整改责任人确认")]
RiskDealDealCheck = 190,
/// <summary>
/// 整改责任人拒绝 195
/// </summary>
[Description("整改责任人拒绝")]
RiskDealDealCheckReject = 195,
/// <summary>
/// 整改验收人确认 200
/// </summary>
[Description("整改验收人确认")]
RiskDealCheckerCheck = 200,
/// <summary>
/// 整改验收人拒绝 205
/// </summary>
[Description("整改验收人拒绝")]
RiskDealCheckerCheckReject = 205,
/// <summary>
/// 整改审批 210
/// </summary>

34
APT.MS.Services/Services/BS/BSOperateLogService.cs
View File

@ -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;

3
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSOperateLogController.cs
View File

@ -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))

18
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
View File

@ -4002,6 +4002,22 @@ namespace APT.BS.WebApi.Controllers.Api
//给责任人 和落实人添加整改单
content.RiskContentState = (int)RiskContentState.OKNotBack;
#region 操作日志
List<T_BS_OPERATE_LOG> 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<Guid>() { content.ACTUAL_DEAL_USER_ID.Value }, new List<string>() { 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<Guid>() { content.ACTUAL_DEAL_USER_ID.Value }, new List<string>() { 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<T_BS_RISK_SUBMIT_CONTENT_DEAL_AFTER_FILE>(ids);
if (listFiles != null && listFiles.Any())
BantchSaveEntityNoCommit(listFiles);
if (listLog != null && listLog.Any())
BantchSaveEntityNoCommit(listLog);
});
#endregion