|
|
@@ -1104,7 +1104,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000l);
|
|
|
addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date,2);
|
|
|
- if (newEa.getProcessStatus()==EAProcessStatus.BMFZRSH.getCode()){
|
|
|
+ if (Objects.equals(newEa.getProcessStatus(), EAProcessStatus.BMFZRSH.getCode())){
|
|
|
addFinanceCount(admin.getDepFinance(),newEa.getCreateTime());
|
|
|
}
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
@@ -1121,7 +1121,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
date2.setTime(date2.getTime()+1000l);
|
|
|
String tip=null;
|
|
|
String aid=null;
|
|
|
- if (newEa.getProcessStatus()==EAProcessStatus.CWFS.getCode()){
|
|
|
+ if (Objects.equals(newEa.getProcessStatus(), EAProcessStatus.CWFS.getCode())){
|
|
|
//财务复审财务复审
|
|
|
if (dep.getExpenseRetrialFinanceExamine()==0){
|
|
|
flag2=true;
|
|
|
@@ -1132,7 +1132,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
flag3=true;
|
|
|
}
|
|
|
}
|
|
|
- }else if (newEa.getProcessStatus()==EAProcessStatus.DSZSH.getCode()){
|
|
|
+ }else if (Objects.equals(newEa.getProcessStatus(), EAProcessStatus.DSZSH.getCode())){
|
|
|
if (newEa.getApproval()!=1){
|
|
|
flag2=true;
|
|
|
tip="特批(财务选择)";
|