|
|
@@ -195,7 +195,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
/**
|
|
|
* 发起、驳回发起流程切换和日志站内信发送
|
|
|
*/
|
|
|
- private void addExpenseAccountLogAndNoticEmail(InputExpenseAccount in, Integer status, String str) {
|
|
|
+ private void addExpenseAccountLogAndNoticEmail(ExpenseAccount in, Integer status, String str) {
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
|
@@ -216,7 +216,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
/**
|
|
|
* 判断审核流程与发送日志与邮件
|
|
|
*/
|
|
|
- private void createExamineByProcess(InputExpenseAccount in) {
|
|
|
+ private void createExamineByProcess(ExpenseAccount in) {
|
|
|
//审核流程推送到最新
|
|
|
AdminListBo admin = adminMapper.getDeptNameByAid(in.getAid());
|
|
|
examineByprocess(in,admin);
|
|
|
@@ -264,12 +264,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
|
|
|
}
|
|
|
in.setProcessStatus(0);
|
|
|
- if (useEA.getStatus()==0){
|
|
|
- addExpenseAccountLogAndNoticEmail(in,0,"发起报销审核");
|
|
|
- }else if (useEA.getStatus()==3){
|
|
|
- addExpenseAccountLogAndNoticEmail(in,4,"修改并发起审核");
|
|
|
- }
|
|
|
-
|
|
|
if (in.getOrderNo()==null){
|
|
|
in.setTargetType(0);
|
|
|
}else {
|
|
|
@@ -286,8 +280,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//并且要处理原编号的问题
|
|
|
pushresettingDebit(in,useEA.getDebitId());
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
+ in.setStatus(0);
|
|
|
return expenseAccountMapper.updateByPrimaryKeySelective(in);
|
|
|
}
|
|
|
|
|
|
@@ -624,7 +618,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
return str.substring(0,str.length()-1);
|
|
|
}
|
|
|
|
|
|
- private void addNoticeAndEmail(InputExpenseAccount in, Integer status, String str,String aname, List<Admin> aids) {
|
|
|
+ private void addNoticeAndEmail(ExpenseAccount in, Integer status, String str,String aname, List<Admin> aids) {
|
|
|
Date date= new Date();
|
|
|
|
|
|
Integer noticeStatus=NoticeStatus.EXPENSE_NOTICE.getCode();
|
|
|
@@ -754,8 +748,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (in.getApplyDep()!=null)update.setApplyDep(in.getApplyDep());
|
|
|
if (in.getRemarks()!=null)update.setRemarks(in.getRemarks());
|
|
|
if (in.getEaaid()!=null)update.setEaaid(in.getEaaid());
|
|
|
- update.setProcessStatus(1);
|
|
|
addExpenseAccountExamine(in.getId(),update);
|
|
|
+ update.setProcessStatus(1);
|
|
|
+ if (outExpenseAccount.getStatus()==0){
|
|
|
+ outExpenseAccount.setProcessStatus(1);
|
|
|
+ addExpenseAccountLogAndNoticEmail(outExpenseAccount,0,"发起报销审核");
|
|
|
+ }else if (outExpenseAccount.getStatus()==3){
|
|
|
+ addExpenseAccountLogAndNoticEmail(outExpenseAccount,4,"修改并发起审核");
|
|
|
+ }
|
|
|
}else if (in.getStatus()==4){
|
|
|
expenseAccountMapper.updateByMainId(in.getId(),0);
|
|
|
}
|