From 85662317902b16315aaba55098d2918ea7d371c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Tue, 11 Nov 2025 19:55:20 +0800
Subject: [PATCH] =?UTF-8?q?11-11-=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/XzdSkyfkFbhtfkController.java  |  9 ++++--
 .../impl/XzdSkyfkFbhtfkServiceImpl.java       | 28 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
index 5d73bdab..338f6791 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
@@ -17,10 +17,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo;
 import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo;
-import org.dromara.xzd.skyfk.fbhtfk.service.IXzdSkyfkFbhtfkService;
+import org.dromara.xzd.skyfk.fbhtfk.service.impl.XzdSkyfkFbhtfkServiceImpl;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -35,7 +36,7 @@ import java.util.List;
 @RequestMapping("/xzd/fbhtfk/skyfkFbhtfk")
 public class XzdSkyfkFbhtfkController extends BaseController {
 
-    private final IXzdSkyfkFbhtfkService xzdSkyfkFbhtfkService;
+    private final XzdSkyfkFbhtfkServiceImpl xzdSkyfkFbhtfkService;
 
     /**
      * 查询收款与付款-分包合同付款列表
@@ -107,5 +108,9 @@ public class XzdSkyfkFbhtfkController extends BaseController {
     /**
      * 根据合同id获取分包付款累计开票金额
      */
+    @GetMapping("/getLJKPKE/{contractId}")
+    public R<BigDecimal> getLjkpje(@PathVariable Long contractId){
+        return R.ok(xzdSkyfkFbhtfkService.getLJKPJE(contractId));
+    }
 
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java
index 07a295d1..321d08da 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java
@@ -391,6 +391,20 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
             if (xzdSfkFapiaoVos != null && !xzdSfkFapiaoVos.isEmpty()){
                 vo.setFpxx(xzdSfkFapiaoVos);
             }
+            //累计开票金额
+            LambdaQueryWrapper<XzdSkyfkFbhtfk> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(XzdSkyfkFbhtfk::getContractId, vo.getContractId());
+            List<XzdSkyfkFbhtfk> list = list(lambdaQueryWrapper);
+            BigDecimal ljkpje = new BigDecimal("0");
+            for (XzdSkyfkFbhtfk fbhtfk : list) {
+                LambdaQueryWrapper<XzdSfkFapiao> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper1.eq(XzdSfkFapiao::getMainDocumentId, fbhtfk.getId());
+                List<XzdSfkFapiao> list1 = xzdSfkFapiaoService.list(lambdaQueryWrapper1);
+                for (XzdSfkFapiao fapiao : list1) {
+                    ljkpje = ljkpje.add(fapiao.getTotalAmountWithTax());
+                }
+            }
+            vo.setLjkpje(ljkpje);
         }
     }
 
@@ -402,7 +416,19 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
         if (info == null){
             return new BigDecimal("0");
         }
-        return null;
+        LambdaQueryWrapper<XzdSkyfkFbhtfk> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(XzdSkyfkFbhtfk::getContractId, contractId);
+        List<XzdSkyfkFbhtfk> list = list(lambdaQueryWrapper);
+        BigDecimal ljkpje = new BigDecimal("0");
+        for (XzdSkyfkFbhtfk fbhtfk : list) {
+            LambdaQueryWrapper<XzdSfkFapiao> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper1.eq(XzdSfkFapiao::getMainDocumentId, fbhtfk.getId());
+            List<XzdSfkFapiao> list1 = xzdSfkFapiaoService.list(lambdaQueryWrapper1);
+            for (XzdSfkFapiao fapiao : list1) {
+                ljkpje = ljkpje.add(fapiao.getTotalAmountWithTax());
+            }
+        }
+        return ljkpje;
     }
 
     /**