From 2c258c39133435fa0e6e6da85d503982fd5a967d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 10 一月 2025 15:33:26 +0800
Subject: [PATCH] bug修改
---
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 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 79b470b..f329db7 100644
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
+++ b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.optometrist.authority.model.SecUser;
@@ -99,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();
@@ -176,9 +183,29 @@
Integer userId = loginInfoUtil.getUserId();
List<TLineUp> list = tLineUpService.lambdaQuery().eq(TLineUp::getStatus, 2)
.eq(TLineUp::getOptometristId, userId).list();
- if (!list.isEmpty())return ApiResult.failed("当前还有未结束的验光单");
+ if (!list.isEmpty()){
+ return ApiResult.failed("当前还有未结束的验光单");
+ }
TLineUp lineUp = tLineUpService.getById(id);
+ // 获取今天凌晨00：00：00和今日23：59：59
+ Date start = new Date();
+ start.setHours(0);
+ start.setMinutes(0);
+ start.setSeconds(0);
+ Date end = new Date();
+ end.setHours(23);
+ end.setMinutes(59);
+ end.setSeconds(59);
+ List<TLineUp> lineUps = tLineUpService.lambdaQuery().eq(TLineUp::getStoreId, lineUp.getStoreId())
+ .between(TLineUp::getCreateTime, start, end).list();
+ for (TLineUp up : lineUps) {
+ if (Integer.parseInt(up.getCode())<Integer.parseInt(lineUp.getCode())){
+ up.setStatus(4);
+ }
+ }
+ tLineUpService.updateBatchById(lineUps);
lineUp.setStatus(2);
+ lineUp.setOptometristId(userId);
tLineUpService.updateById(lineUp);
return ApiResult.success();
}
@@ -187,11 +214,11 @@
@GetMapping(value = "/cancelLineUp")
public ApiResult cancelLineUp(Integer id) {
TLineUp lineUp = tLineUpService.getById(id);
- lineUp.setStatus(4);
+ lineUp.setStatus(5);
tLineUpService.updateById(lineUp);
TOptometry one = optometryService.lambdaQuery().eq(TOptometry::getLineUpId, lineUp.getId()).one();
if (one!=null){
- one.setStatus(4);
+ one.setStatus(5);
optometryService.updateById(one);
}
return ApiResult.success();
--
Gitblit v1.7.1