|
|
@@ -170,7 +170,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
|
|
|
if (status==1){
|
|
|
- str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append("请查看并审核。");
|
|
|
+ str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append(",请查看并审核。");
|
|
|
if(useEa.getProcessStatus()== EAProcessStatus.FQ.getCode()){
|
|
|
//获取上级
|
|
|
aids.add(adminMapper.selectByPrimaryKey(admin.getSuperiorId()));
|
|
|
@@ -182,7 +182,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
newEa.setProcessStatus(EAProcessStatus.CWSH.getCode());
|
|
|
}else if (useEa.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
|
|
|
//获取部门负责人
|
|
|
- List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getId(), admin.getDepartmentId());
|
|
|
+ List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getDepartmentId(), AFTConstants.SALESMAN_ADMIN);
|
|
|
if (!list.isEmpty())aids.addAll(list);
|
|
|
newEa.setProcessStatus(EAProcessStatus.ZJLSH.getCode());
|
|
|
}else if (useEa.getProcessStatus()== EAProcessStatus.ZJLSH.getCode()){
|
|
|
@@ -195,11 +195,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
status =2;
|
|
|
aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
|
|
|
newEa.setStatus(status);
|
|
|
- str= str.append("您的报销审核已通过,请注意查看。");
|
|
|
+ str.setLength(0);
|
|
|
+ str=str.append("您的报销审核已通过,报销编号[").append(in.getId()).append("],请注意查看。");
|
|
|
}
|
|
|
}else {
|
|
|
aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
|
|
|
- str=new StringBuffer("您的报销审核已驳回,请注意查看。");
|
|
|
+ str.setLength(0);
|
|
|
+ str=str.append("您的报销审核已驳回,报销编号[").append(in.getId()).append("],请注意查看。");
|
|
|
}
|
|
|
addLogAndNoticeAndEmail(in, status,str.toString(),admin.getName(),aids);
|
|
|
}
|