|
|
@@ -142,14 +142,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
* @param status 状态 0创建 1发起 2通过 3驳回 4修改
|
|
|
* @param str 备注
|
|
|
*/
|
|
|
- private void addExpenseAccountLog(Integer eaid, Integer status,String aid, String str) {
|
|
|
- if (aid==null)aid=TokenManager.getAdminId();
|
|
|
- ExpenseAccountLog eaLog=new ExpenseAccountLog();
|
|
|
- eaLog.setEaid(eaid);
|
|
|
- eaLog.setStatus(status);
|
|
|
- eaLog.setRemarks(str);
|
|
|
- eaLog.setAuditor(aid);
|
|
|
- expenseAccountLogMapper.insertSelective(eaLog);
|
|
|
+ private void addExpenseAccountLog(Integer eaid, Integer status,Integer processStatus,String aid, String str) {
|
|
|
+ addExpenseAccountLog(eaid,status,processStatus,aid,str,null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -158,26 +152,29 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
* @param status 状态 0创建 1发起 2通过 3驳回 4修改
|
|
|
* @param str 备注
|
|
|
*/
|
|
|
- private void addExpenseAccountLog(Integer eaid, Integer status,String aid, String str,Date date) {
|
|
|
+ private void addExpenseAccountLog(Integer eaid, Integer status,Integer processStatus,String aid, String str,Date date) {
|
|
|
if (aid==null)aid=TokenManager.getAdminId();
|
|
|
ExpenseAccountLog eaLog=new ExpenseAccountLog();
|
|
|
eaLog.setEaid(eaid);
|
|
|
eaLog.setStatus(status);
|
|
|
eaLog.setRemarks(str);
|
|
|
+ eaLog.setProcessStatus(processStatus);
|
|
|
eaLog.setAuditor(aid);
|
|
|
- eaLog.setCreateTime(date);
|
|
|
+ if (date !=null)eaLog.setCreateTime(date);
|
|
|
expenseAccountLogMapper.insertSelective(eaLog);
|
|
|
}
|
|
|
|
|
|
private void addExpenseAccountLogAndNoticEmail(InputExpenseAccount in, Integer status, String str) {
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
- addExpenseAccountLog(in.getId(),status,aid,str);
|
|
|
+ addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
|
|
|
//正常是走入上级审核,但是可能会跳过
|
|
|
if(status>0){
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
|
if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
|
|
|
String str2=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(in.getProcessStatus()));
|
|
|
- addExpenseAccountLog(in.getId(),1,aid,str2);
|
|
|
+ Date date=new Date();
|
|
|
+ date.setTime(date.getTime()+1000L);
|
|
|
+ addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date);
|
|
|
in.setProcessStatus(in.getProcessStatus()+1);
|
|
|
}
|
|
|
createExamineByProcess(in);
|
|
|
@@ -313,7 +310,16 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
@Override
|
|
|
public Object logList(Integer eaid) {
|
|
|
- return expenseAccountLogMapper.selectByEaid(eaid);
|
|
|
+ List<OutExpenseAccountLog> list = expenseAccountLogMapper.selectByEaid(eaid);
|
|
|
+ int maxProcessStatus=0;
|
|
|
+ for (OutExpenseAccountLog e : list) {
|
|
|
+ if (e.getProcessStatus()>maxProcessStatus){
|
|
|
+ maxProcessStatus=e.getProcessStatus();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<OutExpenseAccountLog> eaelist = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, maxProcessStatus);
|
|
|
+ list.addAll(eaelist);
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -410,7 +416,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
str=str.append("您的报销审核已驳回,报销编号[").append(in.getId()).append("],请注意查看。");
|
|
|
}
|
|
|
if (newEa.getStatus()==null)newEa.setStatus(1);
|
|
|
- addExpenseAccountLog(in.getId(),status,null,in.getReason());
|
|
|
+ addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
addNoticeAndEmail(in, status,str.toString(),admin.getName(),aids);
|
|
|
}
|
|
|
|
|
|
@@ -423,7 +429,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
private void examineByprocess( ExpenseAccount newEa) {
|
|
|
- List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndType(newEa.getId(), newEa.getProcessStatus());
|
|
|
+ List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
|
boolean flag=false;
|
|
|
for (ExpenseAccountExamine e : list) {
|
|
|
if (e.getStatus()==1){
|
|
|
@@ -435,7 +441,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
String str=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(newEa.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000l);
|
|
|
- addExpenseAccountLog(newEa.getId(),1,null,str,date);
|
|
|
+ addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),TokenManager.getAdminId(),str,date);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
if (newEa.getProcessStatus()<EAProcessStatus.WCSH.getCode())examineByprocess(newEa);
|
|
|
}
|
|
|
@@ -496,7 +502,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Override
|
|
|
public Object selectById(Integer id) {
|
|
|
OutExpenseAccount useEa = expenseAccountMapper.selectByid(id);
|
|
|
- List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndType(id, useEa.getProcessStatus());
|
|
|
+ List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndProcessStatus(id, useEa.getProcessStatus());
|
|
|
boolean flag=false;
|
|
|
for (ExpenseAccountExamine e : list) {
|
|
|
if (e.getAuditor().equals(TokenManager.getAdminId())){
|