mitao
1 天以前 0d82e9bb89c8569847537f1ce8b9d994bbc4099b
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java
@@ -295,6 +295,13 @@
                    break;
                case 9:
                    OaApprovalApplicationAsset oaApprovalApplicationAssetBack = approvalApplicationAssetMap.get(approvalApplication.getId());
                    // 归还资产条数
                    List<OaApprovalApplicationAssetItem> back = approvalApplicationAssetItemMap.get(approvalApplication.getId());
                    // 借用资产条数
                    List<OaApprovalApplicationAssetItem> grab = approvalApplicationAssetItemMap.get(oaApprovalApplicationAssetBack.getBorrowApplicationId());
                    if (back.size()==grab.size()){
//                        approvalTodoVO.setReturnStatus(2);
                    }
                    if (oaApprovalApplicationAssetBack!=null){
                        approvalTodoVO.setOperateTime(oaApprovalApplicationAssetBack.getExpectReturnDate());
                    }