|
|
@@ -158,9 +158,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
newEa.setId(useEa.getId());
|
|
|
if (useEa.getStatus()==0)throw new BusinessException("审核状态错误");
|
|
|
if (useEa.getProcessStatus()!=in.getProcessStatus())throw new BusinessException("审核流程错误");
|
|
|
- Integer status=1;
|
|
|
//审核通知 获取发送人
|
|
|
- addExamineExpenseAccountLog(in, useEa, newEa, status);
|
|
|
+ addExamineExpenseAccountLog(in, useEa, newEa, in.getStatus());
|
|
|
expenseAccountMapper.updateByPrimaryKeySelective(newEa);
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -168,34 +167,41 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
private void addExamineExpenseAccountLog(InputExpenseAccount in, ExpenseAccount useEa, ExpenseAccount newEa, Integer status) {
|
|
|
List<Admin> aids=new ArrayList<>();
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
- str=str.append("您有报销需要审核,请查看并审核。");
|
|
|
AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
|
|
|
- if(useEa.getProcessStatus()== EAProcessStatus.FQ.getCode()){
|
|
|
- //获取上级
|
|
|
- aids.add(adminMapper.selectByPrimaryKey(admin.getSuperiorId()));
|
|
|
- newEa.setProcessStatus(EAProcessStatus.SJSH.getCode());
|
|
|
-
|
|
|
- }else if (useEa.getProcessStatus()== EAProcessStatus.SJSH.getCode()){
|
|
|
- //获取负责人
|
|
|
- List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getId(), admin.getDepartmentId());
|
|
|
- if (!list.isEmpty())aids.addAll(list);
|
|
|
- newEa.setProcessStatus(EAProcessStatus.ZJLSH.getCode());
|
|
|
- }else if (useEa.getProcessStatus()== EAProcessStatus.ZJLSH.getCode()){
|
|
|
- //获取负责人
|
|
|
- aids.add(adminMapper.selectByPrimaryKey(admin.getDepFinance()));
|
|
|
- newEa.setProcessStatus(EAProcessStatus.CWSH.getCode());
|
|
|
- }else if (useEa.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
|
|
|
- //获取负责人
|
|
|
- List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.All_CED_AND_CHAIRMAN);
|
|
|
- if (!admins.isEmpty())aids.addAll(admins);
|
|
|
- newEa.setProcessStatus(EAProcessStatus.DSZSH.getCode());
|
|
|
- }else if (useEa.getProcessStatus()== EAProcessStatus.DSZSH.getCode()){
|
|
|
- //获取负责人
|
|
|
- status =2;
|
|
|
+ if (status==1){
|
|
|
+ str=str.append("您有报销需要审核,请查看并审核。");
|
|
|
+
|
|
|
+ if(useEa.getProcessStatus()== EAProcessStatus.FQ.getCode()){
|
|
|
+ //获取上级
|
|
|
+ aids.add(adminMapper.selectByPrimaryKey(admin.getSuperiorId()));
|
|
|
+ newEa.setProcessStatus(EAProcessStatus.SJSH.getCode());
|
|
|
+
|
|
|
+ }else if (useEa.getProcessStatus()== EAProcessStatus.SJSH.getCode()){
|
|
|
+ //获取负责人
|
|
|
+ List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getId(), admin.getDepartmentId());
|
|
|
+ if (!list.isEmpty())aids.addAll(list);
|
|
|
+ newEa.setProcessStatus(EAProcessStatus.ZJLSH.getCode());
|
|
|
+ }else if (useEa.getProcessStatus()== EAProcessStatus.ZJLSH.getCode()){
|
|
|
+ //获取负责人
|
|
|
+ aids.add(adminMapper.selectByPrimaryKey(admin.getDepFinance()));
|
|
|
+ newEa.setProcessStatus(EAProcessStatus.CWSH.getCode());
|
|
|
+ }else if (useEa.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
|
|
|
+ //获取负责人
|
|
|
+ List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.All_CED_AND_CHAIRMAN);
|
|
|
+ if (!admins.isEmpty())aids.addAll(admins);
|
|
|
+ newEa.setProcessStatus(EAProcessStatus.DSZSH.getCode());
|
|
|
+ }else if (useEa.getProcessStatus()== EAProcessStatus.DSZSH.getCode()){
|
|
|
+ //获取负责人
|
|
|
+ status =2;
|
|
|
+ aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
|
|
|
+ newEa.setStatus(status);
|
|
|
+ str=new StringBuffer("您的报销审核已通过,请注意查看。");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
|
|
|
- newEa.setStatus(status);
|
|
|
- str=new StringBuffer("您的报销审核已通过,请注意查看。");
|
|
|
+ str=new StringBuffer("您的报销审核已驳回,请注意查看。");
|
|
|
}
|
|
|
+
|
|
|
addLogAndNoticeAndEmail(in, status,str.toString(),admin.getName(),aids);
|
|
|
}
|
|
|
|