From 7930c05e0d5edfba8de2a5ab60e52532556a643b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 14 八月 2024 17:58:44 +0800
Subject: [PATCH] zjh 2024-08-14
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 385048c..62a1fc7 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
@@ -177,7 +177,7 @@
public TableDataInfo selectTjReservationByDelete(TjReservation tjReservation) {
startPage();
List<TjReservation> list = tjReservationService.selectTjReservationByDelete(tjReservation);
- if(null !=list && list.size()>0){
+ if(null !=list && !list.isEmpty()){
// for (TjReservation reservation : list) {
// reservation.setName(MatchUtils.hideCusName(reservation.getName()));
// reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
@@ -410,12 +410,19 @@
}
}
for (TjDwGrouping groupingWz : groupingWzs) {
- if (null != groupingWz && groupingWz.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWz.getDwDeptId().equals(dwDept.getId())) {
+ if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) {
tjReservation.setGroupingId(groupingWz.getId());
tjReservation.setGroupingName(groupingWz.getGroupingName());
tjReservation.setYsPrice(groupingWz.getYsPrice());
//鍚堣
- hjMoney = hjMoney.add(groupingWz.getYsPrice()); count+=1;
+ hjMoney = hjMoney.add(groupingWz.getYsPrice());count+=1;
+ if(tjReservation.getSex()==0){
+ manMoney=manMoney.add(groupingWz.getYsPrice()); manCount+=1;
+ }
+ if(tjReservation.getSex()==1){
+ woManMoney=woManMoney.add(groupingWz.getYsPrice());woManCount+=1;
+ }
+
}
}
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
@@ -435,13 +442,13 @@
wrongList.add(tjReservation.getName());
}
}
- if (yyList.size() > 0) {
+ if (!yyList.isEmpty()) {
map.put("list", yyList);
map.put("hjMoney", hjMoney);
return AjaxResult.error("鎿嶄綔澶辫触,浠ヤ笂浜哄憳宸茬粡棰勭害鏃犻渶瀵煎叆!!!", map);
}
- if (wrongList.size() > 0) {
+ if (!wrongList.isEmpty()) {
map.put("list", wrongList);
map.put("hjMoney", hjMoney);
return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!", map);
--
Gitblit v1.8.0