|
|
@@ -524,7 +524,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}else if (newEa.getProcessStatus()>EAProcessStatus.CWSH.getCode()){
|
|
|
pushFinanceCount(admin.getDepFinance(),useEa.getCreateTime(),3);
|
|
|
}
|
|
|
- expenseAccountExamineMapper.updateStatusByEaidAndAid(in.getId(),null,0);
|
|
|
+ expenseAccountExamineMapper.updateStatusByEaidAndAid(in.getId(),null,0,0);
|
|
|
}
|
|
|
|
|
|
expenseAccountMapper.updateByPrimaryKeySelective(newEa);
|
|
|
@@ -562,20 +562,24 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
Integer status=in.getStatus();
|
|
|
if (status==1){
|
|
|
//审核处理审核表
|
|
|
- expenseAccountExamineMapper.updateStatusByEaidAndAid(in.getId(),TokenManager.getAdminId(),1);
|
|
|
+ expenseAccountExamineMapper.updateStatusByEaidAndAid(in.getId(),TokenManager.getAdminId(),1,0);
|
|
|
str=str.append("编号[").append(in.getCheckNo()).append("]需要审核").append(",请查看并审核。");
|
|
|
newEa.setAid(useEa.getAid());
|
|
|
newEa.setCreateTime(useEa.getCreateTime());
|
|
|
newEa.setApplyDep(useEa.getApplyDep());
|
|
|
if(useEa.getProcessStatus()==EAProcessStatus.CNSH.getCode()){
|
|
|
- //完成后的流程
|
|
|
status =2;
|
|
|
+ expenseAccountExamineMapper.updateStatusByEaidAndAid(in.getId(),TokenManager.getAdminId(),1,1);
|
|
|
+ addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
+ //完成后的流程
|
|
|
aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
|
|
|
newEa.setStatus(status);
|
|
|
newEa.setExamineName("");
|
|
|
}else {
|
|
|
+ addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
//新的流程是当前流程+1
|
|
|
newEa.setProcessStatus(useEa.getProcessStatus()+1);
|
|
|
+ newEa.setStatus(1);
|
|
|
if (newEa.getApproval()==null)newEa.setApproval(useEa.getApproval());
|
|
|
List<ExpenseAccountExamine> list=examineByprocess(newEa,admin);
|
|
|
//未设置推送到完成
|
|
|
@@ -605,7 +609,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
str=str.append("您的报销审核已驳回,报销编号[").append(in.getCheckNo()).append("],请注意查看。");
|
|
|
}
|
|
|
if (newEa.getStatus()==null)newEa.setStatus(1);
|
|
|
- addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
addNoticeAndEmail(in, status,str.toString(),admin.getName(),aids);
|
|
|
}
|
|
|
|
|
|
@@ -761,7 +764,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CNSH.getCode());
|
|
|
if (expenseExamine){
|
|
|
flag2=true;
|
|
|
- str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CNSH.getDesc());
|
|
|
+ str=String.format("[%s]通过审核,完成报销流程",EAProcessStatus.CNSH.getDesc());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -771,6 +774,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),"1",str,date2);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
examineByprocess(newEa,admin,dep,list);
|
|
|
+
|
|
|
}else {
|
|
|
addExpenseAccountLog(newEa.getId(),2,newEa.getProcessStatus(),"1",str,date2);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus());
|
|
|
@@ -786,10 +790,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
private boolean pushExpenseExamine(List<ExpenseConfigDetails> list, ExpenseAccount newEa, List<ExpenseAccountExamine> examineList, Integer status) {
|
|
|
int configDetails=0;
|
|
|
if (status==EAProcessStatus.CWFS.getCode())configDetails=1;
|
|
|
- if (status==EAProcessStatus.DSZSH.getCode())configDetails=2;
|
|
|
- if (status==EAProcessStatus.CWGGLYSH.getCode())configDetails=3;
|
|
|
- if (status==EAProcessStatus.GSFSSH.getCode())configDetails=4;
|
|
|
- if (status==EAProcessStatus.CNSH.getCode())configDetails=5;
|
|
|
+ else if (status==EAProcessStatus.DSZSH.getCode())configDetails=2;
|
|
|
+ else if (status==EAProcessStatus.CWGGLYSH.getCode())configDetails=3;
|
|
|
+ else if (status==EAProcessStatus.GSFSSH.getCode())configDetails=4;
|
|
|
+ else if (status==EAProcessStatus.CNSH.getCode())configDetails=5;
|
|
|
int finalConfigDetails = configDetails;
|
|
|
List<ExpenseConfigDetails> collect = list.stream().filter(e -> e.getType() == finalConfigDetails).collect(Collectors.toList());
|
|
|
int count = 0;
|
|
|
@@ -798,12 +802,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
ExpenseAccountExamine eae=new ExpenseAccountExamine(newEa.getId(),status);
|
|
|
eae.setAuditor(e.getAid());
|
|
|
eae.setAuditorname(e.getAdminName());
|
|
|
+ eae.setStatus(0);
|
|
|
Integer i = expenseAccountExamineMapper.selectYesByParam(newEa.getId(), e.getAid());
|
|
|
if (i>0||e.getAid().equals(TokenManager.getAdminId())) {
|
|
|
eae.setStatus(1);
|
|
|
count++;
|
|
|
}
|
|
|
- examineList.add(eae);
|
|
|
+ expenseAccountExamineMapper.insertSelective(eae);
|
|
|
}
|
|
|
if (count==collect.size()){
|
|
|
return true;
|