liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大王椰项目工作流提醒 修复分部名称 及部门全路径格式

This commit is contained in:
Chengliang 2024-04-25 15:23:35 +08:00
parent 79ef169464
commit ee481d8d6f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/organization/service/impl/RemindMessageServiceImpl.java
View File

@ -9,7 +9,6 @@ import com.engine.organization.service.RemindMessageService;
import com.engine.organization.util.OrganizationCommonUtil; import com.engine.organization.util.OrganizationCommonUtil;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import weaver.conn.RecordSet;
import weaver.general.BaseBean; import weaver.general.BaseBean;
import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo; import weaver.hrm.company.SubCompanyComInfo;
@ -71,7 +70,7 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
DepartmentComInfo deptComInfo = new DepartmentComInfo(); DepartmentComInfo deptComInfo = new DepartmentComInfo();
SubCompanyComInfo supComInfo = new SubCompanyComInfo(); SubCompanyComInfo supComInfo = new SubCompanyComInfo();
StringBuilder content = new StringBuilder("提醒："); StringBuilder content = new StringBuilder();
content.append("公司："); content.append("公司：");
if ("dept".equals(param.getType())) { if ("dept".equals(param.getType())) {
String departmentNameF = deptComInfo.getDepartmentName(param.getDepartmentIdFrom()); String departmentNameF = deptComInfo.getDepartmentName(param.getDepartmentIdFrom());
@ -84,7 +83,7 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
content.append(subcompanyNameF).append(",").append(" 部门："); content.append(subcompanyNameF).append(",").append(" 部门：");
String departmentRealPath = deptComInfo.getDepartmentRealPath(param.getDepartmentIdFrom(), "/", ""); String departmentRealPath = deptComInfo.getDepartmentRealPath(param.getDepartmentIdFrom(), ">", "0");
switch (param.getOperateType().getValue()){ switch (param.getOperateType().getValue()){
case "4": case "4":
@ -114,13 +113,15 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
} }
}else { }else {
String subCompanynameT = supComInfo.getSubCompanyname(param.getSubCompanyIdTo()); String subCompanynameT = supComInfo.getSubCompanyname(param.getSubCompanyIdTo());
String subCompanynameF = supComInfo.getSubCompanyname(param.getSubCompanyIdFrom());
content.append(param.getSubCompanyIdFrom()).append(",");
switch (param.getOperateType().getValue()){ switch (param.getOperateType().getValue()){
case "4": case "4":
content.append(param.getSubCompanyIdFrom()).append(",");
content.append("已被删除，"); content.append("已被删除，");
break; break;
case "8": case "8":
content.append(subCompanynameF).append(",");
if (param.isCanceled()) { if (param.isCanceled()) {
content.append("已被恢复，"); content.append("已被恢复，");
}else { }else {
@ -128,6 +129,7 @@ public class RemindMessageServiceImpl extends Service implements RemindMessageSe
} }
break; break;
case "5": case "5":
content.append(subCompanynameF).append(",");
content.append("已转移到公司：").append(subCompanynameT).append(" 下，"); content.append("已转移到公司：").append(subCompanynameT).append(" 下，");
break; break;
default :break; default :break;