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(" 下,");