From 29cc2eb5e0076a160bd967f61522635eea23b537 Mon Sep 17 00:00:00 2001 From: chenfeng <214759371@qq.com> Date: Fri, 11 Apr 2025 17:39:44 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../YbsjyAppointmentRecordController.java | 31 ++++++++++++------- .../dao/YbsjyAppointmentRecordMapper.java | 2 ++ .../dao/YbsjyAppointmentRecordMapper.xml | 8 ++++- .../entity/vo/GetAppointmentRecordVO.java | 12 +++++++ .../entity/vo/SynchronousWriteOffDataVO.java | 11 +++++++ .../YbsjyAppointmentRecordService.java | 3 ++ .../impl/YbsjyAppointmentRecordImpl.java | 10 +++++- .../YbsjyAppointmentSettingServiceImpl.java | 18 +++++------ .../yuyueList/studyReservationRecord.html | 2 ++ .../back/yuyueList/teamReservationRecord.html | 2 ++ 10 files changed, 76 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/cjy/back/ybsjAppointment/controller/YbsjyAppointmentRecordController.java b/src/main/java/com/cjy/back/ybsjAppointment/controller/YbsjyAppointmentRecordController.java index a9a810d..5a07649 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/controller/YbsjyAppointmentRecordController.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/controller/YbsjyAppointmentRecordController.java @@ -37,6 +37,7 @@ public class YbsjyAppointmentRecordController { @Value("${jqzhgk.scjSynchronousWriteOffData}") private String scjSynchronousWriteOffData; + /** * 查询预约记录 * @@ -50,7 +51,7 @@ public class YbsjyAppointmentRecordController { if (user == null) { return ServerResponse.createByError("请重新登陆"); } - if (getAppointmentRecordVO.getVisitTypes()!=null && !getAppointmentRecordVO.getVisitTypes().equals("")){ + if (getAppointmentRecordVO.getVisitTypes() != null && !getAppointmentRecordVO.getVisitTypes().equals("")) { getAppointmentRecordVO.setVisitTypes(reverseAndSort(getAppointmentRecordVO.getVisitTypes())); } return ybsjyAppointmentRecordService.getAppointmentRecord(getAppointmentRecordVO); @@ -123,11 +124,16 @@ public class YbsjyAppointmentRecordController { writeOffVo.setUserId(user.getUserid().toString()); int ofo = ybsjyAppointmentRecordService.updateWriteOff(writeOffVo); if (ofo > 0) { + + // 更新景区管控数据 List synchronousWriteOffDataVOS = new ArrayList<>(); //核销人ID SynchronousWriteOffDataVO synchronousWriteOffDataVO = new SynchronousWriteOffDataVO(); - //核销人ID + if (writeOffVo.getAppointmentDocumentsWriteOff() != null && !writeOffVo.getAppointmentDocumentsWriteOff().equals("")) { + Map mapTime = ybsjyAppointmentRecordService.selectTime(writeOffVo.getAppointmentTimeInfoId()); + synchronousWriteOffDataVO.setAppointmentSlot(mapTime.get("start_time") + "-" + mapTime.get("end_time")); + } synchronousWriteOffDataVO.setBookingCategory(2); synchronousWriteOffDataVO.setWriteOff(writeOffVo.getAppointmentDocumentsWriteOff()); synchronousWriteOffDataVO.setDocumentsId(writeOffVo.getId().toString()); @@ -166,29 +172,30 @@ public class YbsjyAppointmentRecordController { @RequestMapping("/selectStatistics") public ServerResponse selectStatistics(@RequestBody GetAppointmentRecordVO getAppointmentRecordVO) { Map resultMap = new HashMap<>(); - resultMap.put("data", ybsjyAppointmentRecordService.selectStatistics(getAppointmentRecordVO)); + resultMap.put("data", ybsjyAppointmentRecordService.selectStatistics(getAppointmentRecordVO)); resultMap.put("msg", "查询成功"); resultMap.put("code", 0); return ServerResponse.createBySuccess(resultMap); } + public static String reverseAndSort(String input) { // 按逗号分割字符串 String[] parts = input.split(","); - int[] reversedNumbers = new int[parts.length]; + int[] numbers = new int[parts.length]; - // 反转每个数字并存储到数组中 + // 将分割后的字符串转为整数 for (int i = 0; i < parts.length; i++) { - reversedNumbers[i] = Integer.parseInt(new StringBuilder(parts[i]).reverse().toString()); + numbers[i] = Integer.parseInt(parts[i]); } - // 对反转后的数字进行排序 - Arrays.sort(reversedNumbers); + // 对整数数组进行排序 + Arrays.sort(numbers); - // 构建最终结果字符串 + // 构建结果字符串 StringBuilder result = new StringBuilder(); - for (int i = 0; i < reversedNumbers.length; i++) { - result.append(reversedNumbers[i]); - if (i < reversedNumbers.length - 1) { + for (int i = 0; i < numbers.length; i++) { + result.append(numbers[i]); + if (i < numbers.length - 1) { result.append(","); } } diff --git a/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.java b/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.java index 3c23970..1afbbaa 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.java @@ -210,4 +210,6 @@ public interface YbsjyAppointmentRecordMapper { //查询弹框内容 Map selectPop(); + + MapselectTime(String id); } diff --git a/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml b/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml index c3f1ecb..26a0d67 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml +++ b/src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentRecordMapper.xml @@ -147,7 +147,7 @@ and t1.scenic_id =#{getAppointmentRecordVO.scenicId} - and t1.visit_types like concat ('%',#{getAppointmentRecordVO.visitTypes},'%') + and t1.visit_types in (#{getAppointmentRecordVO.visitTypes}) GROUP BY t1.id ORDER BY t1.create_time desc @@ -588,4 +588,10 @@ and userkey ='95034a2bb9a843b79dbc93f74599282b' and isdel = 'NO' + + diff --git a/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/GetAppointmentRecordVO.java b/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/GetAppointmentRecordVO.java index 8875509..dacd53a 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/GetAppointmentRecordVO.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/GetAppointmentRecordVO.java @@ -2,6 +2,8 @@ package com.cjy.back.ybsjAppointment.entity.vo; import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.List; + /** * @author liangjiawei * @createDate 2023/7/27 @@ -35,6 +37,16 @@ public class GetAppointmentRecordVO { private String appointmentTypeId; private String visitTypes; + private List types; + + public List getTypes() { + return types; + } + + public void setTypes(List types) { + this.types = types; + } + public String getVisitTypes() { return visitTypes; } diff --git a/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousWriteOffDataVO.java b/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousWriteOffDataVO.java index 2e37e76..078a74b 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousWriteOffDataVO.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousWriteOffDataVO.java @@ -17,6 +17,17 @@ public class SynchronousWriteOffDataVO { */ private String documentsId; + private String appointmentSlot; + + + public String getAppointmentSlot() { + return appointmentSlot; + } + + public void setAppointmentSlot(String appointmentSlot) { + this.appointmentSlot = appointmentSlot; + } + public String getWriteOff() { return writeOff; } diff --git a/src/main/java/com/cjy/back/ybsjAppointment/service/YbsjyAppointmentRecordService.java b/src/main/java/com/cjy/back/ybsjAppointment/service/YbsjyAppointmentRecordService.java index 60bfa52..4e6fa82 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/service/YbsjyAppointmentRecordService.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/service/YbsjyAppointmentRecordService.java @@ -126,4 +126,7 @@ public interface YbsjyAppointmentRecordService { //查询弹框内容 Map selectPop(); + + + MapselectTime(String id); } diff --git a/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentRecordImpl.java b/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentRecordImpl.java index 5a67f9b..10ca7e1 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentRecordImpl.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentRecordImpl.java @@ -74,7 +74,9 @@ public class YbsjyAppointmentRecordImpl implements YbsjyAppointmentRecordService if (getAppointmentRecordVO.getReservationPersonPhone() != null && !getAppointmentRecordVO.getReservationPersonPhone().isEmpty()) { getAppointmentRecordVO.setReservationPersonPhone(Encryption.encrypt(getAppointmentRecordVO.getReservationPersonPhone(), rule)); } - +// if (getAppointmentRecordVO.getVisitTypes()!=null && !getAppointmentRecordVO.getVisitTypes().equals("")){ +// getAppointmentRecordVO.setTypes( Arrays.asList(getAppointmentRecordVO.getVisitTypes().split(","))); +// } //根据条件进行分页查询数据 List> list = ybsjyAppointmentRecordMapper.getAppointmentRecordListByPage(pw.getPage(), getAppointmentRecordVO); list.stream().forEach(item -> { @@ -496,4 +498,10 @@ public class YbsjyAppointmentRecordImpl implements YbsjyAppointmentRecordService public Map selectPop() { return ybsjyAppointmentRecordMapper.selectPop(); } + + + @Override + public Map selectTime(String id) { + return ybsjyAppointmentRecordMapper.selectTime(id); + } } diff --git a/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java b/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java index cef2e19..17c02ad 100644 --- a/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java +++ b/src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java @@ -372,21 +372,21 @@ public class YbsjyAppointmentSettingServiceImpl implements YbsjyAppointmentSetti public static String reverseAndSort(String input) { // 按逗号分割字符串 String[] parts = input.split(","); - int[] reversedNumbers = new int[parts.length]; + int[] numbers = new int[parts.length]; - // 反转每个数字并存储到数组中 + // 将分割后的字符串转为整数 for (int i = 0; i < parts.length; i++) { - reversedNumbers[i] = Integer.parseInt(new StringBuilder(parts[i]).reverse().toString()); + numbers[i] = Integer.parseInt(parts[i]); } - // 对反转后的数字进行排序 - Arrays.sort(reversedNumbers); + // 对整数数组进行排序 + Arrays.sort(numbers); - // 构建最终结果字符串 + // 构建结果字符串 StringBuilder result = new StringBuilder(); - for (int i = 0; i < reversedNumbers.length; i++) { - result.append(reversedNumbers[i]); - if (i < reversedNumbers.length - 1) { + for (int i = 0; i < numbers.length; i++) { + result.append(numbers[i]); + if (i < numbers.length - 1) { result.append(","); } } diff --git a/src/main/webapp/html/back/yuyueList/studyReservationRecord.html b/src/main/webapp/html/back/yuyueList/studyReservationRecord.html index b28d829..d9635c2 100644 --- a/src/main/webapp/html/back/yuyueList/studyReservationRecord.html +++ b/src/main/webapp/html/back/yuyueList/studyReservationRecord.html @@ -42,6 +42,8 @@ + + diff --git a/src/main/webapp/html/back/yuyueList/teamReservationRecord.html b/src/main/webapp/html/back/yuyueList/teamReservationRecord.html index bbd7bf5..bba8c1f 100644 --- a/src/main/webapp/html/back/yuyueList/teamReservationRecord.html +++ b/src/main/webapp/html/back/yuyueList/teamReservationRecord.html @@ -43,6 +43,8 @@ + +