| | |
|---|
| | | list.addAll(sortByCreateTime(passList)); |
|---|
| | | if(Constants.equalsInteger(level.getApproveType(),Constants.ONE)){ |
|---|
| | | //如果是会签 |
|---|
| | | if(waitList.size()>0){ |
|---|
| | | if(waitList.size()>1){ |
|---|
| | | Approve waitModel = new Approve(); |
|---|
| | | waitModel.setApproveType(Constants.ONE); |
|---|
| | | waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"审批人")); |
|---|
| | | waitModel.setStatus(Constants.equalsInteger(waitList.get(Constants.ZERO).getStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO); |
|---|
| | | waitModel.setStatusInfo("处理中"); |
|---|
| | | if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng)||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){ |
|---|
| | | waitModel.setMemberName(waitList.size() +"人会签（处理中）"); |
|---|
| | | if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng) |
|---|
| | | ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){ |
|---|
| | | waitModel.setMemberName(waitList.size() +"人会签"); |
|---|
| | | } |
|---|
| | | waitModel.setApproveList(waitList); |
|---|
| | | list.add(waitModel); |
|---|
| | | }else if(waitList.size()>0){ |
|---|
| | | list.add(waitList.get(Constants.ZERO)); |
|---|
| | | } |
|---|
| | | }else { |
|---|
| | | if((waitList.size()> 0 || otherPassList.size()>0)){ |
|---|
