|
|
@@ -407,6 +407,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
|
|
|
if (status==1){
|
|
|
str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append(",请查看并审核。");
|
|
|
+ //新的流程是当前流程+1
|
|
|
newEa.setProcessStatus(useEa.getProcessStatus()+1);
|
|
|
pushExamineProcess(newEa);
|
|
|
if (newEa.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
|
|
|
@@ -458,11 +459,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
* @param newEa
|
|
|
*/
|
|
|
private void examineByprocess( ExpenseAccount newEa) {
|
|
|
+ //获取当前流程审核人,如果有已审核则跳过当前审核
|
|
|
List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
|
boolean flag=false;
|
|
|
+ String aid="";
|
|
|
for (ExpenseAccountExamine e : list) {
|
|
|
if (e.getStatus()==1){
|
|
|
flag=true;
|
|
|
+ aid=e.getAuditor();
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -470,13 +474,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
String str=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(newEa.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000l);
|
|
|
- List<ExpenseAccountExamine> expenseAccountExamineList = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus()+1);
|
|
|
- String aid="";
|
|
|
- for (ExpenseAccountExamine e : expenseAccountExamineList) {
|
|
|
- if (e.getStatus()==1){
|
|
|
- aid=e.getAuditor();
|
|
|
- }
|
|
|
- }
|
|
|
addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
if (newEa.getProcessStatus()<EAProcessStatus.WCSH.getCode())examineByprocess(newEa);
|