|
|
@@ -1035,7 +1035,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
private void pushExamineName(ExpenseAccount newEa, List<Admin> aids) {
|
|
|
List<ExpenseAccountExamine> list=expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
|
- StringBuffer aname =new StringBuffer();
|
|
|
+ StringBuilder aname =new StringBuilder();
|
|
|
for (ExpenseAccountExamine e : list) {
|
|
|
if (Objects.equals(e.getProcessStatus(), newEa.getProcessStatus()) &&e.getStatus()==0){
|
|
|
Admin ad=adminMapper.queryById(e.getAuditor());
|
|
|
@@ -1083,13 +1083,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
* @param newEa
|
|
|
*/
|
|
|
private void examineByprocess( ExpenseAccount newEa,AdminListBo admin,OrganizationListOut dep,List<ExpenseConfigDetails> list) {
|
|
|
- List<ExpenseAccountExamine> examineList=new ArrayList<>();
|
|
|
+ List<ExpenseAccountExamine> examineList;
|
|
|
//小于财务复审的,走单审核
|
|
|
if (newEa.getProcessStatus()<EAProcessStatus.CWFS.getCode()){
|
|
|
examineList = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
|
boolean flag=false;
|
|
|
String aid="";
|
|
|
- if (examineList.size()>0){
|
|
|
+ if (!examineList.isEmpty()){
|
|
|
for (ExpenseAccountExamine e : examineList) {
|
|
|
if (e.getStatus()==1){
|
|
|
flag=true;
|