lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11-11-修改

Browse Source
This commit is contained in:
青云
2025-11-11 19:55:20 +08:00
parent 9221cb50a3
commit 8566231790
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
View File

@ -17,10 +17,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo; import org.dromara.xzd.skyfk.fbhtfk.domain.bo.XzdSkyfkFbhtfkBo;
import org.dromara.xzd.skyfk.fbhtfk.domain.vo.XzdSkyfkFbhtfkVo; 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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
@ -35,7 +36,7 @@ import java.util.List;
@RequestMapping("/xzd/fbhtfk/skyfkFbhtfk") @RequestMapping("/xzd/fbhtfk/skyfkFbhtfk")
public class XzdSkyfkFbhtfkController extends BaseController { public class XzdSkyfkFbhtfkController extends BaseController {
private final IXzdSkyfkFbhtfkService xzdSkyfkFbhtfkService; private final XzdSkyfkFbhtfkServiceImpl xzdSkyfkFbhtfkService;
/** /**
* 查询收款与付款-分包合同付款列表 * 查询收款与付款-分包合同付款列表
@ -107,5 +108,9 @@ public class XzdSkyfkFbhtfkController extends BaseController {
/** /**
* 根据合同id获取分包付款累计开票金额 * 根据合同id获取分包付款累计开票金额
*/ */
@GetMapping("/getLJKPKE/{contractId}")
public R<BigDecimal> getLjkpje(@PathVariable Long contractId){
return R.ok(xzdSkyfkFbhtfkService.getLJKPJE(contractId));
}
} }

28
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java
View File

@ -391,6 +391,20 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
if (xzdSfkFapiaoVos != null && !xzdSfkFapiaoVos.isEmpty()){ if (xzdSfkFapiaoVos != null && !xzdSfkFapiaoVos.isEmpty()){
vo.setFpxx(xzdSfkFapiaoVos); 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){ if (info == null){
return new BigDecimal("0"); 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;
} }
/** /**