|
|
@@ -706,6 +706,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
newEa.setProcessStatus(0);
|
|
|
str.setLength(0);
|
|
|
str=str.append("您的报销审核已驳回,报销编号[").append(in.getCheckNo()).append("],请注意查看。");
|
|
|
+ addExpenseAccountLog(in.getId(),newEa.getStatus(),useEa.getProcessStatus(),TokenManager.getAdminId(),str.toString());
|
|
|
}
|
|
|
if (newEa.getStatus()==null)newEa.setStatus(1);
|
|
|
addNoticeAndEmail(in, status,str.toString(),admin.getName(),aids);
|
|
|
@@ -1097,7 +1098,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
expenseAccountMapper.updateByPrimaryKeySelective(update);
|
|
|
}else if (in.getStatus()==4){
|
|
|
expenseAccountMapper.updateByMainId(in.getId(),0);
|
|
|
- addExpenseAccountLog(in.getId(),4,0,in.getAid(),"撤销报销审核");
|
|
|
+ addExpenseAccountLog(in.getId(),4,0,TokenManager.getAdminId(),"撤销报销审核");
|
|
|
List<ExpenseRelationship> list = expenseRelationshipMapper.selectById(in.getId());
|
|
|
//撤销日志处理,先将日志改在挂子编号上,在新发起的时候再从自编号加到新编号上
|
|
|
if (list.size()==1){
|