| | |
|---|
| | | .eq(EnforceCheckLog::getOrderId, orderId).orderByAsc(EnforceCheckLog::getCheckTime) |
|---|
| | | ); |
|---|
| | | if (order.getApplyTime()!=null){ |
|---|
| | | vos.add(new OrderNodeVo("提交申请",order.getApplyUser(),order.getApplyTime(), null)); |
|---|
| | | vos.add(new OrderNodeVo("提交申请",order.getApplyUser(),order.getApplyDeptName(),order.getApplyTime(), null)); |
|---|
| | | } |
|---|
| | | if (StringUtils.isNotEmpty(checkLogs)){ |
|---|
| | | for (EnforceCheckLog checkLog : checkLogs) { |
|---|
| | | |
|---|
| | | if (checkLog.getCheckStatus()>0){ |
|---|
| | | vos.add(new OrderNodeVo("审批通过",checkLog.getCheckUser(),checkLog.getCheckTime(), null)); |
|---|
| | | vos.add(new OrderNodeVo("审批通过",checkLog.getCheckUser(),userService.getDeptNameByUserId(checkLog.getCheckId()),checkLog.getCheckTime(), null)); |
|---|
| | | } else { |
|---|
| | | vos.add(new OrderNodeVo("审批拒绝",checkLog.getCheckUser(),checkLog.getCheckTime(), checkLog.getCheckReason())); |
|---|
| | | vos.add(new OrderNodeVo("审批拒绝",checkLog.getCheckUser(),userService.getDeptNameByUserId(checkLog.getCheckId()),checkLog.getCheckTime(), checkLog.getCheckReason())); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (order.getInTime()!=null){ |
|---|
| | | vos.add(new OrderNodeVo("扫码入企",order.getExecuteUser(),order.getInTime(), null)); |
|---|
| | | vos.add(new OrderNodeVo("扫码入企",order.getExecuteUser(),order.getExecuteDeptName(),order.getInTime(), null)); |
|---|
| | | } |
|---|
| | | if (order.getExecuteTime()!=null){ |
|---|
| | | vos.add(new OrderNodeVo("结果上报",order.getExecuteUser(),order.getExecuteTime(), null)); |
|---|
| | | vos.add(new OrderNodeVo("结果上报",order.getExecuteUser(),order.getExecuteDeptName(),order.getExecuteTime(), null)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | return vos; |
|---|
