From 1385b128cbbb0f6f5a42b4391309a5beac4d5983 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 02 一月 2025 14:29:05 +0800 Subject: [PATCH] 定时任务 --- manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 3 ++- manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java | 2 +- manage/src/main/java/com/jilongda/manage/ManageApplication.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manage/src/main/java/com/jilongda/manage/ManageApplication.java b/manage/src/main/java/com/jilongda/manage/ManageApplication.java index 364608b..d1a05ec 100644 --- a/manage/src/main/java/com/jilongda/manage/ManageApplication.java +++ b/manage/src/main/java/com/jilongda/manage/ManageApplication.java @@ -11,6 +11,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java index e17eff1..99bc8b5 100644 --- a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java +++ b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java @@ -41,7 +41,7 @@ } @ApiOperation(value = "查询当前排队人数",tags = "排号管理") @GetMapping(value = "/getCount") - public ApiResult getCount(@RequestParam Integer storeId) { + public ApiResult getCount( Integer storeId) { if (storeId!=null){ return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStoreId,storeId).eq(TLineUp::getStatus,1).list().size()); }else{ diff --git a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java index c1e09dc..051a1d1 100644 --- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java +++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java @@ -80,6 +80,7 @@ .eq(StringUtils.hasLength(getCurrentByParam.getColor()),TModel::getColor,getCurrentByParam.getColor()) .eq(Objects.nonNull(getCurrentByParam.getBrandId()),TModel::getBrandId,getCurrentByParam.getBrandId()) .list().stream().map(TModel::getId).collect(Collectors.toList()); + if (collect.isEmpty())collect.add(-1); TFrameGoods one = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect) .eq(TFrameGoods::getColor, getCurrentByParam.getColor()) .eq(TFrameGoods::getStoreId, getCurrentByParam.getStoreId()).one(); @@ -91,7 +92,7 @@ @ApiOperation(value = "镜片-根据系列id、球/非球、品牌id、折射率、ballMirror、columnMirror查询当前库存") @PostMapping(value = "/getCurrentByParamLens") public ApiResult<Integer> getCurrentByParamLens(@RequestBody GetCurrentByParamLens dto) { - TLensGoods one = lensGoodsService.lambdaQuery().in(TLensGoods::getSeriesId, dto.getSeriesId()) + TLensGoods one = lensGoodsService.lambdaQuery().eq(TLensGoods::getSeriesId, dto.getSeriesId()) .eq(dto.getLensType()!=null,TLensGoods::getLensType, dto.getLensType()) .eq(dto.getRefractiveIndex()!=null,TLensGoods::getRefractiveIndex, dto.getRefractiveIndex()) .eq(dto.getBallMirror()!=null,TLensGoods::getBallMirror, dto.getBallMirror()) -- Gitblit v1.7.1