From 02d5b44343f3bd9abb667e50ccf469fed9a0a99a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 20:43:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 511c4dd..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,13 +73,20 @@
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(lineUp!=null,TLineUp::getCode, lineUp.getCode())
- .likeRight(TLineUp::getCreateTime, LocalDate.now()));
- tLineUpVO.setLinUpCount(count);
return ApiResult.success(tLineUpVO);
}
@ApiOperation(value = "取消排号")
--
Gitblit v1.7.1