From 05a35d68dbfcc8c81fd50c847da0abffaa830e33 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 16 Apr 2024 18:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=8E=8B=E6=A4=B0=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=9C=80=E4=BF=AE=E6=94=B9q'y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/params/QuickChangeMessageParam.java | 14 +++++++++++
 .../service/RemindMessageServiceImpl.java     | 25 +++++++++++++------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/organization/entity/chart/params/QuickChangeMessageParam.java b/src/com/engine/organization/entity/chart/params/QuickChangeMessageParam.java
index 34d6f620..ebc7a2dc 100644
--- a/src/com/engine/organization/entity/chart/params/QuickChangeMessageParam.java
+++ b/src/com/engine/organization/entity/chart/params/QuickChangeMessageParam.java
@@ -37,4 +37,18 @@ public class QuickChangeMessageParam {
     private String mergeName;
 
     private String content;
+
+    private boolean canceled;
+
+    /**
+     * 针对删除操作
+     */
+    private String departmentName;
+
+    private String subCompanyName;
+
+    /**
+     * 转移类型 1 部门到部门 2 部门到分部 3分部到分部
+     */
+    private Integer tranfeserType;
 }
diff --git a/src/com/engine/organization/service/RemindMessageServiceImpl.java b/src/com/engine/organization/service/RemindMessageServiceImpl.java
index b012da6f..d59e6695 100644
--- a/src/com/engine/organization/service/RemindMessageServiceImpl.java
+++ b/src/com/engine/organization/service/RemindMessageServiceImpl.java
@@ -67,7 +67,6 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
      */
     @SneakyThrows
     private RemindContentInfo remindContent(QuickChangeMessageParam param) {
-        RecordSet rs = new RecordSet();
         DepartmentComInfo deptComInfo = new DepartmentComInfo();
         SubCompanyComInfo supComInfo = new SubCompanyComInfo();
 
@@ -91,15 +90,24 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
                     content.append(departmentRealPath).append("，").append("已被删除，");
                     break;
                 case "8":
-                    content.append(departmentRealPath).append("，").append("已被封存，");
+                    content.append(departmentRealPath).append("，");
+                    if (param.isCanceled()) {
+                        content.append("已被恢复");
+                    }else {
+                        content.append("已被封存，");
+                    }
                     break;
                 case "6":
                     content.append(departmentNameF).append(" 已合并到公司：").append(subcompanyNameT).append(" 部门：").append(departmentNameT)
                             .append("， 合并后名称：").append(param.getMergeName()).append("，");
                     break;
                 case "5":
-                    content.append(departmentNameF).append(" 已转移到公司：").append(subcompanyNameT).append(" 部门：").append(departmentNameT)
-                            .append(" 下，");
+                    content.append(departmentNameF).append(" 已转移到公司：");
+                    if (param.getTranfeserType() == 2) {
+                        content.append(supComInfo.getSubCompanyname(param.getSubCompanyIdTo())).append(" 下，");
+                    }else {
+                        content.append(subcompanyNameT).append(" 部门：").append(departmentNameT).append(" 下，");
+                    }
                     break;
                 default :break;
             }
@@ -113,10 +121,11 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
                     content.append("已被删除，");
                     break;
                 case "8":
-                    content.append("已被封存，");
-                    break;
-                case "6":
-                    content.append("已合并到公司：").append(subCompanynameT).append("，合并后名称：").append(param.getMergeName()).append("，");
+                    if (param.isCanceled()) {
+                        content.append("已被恢复，");
+                    }else {
+                        content.append("已被封存，");
+                    }
                     break;
                 case "5":
                     content.append("已转移到公司：").append(subCompanynameT).append(" 下，");