From 50050ada04e8ae7bbbeb6342b4e3e35fba3890ec Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 17:36:47 +0800
Subject: [PATCH] 合并代码
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 3 +++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 4 ++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html | 2 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShopEvaluation/TShop_edit.html | 3 +++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java | 8 ++++----
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 4b712b6..9869b65 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -1088,6 +1088,7 @@
HashMap<String, Object> map = new HashMap<>();
List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1)
.isNotNull(TAppUser::getPhone)
+ .ne(TAppUser::getState,3)
.isNotNull(TAppUser::getCity));
Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());
List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
@@ -1169,6 +1170,7 @@
HashMap<String, Object> map = new HashMap<>();
List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
.isNotNull(TAppUser::getPhone)
+ .ne(TAppUser::getState,3)
.isNotNull(TAppUser::getCity));
Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());
List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
@@ -1251,6 +1253,7 @@
HashMap<String, Object> map = new HashMap<>();
List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
.isNotNull(TAppUser::getPhone)
+ .ne(TAppUser::getState,3)
.isNotNull(TAppUser::getCity));
List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
if (collect.size() == 0) {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java
index 84be003..4eaa02a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java
@@ -114,14 +114,14 @@
}
@RequestMapping("/tShop_info/{id}")
public String tCityInfo(@PathVariable("id") Integer id, Model model) {
- System.err.println("進入");
TEvaluationListVo vo = evaluationService.info(id);
- System.err.println("查詢vo");
model.addAttribute("item",vo);
ArrayList<String> strings = new ArrayList<>();
String imgs = vo.getImgs();
- for (String s : imgs.split(",")) {
- strings.add(s);
+ if (!ToolUtil.isEmpty(imgs)){
+ for (String s : imgs.split(",")) {
+ strings.add(s);
+ }
}
model.addAttribute("imgs",strings);
model.addAttribute("name1",vo.getPName());
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 486d23e..e05f07f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -868,6 +868,7 @@
@Autowired
private IUserService userService;
+
@RequestMapping("/yueyue_info/{id}")
public String yueyue_info(@PathVariable("id") Integer id,Model model) {
@@ -933,8 +934,7 @@
List<OrderDto> timeRanges = new ArrayList<>();
-
- Site site = siteClient.listById(book.getSiteId());
+ TSite site = siteService.getById(book.getSiteId());
System.out.println("================"+site);
String appointmentStartTime = site.getAppointmentStartTime();
String appointmentEndTime = site.getAppointmentEndTime();
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
index ce2414f..512135e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
@@ -150,7 +150,9 @@
<label class="col-sm-3 control-label head-scu-label">*上传凭证：</label>
<div class="col-sm-2">
<div id="introduceDrawingPreId">
+ @if(isNotEmpty(item.voucher)){
<div><img width="100px" height="100px" src="${item.voucher}"></div>
+ @}
</div>
</div>
<div class="col-sm-2">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShopEvaluation/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShopEvaluation/TShop_edit.html
index 63f6275..918dee4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShopEvaluation/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShopEvaluation/TShop_edit.html
@@ -14,9 +14,12 @@
<div class="form-group">
<label class="col-sm-3 control-label">评价图片：</label>
<div class="col-sm-9">
+ @if(isNotEmpty(imgs)){
@for(o in imgs){
<img src=${o} style="width: 163px;height: 96px;">
@}
+ @}
+
</div>
</div>
--
Gitblit v1.7.1