|
|
@@ -86,6 +86,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
in.setReleaseEnd(DateUtils.StringToDate(in.getEndTimeStr(), AFTConstants.YYYYMMDDHHMMSS));
|
|
|
}
|
|
|
in.setStatus(1);
|
|
|
+ in.setProcessStatus(1);
|
|
|
//计算总金额
|
|
|
in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
|
|
|
if (useEA.getStatus()==0){
|
|
|
@@ -162,12 +163,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
newEa.setStatus(status);
|
|
|
str=new StringBuffer("您的报销审核已通过,请注意查看。");
|
|
|
}
|
|
|
- addLogAndNoticeAndEmail(useEa,status,str.toString(),aids);
|
|
|
+ addLogAndNoticeAndEmail(in,useEa,status,str.toString(),aids);
|
|
|
+ expenseAccountMapper.updateByPrimaryKeySelective(newEa);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- private void addLogAndNoticeAndEmail(ExpenseAccount useEa, Integer status, String str, List<Admin> aids) {
|
|
|
- addExpenseAccountLog(useEa.getId(),status,str);
|
|
|
+ private void addLogAndNoticeAndEmail(InputExpenseAccount in, ExpenseAccount useEa, Integer status, String str, List<Admin> aids) {
|
|
|
+ addExpenseAccountLog(useEa.getId(),status,in.getReason());
|
|
|
Date date= new Date();
|
|
|
Integer noticeStatus=NoticeStatus.EXPENSE_NOTICE.getCode();
|
|
|
if (status==2){
|