From 0d82e9bb89c8569847537f1ce8b9d994bbc4099b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 九月 2025 19:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
index fe7c55e..8eb7a3d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
@@ -154,6 +154,7 @@
         List<OaApprovalApplications> approvalApplications = approvalApplicationsService.lambdaQuery().in(OaApprovalApplications::getId, applicationIds).list();
         for (OaApprovalApplications approvalApplication : approvalApplications) {
             ApprovalTodoVO approvalTodoVO = new ApprovalTodoVO();
+            approvalTodoVO.setApplicationReason(approvalApplication.getApplicationReason());
             approvalTodoVO.setApprovalCategory(approvalMap.get(approvalApplication.getApprovalId()).getApprovalCategory());
             switch (approvalTodoVO.getApprovalCategory()){
                 case 1:
@@ -266,7 +267,7 @@
                 case 13:
                     OaApprovalApplicationMoney oaApprovalApplicationMoney = oaApprovalApplicationMoneyMap.get(approvalApplication.getId());
                     if (oaApprovalApplicationMoney!=null){
-
+                        approvalTodoVO.setProjectName(oaApprovalApplicationMoney.getProjectName());
                         approvalTodoVO.setAmount(oaApprovalApplicationMoney.getApplyAmount());
                         approvalTodoVO.setDescription(oaApprovalApplicationMoney.getDescription());
 
@@ -275,7 +276,8 @@
                 case 15:
                     OaApprovalApplicationPayment oaApprovalApplicationPayment = approvalApplicationPaymentMap.get(approvalApplication.getId());
                     if (oaApprovalApplicationPayment!=null){
-
+                        // todo 当前阶段没有项目id 后续完善
+                        approvalTodoVO.setProjectName("项目名称");
                         approvalTodoVO.setAmount(oaApprovalApplicationPayment.getApplyAmount());
                         approvalTodoVO.setDescription(approvalApplication.getApplicationReason());
 
@@ -359,6 +361,7 @@
             }
         }
         List<ApprovalFlowNodeListVO> flowNodeList = getFlowNodeList(sysUser, approvalFlowAudits,approvalFlowNodes);
+        res.setContractAmount(approvalApplicationPayment.getContractAmount());
         res.setApprovalFlowNodeListVOS(flowNodeList);
         res.setApprovalApplicationId(approvalApplications.getId());
         res.setApplicationReason(approvalApplications.getApplicationReason());
@@ -530,6 +533,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);
     }
@@ -578,6 +582,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);
     }
@@ -626,6 +631,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);
     }
@@ -664,6 +670,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);
     }
@@ -707,6 +714,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);
     }
@@ -754,6 +762,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);
     }
@@ -805,6 +814,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);
     }
@@ -939,8 +949,8 @@
     public R<ContactDetailVO> detailContact(@ApiParam("申请单d")Integer id) {
         
         OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
-        OaApprovalApplicationMoney approvalApplicationMoney = approvalApplicationMoneyService.lambdaQuery()
-                .eq(OaApprovalApplicationMoney::getApprovalApplicationId, approvalApplications.getId())
+        OaApprovalApplicationContact approvalApplicationContact = approvalApplicationContactService.lambdaQuery()
+                .eq(OaApprovalApplicationContact::getApprovalApplicationId, approvalApplications.getId())
                 .last("limit 1").one();
 
         List<OaApprovalFlowAudit> approvalFlowAudits = approvalFlowAuditService.lambdaQuery().eq(OaApprovalFlowAudit::getApprovalApplicationId, approvalApplications.getId())
@@ -966,7 +976,7 @@
         res.setApprovalApplicationId(approvalApplications.getId());
         res.setApplicationReason(approvalApplications.getApplicationReason());
         res.setAttachmentUrl(approvalApplications.getAttachmentUrl());
-        res.setDescription(approvalApplicationMoney.getDescription());
+        res.setDescription(approvalApplicationContact.getDescription());
         return R.ok(res);
     }
     @ApiOperation(value = "广告制作审批详情")

--
Gitblit v1.7.1