From d5cd8f5f7a981ea9e40d73017905588d1cb6b5c1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 01 一月 2025 14:52:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
index 1f63022..410183f 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
@@ -73,16 +73,22 @@
TLineUpVO tLineUpVO = new TLineUpVO();
if (lineUp!=null){
BeanUtils.copyProperties(lineUp, tLineUpVO);
+ long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
+ .eq(TLineUp::getStoreId, storeId)
+ .eq(TLineUp::getStatus, 1)
+ .lt(lineUp!=null,TLineUp::getCode, lineUp.getCode())
+ .likeRight(TLineUp::getCreateTime, LocalDate.now()));
+ tLineUpVO.setLinUpCount(count);
+
+ }else{
+ long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
+ .eq(TLineUp::getStoreId, storeId)
+ .eq(TLineUp::getStatus, 1)
+ .likeRight(TLineUp::getCreateTime, LocalDate.now()));
+ tLineUpVO.setLinUpCount(count);
}
- long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
- .eq(TLineUp::getStoreId, storeId)
- .eq(TLineUp::getStatus, 1)
- .lt(TLineUp::getCode, lineUp.getCode())
- .likeRight(TLineUp::getCreateTime, LocalDate.now()));
- tLineUpVO.setLinUpCount(count);
return ApiResult.success(tLineUpVO);
}
-
@ApiOperation(value = "取消排号")
@GetMapping(value = "/cancelLineUp")
public ApiResult cancelLineUp(@RequestParam Integer id) {
--
Gitblit v1.7.1