From 2596c6702f0b7dbf7a67b66523ed2debc7daa75a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 16:48:56 +0800
Subject: [PATCH] bug修改
---
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
index f7539ab..4cc56ad 100644
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
+++ b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
@@ -100,33 +100,39 @@
tDetailVO.setCreateTime(one.getCreateTime());
return ApiResult.success(tDetailVO);
}
+
+ public static void main(String[] args) {
+// LocalDateTime now = LocalDateTime.now();
+// // 获取凌晨00：00：00和23：59：59
+// LocalDateTime startTime = now.withHour(0).withMinute(0).withSecond(0);
+// LocalDateTime endTime = now.withHour(23).withMinute(59).withSecond(59);
+// System.err.println(startTime);
+// System.err.println(endTime);
+ }
@ApiOperation(value = "首页")
@PostMapping(value = "/index")
public ApiResult<TOptometristVO> index() {
TOptometristVO tOptometristVO = new TOptometristVO();
Integer userId = loginInfoUtil.getUserId();
- TOptometrist byId = optometristService.getById(userId);
- TStore byId1 = storeService.getById(byId.getStoreId());
- tOptometristVO.setStoreName(byId1.getName());
- tOptometristVO.setName(byId.getName());
- tOptometristVO.setPhone(byId.getPhone());
- Date start = new Date();
- Date end = new Date();
- // 获取今日凌晨00：00：00和今日23：59：59
- start.setHours(0);
- start.setMinutes(0);
- start.setSeconds(0);
- end.setHours(23);
- end.setMinutes(59);
- end.setSeconds(59);
- int size = optometryService.lambdaQuery().eq(TOptometry::getOptometristId, userId)
- .between(TOptometry::getCreateTime, start, end)
+ TOptometrist optometrist = optometristService.getById(userId);
+ TStore store = storeService.getById(optometrist.getStoreId());
+ tOptometristVO.setStoreName(store.getName());
+ tOptometristVO.setName(optometrist.getName());
+ tOptometristVO.setPhone(optometrist.getPhone());
+ LocalDateTime nowTime = LocalDateTime.now();
+ // 获取凌晨00：00：00和23：59：59
+ LocalDateTime startTime = nowTime.withHour(0).withMinute(0).withSecond(0);
+ LocalDateTime endTime = nowTime.withHour(23).withMinute(59).withSecond(59);
+ int size = optometryService.lambdaQuery().eq(TOptometry::getStoreId, optometrist.getId())
+ .between(TOptometry::getCreateTime, startTime, endTime)
.eq(TOptometry::getStatus, 3).list().size();
tOptometristVO.setOptometryCount(size);
// 查询今日的排号列表
- List<TLineUp> list = tLineUpService.lambdaQuery().eq(TLineUp::getStoreId, byId.getStoreId())
+ List<TLineUp> list = tLineUpService.lambdaQuery().eq(TLineUp::getStoreId, optometrist.getStoreId())
.ne(TLineUp::getStatus, 3)
- .ne(TLineUp::getStatus, 5).list();
+ .ne(TLineUp::getStatus, 5)
+ .orderByAsc(TLineUp::getCode)
+ .list();
for (TLineUp tLineUp : list) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime createTime = tLineUp.getCreateTime();
--
Gitblit v1.7.1