From ad4326adc4ccad14f090fba5acb435deab8260db Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 22 七月 2025 16:09:14 +0800
Subject: [PATCH] zjh20250722
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCompPayController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCompPayController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCompPayController.java
index 33f25fd..18e7d1f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCompPayController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCompPayController.java
@@ -154,7 +154,8 @@
@ApiOperation(value = "鎵�鏈夊叕鍙镐綋妫�鏀惰垂鏁版嵁鏌ヨ鎺ュ彛")
public AjaxResult list(@RequestParam(required = false) @ApiParam(value = "鍗曚綅id") String compId) {
- List<TjReservation> rightList = reservationService.list(new LambdaQueryWrapper<TjReservation>().eq(TjReservation::getCompanyId, compId));
+// List<TjReservation> rightList = reservationService.list(new LambdaQueryWrapper<TjReservation>().eq(TjReservation::getCompanyId, compId));
+ List<TjReservation> rightList = reservationService.getFirimSfList(compId);
Map<String, List<TjReservation>> collect = rightList.stream().collect(Collectors.groupingBy(TjReservation::getPacId));
@@ -191,8 +192,7 @@
List<TjTeamSelectRecord> selectRecordList = selectRecordService.list(wq0);
if(null !=selectRecordList && !selectRecordList.isEmpty()){
for(TjTeamSelectRecord selectRecord : selectRecordList){
- selectRecord.setSjCount(orderService.count(new LambdaQueryWrapper<TjOrder>()
- .eq(TjOrder::getTeamNo,selectRecord.getTeamNo()).eq(TjOrder::getPacId,selectRecord.getPacId())));
+ selectRecord.setSjCount(orderService.getTjTeamSelectRecordCount(selectRecord.getTeamNo(),selectRecord.getCompId(),selectRecord.getPacId()));
TjDwGrouping dwGrouping = dwGroupingService.getById(selectRecord.getPacId());
if(null !=dwGrouping){
@@ -234,7 +234,8 @@
LambdaQueryWrapper<TjReservation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjReservation::getTeamNo, teamNo);
if(StringUtil.isNotBlank(pacId))wrapper.eq(TjReservation::getPacId, pacId);
- List<TjReservation> reservationList = reservationService.list(wrapper);
+// List<TjReservation> reservationList = reservationService.list(wrapper);
+ List<TjReservation> reservationList = reservationService.getTeamTjPeopleList(teamNo, pacId);
if (null != reservationList && !reservationList.isEmpty()) {
List<TeamTjPeopleVo> syList = new ArrayList<>();
List<TeamTjPeopleVo> yjwjzList = new ArrayList<>();
@@ -252,7 +253,9 @@
throw new RuntimeException(e);
}
if (null != customer) {
- TjOrder tjOrder = orderService.getOne(new LambdaQueryWrapper<TjOrder>().eq(TjOrder::getUserId, customer.getCusId()).eq(TjOrder::getTeamNo, teamNo));
+ TjOrder tjOrder = orderService.getOne(new LambdaQueryWrapper<TjOrder>()
+ .eq(TjOrder::getUserId, customer.getCusId())
+ .and(w->w.eq(TjOrder::getTeamNo, teamNo).or().eq(TjOrder::getPacId,reservation.getPacId())));
if (null != tjOrder) {
TjFlowingWater water = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId()).eq(TjFlowingWater::getIsAddition, "N"));
@@ -300,18 +303,29 @@
@GetMapping("/getTjCompPay")
@ApiOperation(value = "鏍规嵁鍥㈤槦浣撴缂栧彿鍜屽椁恑d鑾峰彇缁撹处淇℃伅")
public AjaxResult getTjCompPay(@RequestParam @ApiParam(value = "鍥㈤槦缂栧彿") String teamNo,
- @RequestParam(required = false) @ApiParam(value = "鍗曚綅id") String pacId) {
+ @RequestParam @ApiParam(value = "濂楅id") String pacId) {
try {
LambdaQueryWrapper<TjCompPay> wq = new LambdaQueryWrapper<>();
wq.eq(TjCompPay::getTeamNo, teamNo);
- wq.eq(TjCompPay::getCompId, pacId);
+ wq.eq(TjCompPay::getPacId, pacId);
List<TjCompPay> tjCompPays = compPayService.list(wq);
if(null !=tjCompPays && !tjCompPays.isEmpty()){
for (TjCompPay pay : tjCompPays) {
LambdaQueryWrapper<TjCompPayInfo> wqInfo = new LambdaQueryWrapper<>();
wqInfo.eq(TjCompPayInfo::getTjCompPayId, pay.getId());
List<TjCompPayInfo> payInfos = payInfoService.list(wqInfo);
+ if(null !=payInfos && !payInfos.isEmpty()){
+ for (TjCompPayInfo info : payInfos) {
+ TjOrder order = orderService.getOrderByTjNum(info.getTjh());
+ if(null != order){
+ TjCustomer tjCustomer = customerService.getById(order.getUserId());
+ if (null != tjCustomer) {
+ info.setName(tjCustomer.getCusName());
+ }
+ }
+ }
+ }
pay.setPayInfo(payInfos);
}
}
--
Gitblit v1.8.0