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

同步sms代码

Browse Source
This commit is contained in:
wjn 2024-04-10 16:32:47 +08:00
parent c24c1e1b4e
commit 668faf0a40
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
View File

@ -62,6 +62,40 @@ namespace APT.FO.WebApi.Controllers.Api.FO
UpdateEntity(finishNotice); UpdateEntity(finishNotice);
throw new Exception("你已提交,不能修改!"); throw new Exception("你已提交,不能修改!");
} }
var currUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var currFMUser = GetEntity<T_FM_USER>((Guid)currUser, "Nav_Person.Nav_Post", "Nav_Department.Nav_Parent");
if (currFMUser != null)
{
var team = GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == currFMUser.DEPARTMENT_ID);
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.CLASS_TEAM_ID == null)
{
if (team != null)
{
entity.CLASS_TEAM_ID = team.ID;
}
}
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.DEPARTMENT_POST_ID == null)
{
entity.DEPARTMENT_POST_ID = currFMUser.Nav_Person.POST_ID;
}
if (entity.NAME == null)
{
isManual = true;
entity.NAME = DateTime.Now.ToShortDateString() + team.NAME + "-" + currFMUser.Nav_Person.Nav_Post.NAME + "当班工作记录";
entity.RECORD_DATE = DateTime.Now;
}
if (entity.CHARGE_USER_ID == null || entity.CHARGE_USER_ID == Guid.Empty)
{
entity.CHARGE_USER_ID = currFMUser.Nav_Department.USER_ID;
}
if (entity.DEPARTMENT_ID == null || entity.DEPARTMENT_ID == Guid.Empty)
{
entity.DEPARTMENT_ID = currFMUser.Nav_Department.Nav_Parent.ID;
}
}
entity.EDITOR_ID = currUser;
var files = entity.Nav_Files; var files = entity.Nav_Files;
if(files != null) if(files != null)
{ {
@ -79,39 +113,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
T_FO_CURRENT_CLASS_RECORD_USER currUserRecord = null; T_FO_CURRENT_CLASS_RECORD_USER currUserRecord = null;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
var currUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var currFMUser = GetEntity<T_FM_USER>((Guid)currUser, "Nav_Person.Nav_Post", "Nav_Department.Nav_Parent");
if (currFMUser != null)
{
var team = GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == currFMUser.DEPARTMENT_ID);
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.CLASS_TEAM_ID == null)
{
if (team != null)
{
entity.CLASS_TEAM_ID = team.ID;
}
}
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.DEPARTMENT_POST_ID == null)
{
entity.DEPARTMENT_POST_ID = currFMUser.Nav_Person.POST_ID;
}
if (entity.NAME == null)
{
isManual = true;
entity.NAME = DateTime.Now.ToShortDateString() + team.NAME + "-" + currFMUser.Nav_Person.Nav_Post.NAME + "当班工作记录";
entity.RECORD_DATE = DateTime.Now;
}
if (entity.CHARGE_USER_ID == null || entity.CHARGE_USER_ID == Guid.Empty)
{
entity.CHARGE_USER_ID = currFMUser.Nav_Department.USER_ID;
}
if (entity.DEPARTMENT_ID == null || entity.DEPARTMENT_ID == Guid.Empty)
{
entity.DEPARTMENT_ID = currFMUser.Nav_Department.Nav_Parent.ID;
}
}
entity.EDITOR_ID = currUser;
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID, "FO005_SHOWPRINT"); finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID, "FO005_SHOWPRINT");

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

@ -69,7 +69,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
T_FM_NOTIFICATION_TASK finishTask = null; T_FM_NOTIFICATION_TASK finishTask = null;
if (entity.TaskID != Guid.Empty && entity.OpType != null && entity.OpType == 0) if (entity.TaskID != Guid.Empty && entity.OpType != null && entity.OpType == 0)
{ {
finishTask = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID); finishTask = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID, "FO010_SHOWPRINT");
} }
//事务控制 //事务控制
this.UnifiedCommit(() => this.UnifiedCommit(() =>