From cc25bc0eec2d50da39d62f9896ed4d5e66805366 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 11 七月 2025 18:04:05 +0800
Subject: [PATCH] zjh20250711
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 6da640c..8c038cb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -41,6 +41,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -178,7 +179,7 @@
@ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
public TableDataInfo list(TjReservation tjReservation) {
startPage();
- tjReservation.setIsExpire(2);
+ if(tjReservation.getIsExpire()==null) tjReservation.setIsExpire(2);
List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
// if(null !=list && list.size()>0){
// for (TjReservation reservation : list) {
@@ -763,7 +764,7 @@
//鍥綋浜烘暟
int tramNum = 0;
- if (null != rightList && rightList.size() > 0) {
+ if (null != rightList && !rightList.isEmpty()) {
String teamNo = PinyinUtil.getFirstLetter(dwDept.getDwName(), "") + DateUtil.format(new Date(), "yyMMddHHmmss");
for (TjReservation reservation : rightList) {
TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());
@@ -866,7 +867,6 @@
Date date = new Date();
//寮傛鏁版嵁
-// asyncService.addNewReservationConfirm(rightList);
asyncService.saveNewReservationConfirm(rightList);
//浣撴鍗曚綅閮ㄩ棬
@@ -895,7 +895,6 @@
TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());
-// TjDwDept dwDept = dwDeptService.getById(dwGrouping.getDwDeptId());
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getIdCard, reservation.getIdCard());
@@ -926,7 +925,6 @@
reservation.setPacId(dwGrouping.getId());
compPay = compPay.add(dwGrouping.getYsPrice());
-// reservation.setTjType(String.valueOf(1));
reservation.setTeamNo(teamNo);
reservation.setYxts(dto.getYxts());
tjReservationService.save(reservation);
@@ -934,7 +932,7 @@
DateUtil.between(date, DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(), dto.getYxts())), DateUnit.MS)));
}
- LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
+/* LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjCompPay::getCompId, dto.getDwId());
wq0.eq(TjCompPay::getTeamNo, teamNo);
TjCompPay one = compPayService.getOne(wq0);
@@ -954,16 +952,15 @@
tjCompPay.setPaidIn(new BigDecimal("0.00"));
tjCompPay.setDifference(tjCompPay.getCopeWith().subtract(BigDecimal.valueOf(0.00)));
compPayService.save(tjCompPay);
- }
+ }*/
-// .filter(a-> null != a.getPacId())
-
- Map<String, List<TjReservation>> collect = rightList.stream().collect(Collectors.groupingBy(TjReservation::getPacId));
+ /* Map<String, List<TjReservation>> collect = rightList.stream().collect(Collectors.groupingBy(TjReservation::getPacId));
if (!collect.isEmpty()) {
for (Map.Entry<String, List<TjReservation>> entry : collect.entrySet()) {
LambdaQueryWrapper<TjTeamSelectRecord> wq = new LambdaQueryWrapper<>();
wq.eq(TjTeamSelectRecord::getTeamNo, teamNo);
+ wq.eq(TjTeamSelectRecord::getPacId, entry.getKey());
wq.eq(TjTeamSelectRecord::getCompId, dto.getDwId());
TjTeamSelectRecord recordServiceOne = selectRecordService.getOne(wq);
if (null != recordServiceOne) {
@@ -985,7 +982,7 @@
selectRecordService.save(selectRecord);
}
}
- }
+ }*/
return AjaxResult.success("棰勭害鎴愬姛");
}
return AjaxResult.error("璇烽�夋嫨棰勭害瀵硅薄");
--
Gitblit v1.8.0