Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 60afc1c228318d136a273cd0b389217f87583277

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

@@ -94,9 +94,7 @@
    private OaApprovalFlowService  approvalFlowService;


    public static void main(String[] args) {

    }
    @ApiOperation("待办事项列表")
    @PostMapping("/pageList")
    public R<PageInfo<ApprovalTodoVO>> pageList(@RequestBody ApprovalTodoListQuery query) {
@@ -332,8 +330,25 @@
        res.setContractUrl(approvalApplicationContract.getContractUrl());
        res.setApplicationReason(approvalApplications.getApplicationReason());
        res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
        res.setIsAudit(extracted(id, approvalApplications));
        return R.ok(res);
    }

    private Boolean extracted(Integer id, OaApprovalApplications approvalApplications) {
        Integer currentFlowNodeId = approvalApplications.getCurrentFlowNodeId();
        Long userId = tokenService.getLoginUser().getUserId();
        OaApprovalTodo approvalTodo = approvalTodoService.lambdaQuery().eq(OaApprovalTodo::getApplicationId, id)
                .eq(OaApprovalTodo::getFlowNodeId, currentFlowNodeId)
                .eq(OaApprovalTodo::getUserId, userId)
                .eq(OaApprovalTodo::getStatus, 0).last("limit 1")
                .one();
        if (approvalTodo!=null){
            return true;
        }else{
            return false;
        }
    }

    @ApiOperation(value = "进度款支付审批详情")
    @GetMapping(value = "/detailPayment")
    public R<PaymentDetailVO> detailPayment(@ApiParam("申请单d")Integer id) {
@@ -369,6 +384,8 @@
        // todo 三阶段设计项目表之后完善
        res.setProjectName("本期还未涉及到项目");
        res.setApplyAmount(approvalApplicationPayment.getApplyAmount());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "请假申请审批详情")
@@ -406,6 +423,8 @@
        res.setStartTime(approvalApplicationAttendance.getStartTime());
        res.setEndTime(approvalApplicationAttendance.getEndTime());
        res.setDuration(approvalApplicationAttendance.getDuration());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "销假审批详情")
@@ -450,6 +469,7 @@
        res.setEndTimeLeave(leaveApplicationAttendance.getEndTime());
        res.setDurationLeave(leaveApplicationAttendance.getDuration());
        res.setDuration(approvalApplicationAttendance.getDuration());
        res.setIsAudit(extracted(id, approvalApplications));
        return R.ok(res);
    }
    @ApiOperation(value = "外出申请审批详情")
@@ -487,6 +507,8 @@
        res.setEndTime(approvalApplicationAttendance.getEndTime());
        res.setDuration(approvalApplicationAttendance.getDuration());
        res.setAddress(approvalApplicationAttendance.getAddress());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "出差审批详情")
@@ -526,6 +548,8 @@
        res.setDuration(approvalApplicationAttendance.getDuration());
        res.setAddress(approvalApplicationAttendance.getAddress());
        res.setProjectName(approvalApplicationAttendance.getProjectName());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "采购审批详情-采购物品清单")
@@ -533,6 +557,7 @@
    public R<PageInfo<PurchaseListVO>> detailPurchaseList(@RequestBody ApprovalDetailQuery query) {
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
        query.setId(approvalApplications.getId());
        query.setApprovalApplicationId(approvalApplications.getId());
        PageInfo<PurchaseListVO> items = approvalApplicationPurchaseItemService.pageList(query);
        return R.ok(items);
    }
@@ -574,6 +599,8 @@
        if (assetType!=null){
            res.setAssetTypeName(assetType.getTypeName());
        }
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "物品领用-领用资产列表")
@@ -581,6 +608,7 @@
    public R<PageInfo<GrabListVO>> detailGrabList(@RequestBody ApprovalDetailQuery query) {
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
        query.setId(approvalApplications.getId());
        query.setApprovalApplicationId(approvalApplications.getId());
        PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
        return R.ok(items);
    }
@@ -622,6 +650,8 @@
        if (assetType!=null){
            res.setAssetTypeName(assetType.getTypeName());
        }
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "资产入库-入库资产列表")
@@ -629,6 +659,7 @@
    public R<PageInfo<StorageListVO>> detailInStockList(@RequestBody ApprovalDetailQuery query) {
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
        query.setId(approvalApplications.getId());
        query.setApprovalApplicationId(approvalApplications.getId());
        PageInfo<StorageListVO> items = approvalApplicationStorageService.pageList(query);
        return R.ok(items);
    }
@@ -660,6 +691,8 @@
        res.setStorageType(approvalApplicationStorage.getStorageType());
        res.setStorageTime(approvalApplicationStorage.getStorageTime());
        res.setRemarks(approvalApplicationStorage.getTitle());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "物品借用-借用资产列表")
@@ -667,6 +700,7 @@
    public R<PageInfo<GrabListVO>> detailBurrowList(@RequestBody ApprovalDetailQuery query) {
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
        query.setId(approvalApplications.getId());
        query.setApprovalApplicationId(approvalApplications.getId());
        PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
        return R.ok(items);
    }
@@ -703,6 +737,8 @@
        res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
        res.setOperateTime(approvalApplicationAsset.getOperateTime());
        res.setExpectReturnDate(approvalApplicationAsset.getExpectReturnDate());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "物品借用归还-归还资产列表")
@@ -710,6 +746,7 @@
    public R<PageInfo<GrabListVO>> detailBackList(@RequestBody ApprovalDetailQuery query) {
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
        query.setId(approvalApplications.getId());
        query.setApprovalApplicationId(approvalApplications.getId());
        PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
        return R.ok(items);
    }
@@ -749,6 +786,8 @@
        res.setExpectReturnDate(approvalApplicationAssetBack.getExpectReturnDate());
        res.setTitle(approvalApplicationAssetBack.getTitle());
        res.setApplicationCode(approvalApplications.getApplicationCode());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "资产处置-处置资产列表")
@@ -757,6 +796,7 @@
        
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
        query.setId(approvalApplications.getId());
        query.setApprovalApplicationId(approvalApplications.getId());
        PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
        return R.ok(items);
    }
@@ -800,6 +840,8 @@
        }
        res.setDisposeType(approvalApplicationDispose.getDisposeType());
        res.setDisposeTotalAmount(approvalApplicationDispose.getDisposeTotalAmount());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }

@@ -808,6 +850,7 @@
    public R<PageInfo<GrabListVO>> detailChangeList(@RequestBody ApprovalDetailQuery query) {
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(query.getId());
        query.setId(approvalApplications.getId());
        query.setApprovalApplicationId(approvalApplications.getId());
        PageInfo<GrabListVO> items = approvalApplicationAssetItemService.pageList(query);
        return R.ok(items);
    }
@@ -855,6 +898,8 @@
        // todo 三阶段完善 仓库名称
        res.setWarehouseName("三阶段完善");
        res.setAddress(approvalApplicationChange.getAddress());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "报销申请审批详情")
@@ -895,6 +940,8 @@

        res.setType(approvalApplicationReimbursement.getType());
        res.setApprovalApplicationReimbursementItems(oaApprovalApplicationReimbursementItems);
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "款项申请审批详情")
@@ -935,6 +982,8 @@
        res.setPayee(approvalApplicationMoney.getPayee());
        res.setPayeeContact(approvalApplicationMoney.getPayeeContact());
        res.setPayeeAccount(approvalApplicationMoney.getPayeeAccount());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "内部联系单审批详情")
@@ -970,13 +1019,13 @@
        res.setApplicationReason(approvalApplications.getApplicationReason());
        res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
        res.setDescription(approvalApplicationContact.getDescription());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    @ApiOperation(value = "广告制作审批详情")
    @GetMapping(value = "/detailAdvertisement")
    public R<AdvertisementDetailVO> detailAdvertisement(@ApiParam("申请单d")Integer id) {

        
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
        OaApprovalApplicationAdvertisement applicationAdvertisement = approvalApplicationAdvertisementService.lambdaQuery()
                .eq(OaApprovalApplicationAdvertisement::getApprovalApplicationId, approvalApplications.getId())
@@ -1012,6 +1061,8 @@
        res.setNumber(applicationAdvertisement.getNumber());
        res.setTotalAmount(applicationAdvertisement.getTotalAmount());
        res.setSpec(applicationAdvertisement.getSpec());
        res.setIsAudit(extracted(id, approvalApplications));

        return R.ok(res);
    }
    private List<ApprovalFlowNodeListVO> getFlowNodeList(SysUser sysUser, List<OaApprovalFlowAudit> approvalFlowAudits