|
|
@@ -640,7 +640,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
OrganizationListOut dep = departmentMapper.selectAllById(newEa.getApplyDep());
|
|
|
List<ExpenseConfigDetails> configDetailsList = expenseConfigDetailsMapper.selectByDepId(newEa.getApplyDep());
|
|
|
if(useEa.getProcessStatus()==EAProcessStatus.CNSH.getCode()){
|
|
|
- boolean expenseExamine = pushExpenseExamine(configDetailsList, newEa, null, EAProcessStatus.CNSH.getCode());
|
|
|
+ boolean expenseExamine = pushExpenseExamine(configDetailsList, newEa, EAProcessStatus.CNSH.getCode());
|
|
|
if (expenseExamine){
|
|
|
//完成后的流程
|
|
|
status =2;
|
|
|
@@ -769,7 +769,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
flag2=true;
|
|
|
tip=EAProcessStatus.CWFS.getDesc();
|
|
|
}else {
|
|
|
- boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CNSH.getCode());
|
|
|
+ boolean expenseExamine = pushExpenseExamine(list, newEa, EAProcessStatus.CNSH.getCode());
|
|
|
if (expenseExamine){
|
|
|
flag3=true;
|
|
|
}
|
|
|
@@ -780,7 +780,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
tip="特批(财务选择)";
|
|
|
}else {
|
|
|
if (dep.getCeoExamine()==1){
|
|
|
- boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.DSZSH.getCode());
|
|
|
+ boolean expenseExamine = pushExpenseExamine(list, newEa, EAProcessStatus.DSZSH.getCode());
|
|
|
if (expenseExamine){
|
|
|
flag3=true;
|
|
|
}
|
|
|
@@ -795,7 +795,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
tip=EAProcessStatus.CWGGLYSH.getDesc();
|
|
|
aid=null;
|
|
|
}else {
|
|
|
- boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWGGLYSH.getCode());
|
|
|
+ boolean expenseExamine = pushExpenseExamine(list, newEa, EAProcessStatus.CWGGLYSH.getCode());
|
|
|
if (expenseExamine){
|
|
|
flag3=true;
|
|
|
}
|
|
|
@@ -805,7 +805,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
flag2=true;
|
|
|
tip=EAProcessStatus.GSFSSH.getDesc();
|
|
|
}else {
|
|
|
- boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.GSFSSH.getCode());
|
|
|
+ boolean expenseExamine = pushExpenseExamine(list, newEa, EAProcessStatus.GSFSSH.getCode());
|
|
|
if (expenseExamine){
|
|
|
flag3=true;
|
|
|
}
|
|
|
@@ -816,7 +816,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
tip=EAProcessStatus.CNSH.getDesc();
|
|
|
}else {
|
|
|
//财务出纳在审核时不与前置审核做同步
|
|
|
- pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CNSH.getCode());
|
|
|
+ pushExpenseExamine(list, newEa, EAProcessStatus.CNSH.getCode());
|
|
|
}
|
|
|
}
|
|
|
if (flag2){
|
|
|
@@ -837,7 +837,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private boolean pushExpenseExamine(List<ExpenseConfigDetails> list, ExpenseAccount newEa, List<ExpenseAccountExamine> examineList, Integer status) {
|
|
|
+ private boolean pushExpenseExamine(List<ExpenseConfigDetails> list, ExpenseAccount newEa, Integer status) {
|
|
|
int configDetails=0;
|
|
|
if (status==EAProcessStatus.CWFS.getCode())configDetails=1;
|
|
|
else if (status==EAProcessStatus.DSZSH.getCode())configDetails=2;
|
|
|
@@ -847,8 +847,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
int finalConfigDetails = configDetails;
|
|
|
List<ExpenseConfigDetails> collect = list.stream().filter(e -> e.getType() == finalConfigDetails).collect(Collectors.toList());
|
|
|
int count = 0;
|
|
|
- if (examineList==null)examineList=new ArrayList<>();
|
|
|
- else examineList.clear();
|
|
|
+ List<ExpenseAccountExamine> examineList=new ArrayList<>();
|
|
|
for (ExpenseConfigDetails e : collect) {
|
|
|
ExpenseAccountExamine eae=new ExpenseAccountExamine(newEa.getId(),status);
|
|
|
eae.setAuditor(e.getAid());
|