From 668faf0a4061e343e1bca1f9abbe8d5be7a874b3 Mon Sep 17 00:00:00 2001
From: wjn <xmwjn@qq.com>
Date: Wed, 10 Apr 2024 16:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5sms=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/CurrentClassRecord.cs         | 67 ++++++++++---------
 .../Controllers/TeamActivityController.cs     |  2 +-
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
index 3d51885..cc9c412 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
@@ -62,6 +62,40 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                         UpdateEntity(finishNotice);
                         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;
                     if(files != null)
                     {
@@ -79,39 +113,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                     T_FO_CURRENT_CLASS_RECORD_USER currUserRecord = null;
                     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)
                         {
                             finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID, "FO005_SHOWPRINT");
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
index 5a26eeb..9e63afe 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
@@ -69,7 +69,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                 T_FM_NOTIFICATION_TASK finishTask = null;
                 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(() =>