Merge remote-tracking branch 'origin/master'

mitao

2 天以前 f769d817f8ba2522147c73fa93ccacdc3aab0cb6

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java

@@ -263,7 +263,7 @@
                    if (oaApprovalApplicationAssetBack!=null){
                        approvalTodoVO.setTitle(oaApprovalApplicationAssetBack.getTitle());

                        approvalTodoVO.setOperateTime(oaApprovalApplicationAssetBack.getExpectReturnDate());
                        approvalTodoVO.setOperateTime(oaApprovalApplicationAssetBack.getOperateTime());
                    }
                    break;
                case 10:
@@ -466,7 +466,7 @@
                    if (oaApprovalApplicationAssetBack!=null){
                        approvalTodoVO.setTitle(oaApprovalApplicationAssetBack.getTitle());

                        approvalTodoVO.setOperateTime(oaApprovalApplicationAssetBack.getExpectReturnDate());
                        approvalTodoVO.setOperateTime(oaApprovalApplicationAssetBack.getOperateTime());
                    }
                    break;
                case 10:
@@ -601,27 +601,72 @@
                            List<OaApprovalApplicationAssetItem> back = approvalApplicationAssetItemService.lambdaQuery()
                                    .eq(OaApprovalApplicationAssetItem::getApprovalApplicationId, approvalApplications.getId())
                                    .list();
                           // 借用资产条数
                            OaApprovalApplicationAsset borrowApplications = approvalApplicationAssetService.lambdaQuery()
                            OaApprovalApplicationAsset backAsset = approvalApplicationAssetService.lambdaQuery()
                                    .eq(OaApprovalApplicationAsset::getApprovalApplicationId, approvalApplications.getId())
                                    .last("limit 1").one();
                            // 借用资产条数
                            List<OaApprovalApplicationAssetItem> borrow = approvalApplicationAssetItemService.lambdaQuery()
                                    .eq(OaApprovalApplicationAssetItem::getApprovalApplicationId, borrowApplications.getId())
                                    .eq(OaApprovalApplicationAssetItem::getApprovalApplicationId, backAsset.getBorrowApplicationId())
                                    .list();
                            List<AssetMain> list = assetMainService.lambdaQuery().in(AssetMain::getId, back.stream().map(OaApprovalApplicationAssetItem::getAssetMainId)
                                            .collect(Collectors.toList()))
                                    .list();
                            List<AssetMain> listBorrow = assetMainService.lambdaQuery().in(AssetMain::getId, borrow.stream().map(OaApprovalApplicationAssetItem::getAssetMainId)
                                            .collect(Collectors.toList()))
                                    .list();
                            OaApprovalApplicationAsset borrowApplicationAsset = approvalApplicationAssetService.lambdaQuery()
                                    .eq(OaApprovalApplicationAsset::getApprovalApplicationId, backAsset.getBorrowApplicationId())
                                    .last("limit 1").one();
                            if (back.size()==borrow.size()){
                                borrowApplications.setReturnStatus(2);
                                for (AssetMain assetMain : list) {
                                    assetMain.setBorrowed(0);
                                    assetMain.setAssetStatus("闲置");
                                }

                                backAsset.setReturnStatus(2);
                                borrowApplicationAsset.setReturnStatus(2);
                            }else if (!back.isEmpty()){
                                borrowApplications.setReturnStatus(1);
                                for (AssetMain assetMain : list) {
                                    assetMain.setBorrowed(1);

                                }
                                backAsset.setReturnStatus(1);
                                borrowApplicationAsset.setReturnStatus(1);

                            }else{
                                borrowApplications.setReturnStatus(0);
                                for (AssetMain assetMain : list) {
                                    assetMain.setBorrowed(1);

                                }
                                backAsset.setReturnStatus(0);
                                borrowApplicationAsset.setReturnStatus(0);

                            }
                            approvalApplicationAssetService.updateById(borrowApplications);
                            assetMainService.updateBatchById(list);


                            approvalApplicationAssetService.updateById(backAsset);
                            approvalApplicationAssetService.updateById(borrowApplicationAsset);
                            saveAssetRecord(0,ApprovalTypeEnum.RETURN.getDesc(),back.stream().map(OaApprovalApplicationAssetItem::getAssetMainId)
                                    .collect(Collectors.toList()));

                        case 10:
                            OaApprovalApplicationDispose approvalApplicationDispose = approvalApplicationDisposeService.lambdaQuery()
                                    .eq(OaApprovalApplicationDispose::getApprovalApplicationId, approvalApplications.getId())
                                    .last("limit 1").one();
                            assetMains.forEach(assetMain -> {
                                assetMain.setDisposed(1);
                                switch (approvalApplicationDispose.getDisposeType()){
                                    case 0:
                                        assetMain.setAssetStatus("报废");
                                        break;
                                    case 1:
                                        assetMain.setAssetStatus("报损");
                                        break;
                                    case 2:
                                        assetMain.setAssetStatus("捐赠");
                                        break;
                                }
                            });
                            saveAssetRecord(null,ApprovalTypeEnum.ASSET_DISPOSE.getDesc(),assetMains
                                    .stream().map(AssetMain::getId).collect(Collectors.toList()));
@@ -629,13 +674,17 @@
                        case 7:
                            assetMains.forEach(assetMain -> {
                                assetMain.setInUse(1);
                                assetMain.setAssetStatus("使用中");
                            });
                            saveAssetRecord(1,ApprovalTypeEnum.GRAB.getDesc(),assetMains
                                    .stream().map(AssetMain::getId).collect(Collectors.toList()));
                            break;


                        default:
                            assetMains.forEach(assetMain -> {
                                assetMain.setBorrowed(1);
                                assetMain.setAssetStatus("使用中");
                            });
                            saveAssetRecord(1,ApprovalTypeEnum.BORROW.getDesc(),assetMains
                                    .stream().map(AssetMain::getId).collect(Collectors.toList()));