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 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 lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(XzdSkyfkFbhtfk::getContractId, vo.getContractId()); + List list = list(lambdaQueryWrapper); + BigDecimal ljkpje = new BigDecimal("0"); + for (XzdSkyfkFbhtfk fbhtfk : list) { + LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper1.eq(XzdSfkFapiao::getMainDocumentId, fbhtfk.getId()); + List 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 lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(XzdSkyfkFbhtfk::getContractId, contractId); + List list = list(lambdaQueryWrapper); + BigDecimal ljkpje = new BigDecimal("0"); + for (XzdSkyfkFbhtfk fbhtfk : list) { + LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper1.eq(XzdSfkFapiao::getMainDocumentId, fbhtfk.getId()); + List list1 = xzdSfkFapiaoService.list(lambdaQueryWrapper1); + for (XzdSfkFapiao fapiao : list1) { + ljkpje = ljkpje.add(fapiao.getTotalAmountWithTax()); + } + } + return ljkpje; } /**