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

同步代码

Browse Source
This commit is contained in:
wjn 2024-04-10 15:03:00 +08:00
parent 20b2de466f
commit 9d2218f786
6 changed files with 128 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
throw new Exception("对应岗位人员已填写，请刷新确认!");
}
var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var afterUsers = entity.Nav_AfterUsers;
var afterUsers = entity.Nav_AfterUsers.Where(t=>t.IS_DELETED==false);
if (afterUsers.Count() == 0)
{
throw new Exception("请选择接班人员!");

37
APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
View File

@ -154,7 +154,25 @@ namespace APT.FO.WebApi.Controllers.Api.FO
return true;
});
}
/// <summary>
/// 更新--已阅
/// </summary>
[HttpPost, Route("TeamActivityUserRead")]
public JsonActionResult<bool> TeamActivityUserRead([FromBody] T_FO_TEAM_ACTIVITY entity)
{
return SafeExecute<bool>(() =>
{
if (entity.TaskID == Guid.Empty)
{
throw new Exception("没有待办任务ID,请刷新重试!");
}
NotificationTaskService.NotificationTaskFinish(entity.TaskID, () =>
{
});
return true;
});
}
/// <summary>
/// 更新--保存签到
/// </summary>
@ -204,25 +222,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
});
}
/// <summary>
/// 更新--已阅
/// </summary>
[HttpPost, Route("TeamActivityUserRead")]
public JsonActionResult<bool> TeamActivityUserRead([FromBody] T_FO_TEAM_ACTIVITY entity)
{
return SafeExecute<bool>(() =>
{
if (entity.TaskID == Guid.Empty)
{
throw new Exception("没有待办任务ID,请刷新重试!");
}
NotificationTaskService.NotificationTaskFinish(entity.TaskID, () =>
{
});
return true;
});
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>

15
APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs
View File

@ -97,18 +97,27 @@ namespace APT.HM.WebApi.Controllers.Api
entity.APPROVECODE = null;
//是否需要发审批流，false不发，true的时候默认只发当前审核人
var isSendApprove = false;
var isFinish = Guid.Empty;
//var isFinish = Guid.Empty;
T_FM_NOTIFICATION_TASK task = null;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
entity.STATUS = FOPreMeetingStatusEnum.审核中;
isSendApprove = true;
entity.APPROVECODE = DateTime.Now.ToString("yyyyMMddHHmmss");
isFinish = entity.TaskID;
//isFinish = entity.TaskID;
if (entity.TaskID != Guid.Empty)
{
task = NotificationTaskService.GetEntityTask(entity.TaskID, "HM101_SHOWPRINT");
if (task.SOURCE_DATA_ID == null)
task.SOURCE_DATA_ID = entity.ID;
}
MFlowPermitService.InsertApprove(entity.APPROVECODE, "HM102", null, entity.ID, "HM101_SHOWPRINT", isFinish, isSendApprove, () =>
}
MFlowPermitService.InsertApprove(entity.APPROVECODE, "HM102", null, entity.ID, "HM101_SHOWPRINT", null, isSendApprove, () =>
{
if (entity != null)
UpdateEntityNoCommit(entity); //保存主表
if (task != null)
UpdateEntityNoCommit(task);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files); //保存子表
if (riskDetail != null && riskDetail.Any())

17
APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs
View File

@ -43,7 +43,6 @@ namespace APT.HM.WebApi.Controllers.Api
/// <returns></returns>
[HttpPost, Route("FullUpdate")]
public JsonActionResult<bool> FullUpdate([FromBody] T_HM_RISK_TASK entity)
{
{
return SafeExecute<bool>(() =>
{
@ -101,13 +100,20 @@ namespace APT.HM.WebApi.Controllers.Api
entity.APPROVECODE = null;
//是否需要发审批流，false不发，true的时候默认只发当前审核人
var isSendApprove = false;
var isFinish = Guid.Empty;
//var isFinish = Guid.Empty;
T_FM_NOTIFICATION_TASK task = null;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
entity.STATUS = FOPreMeetingStatusEnum.审核中;
isSendApprove = true;
entity.APPROVECODE = DateTime.Now.ToString("yyyyMMddHHmmss");
isFinish = entity.TaskID;
//isFinish = entity.TaskID;
if (entity.TaskID != Guid.Empty)
{
task = NotificationTaskService.GetEntityTask(entity.TaskID, "HM061_SHOWPRINT");
if (task.SOURCE_DATA_ID == null)
task.SOURCE_DATA_ID = entity.ID;
}
}
var param = "";
//0908 修改按最高层级触发审批
@ -124,10 +130,12 @@ namespace APT.HM.WebApi.Controllers.Api
param = "CJ";
}
MFlowPermitService.InsertApprove(entity.APPROVECODE, "HM062", param, entity.ID, "HM061_SHOWPRINT", isFinish, isSendApprove, () =>
MFlowPermitService.InsertApprove(entity.APPROVECODE, "HM062", param, entity.ID, "HM061_SHOWPRINT", null, isSendApprove, () =>
{
if (entity != null)
UpdateEntityNoCommit(entity); //保存主表
if (task != null)
UpdateEntityNoCommit(task);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files); //保存子表
if (identifyings != null && identifyings.Any())
@ -142,7 +150,6 @@ namespace APT.HM.WebApi.Controllers.Api
return true;
});
}
}
/// <summary>
/// 审批流回调

1
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs
View File

@ -8,7 +8,6 @@ using System.Collections.Generic;
using System.Linq;
using APT.Infrastructure.Core;
using APT.BaseData.Domain.ApiModel;
using System.Data;
using System.IO;
using APT.BaseData.Domain.Entities.FM;