From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
index 64b2e2b..aad0664 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -20,6 +20,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.HashSet;
@@ -51,13 +52,12 @@
SysUser data = sysUserClient.getSysUser(userid).getData();
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!=""){
- wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&& !slGoodsShelfQuery.getStoreManagementName().isEmpty()){
+ wrapper.like(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
}
- if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
- wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
+ if (data.getRoleType()!=1){
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
}
- wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
wrapper.eq(SlStoreManagement::getDelFlag,0);
List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
Set<Long> slStoreManagementIdList = null;
@@ -67,7 +67,13 @@
Page<SlGoodsShelf> page = new Page<>(slGoodsShelfQuery.getPageCurr(), slGoodsShelfQuery.getPageSize());
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
- wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
+ if (StringUtils.hasLength(slGoodsShelfQuery.getGoodsShelfName())){
+ wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
+ }
+ if (slGoodsShelfQuery.getStoreManagementNumber()!=null && slGoodsShelfQuery.getStoreManagementNumber()!=0){
+ wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,slGoodsShelfQuery.getStoreManagementNumber());
+ }
+
if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
if (slStoreManagementIdList.size() > 0) {
wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
@@ -76,6 +82,9 @@
slStoreManagementIdList.add(0L);
wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
}
+ }
+ if (slGoodsShelfQuery.getStoreManagementId()!=null){
+ wrapper1.eq(SlGoodsShelf::getStoreManagementId, slGoodsShelfQuery.getStoreManagementId());
}
wrapper1.eq( SlGoodsShelf::getDelFlag,0);
wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
@@ -87,7 +96,6 @@
SlStoreManagement byId = SlStoreManagementService.getById(list.getStoreManagementId());
if (byId!=null){
list.setStoreManagementName(byId.getStoreManagementName());
- list.setStoreManagementNumber(byId.getStoreManagementNumber());
list.setProvinceName(byId.getProvinceName());
list.setProvinceCode(byId.getProvinceCode());
list.setCityName(byId.getCityName());
@@ -130,7 +138,7 @@
SlGoodsShelf byId1 = this.getById(id);
SlGoodsShelfVO slGoodsShelfVO=new SlGoodsShelfVO();
BeanUtils.copyProperties(byId1,slGoodsShelfVO.getClass());
-
+ slGoodsShelfVO.setGoodsShelfName(byId1.getGoodsShelfName());
SlStoreManagement byId = SlStoreManagementService.getById(byId1.getStoreManagementId());
slGoodsShelfVO.setStoreManagementId(byId1.getStoreManagementId());
slGoodsShelfVO.setStoreManagementName(byId.getStoreManagementName());
@@ -143,7 +151,7 @@
slGoodsShelfVO.setCountyCode(byId.getCountyCode());
slGoodsShelfVO.setTownCode(byId.getTownCode());
slGoodsShelfVO.setTownName(byId.getTownName());
-
+ slGoodsShelfVO.setGrade(byId.getStoreManagementGrade());
return slGoodsShelfVO;
}
@@ -152,7 +160,6 @@
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(SlGoodsShelf::getStoreManagementId,goodsShelfQuery.getStoreManagementId());
wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,goodsShelfQuery.getStoreManagementNumber());
- wrapper1.eq(SlGoodsShelf::getIsStoreManagement,1);
wrapper1.eq( SlGoodsShelf::getDelFlag,0);
wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
List<SlGoodsShelf> page2 = this.list(wrapper1);
@@ -161,12 +168,17 @@
@Override
public void fanzGoodsShelfList(GoodsShelfDTO goodsShelfDTO) {
- SlGoodsShelf slGoodsShelf = this.getById(goodsShelfDTO.getId());
- slGoodsShelf.setImgId(goodsShelfDTO.getImgId());
- slGoodsShelf.setIsStoreManagement(2);
- slGoodsShelf.setZbX(goodsShelfDTO.getZbX());
- slGoodsShelf.setZbY(goodsShelfDTO.getZbY());
- this.updateById(slGoodsShelf);
+ for(GoodsShelfDTO.ShelfDTO g:goodsShelfDTO.getShelfDTOS()){
+ SlGoodsShelf slGoodsShelf = this.getById(g.getId());
+ slGoodsShelf.setImgId(goodsShelfDTO.getImgId());
+ slGoodsShelf.setIsStoreManagement(2);
+ slGoodsShelf.setZbX(g.getZbX());
+ slGoodsShelf.setZbY(g.getZbY());
+ slGoodsShelf.setWidth(g.getWidth());
+ slGoodsShelf.setHeight(g.getHeight());
+ this.updateById(slGoodsShelf);
+ }
+
}
@Override
--
Gitblit v1.7.1