From d1bf6cf8234a9010a901131787344a6f9b10373b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:52:49 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 202a013..64b2e2b 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.SlGoodsShelf;
@@ -21,6 +22,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -49,7 +51,7 @@
SysUser data = sysUserClient.getSysUser(userid).getData();
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- if(slGoodsShelfQuery.getStoreManagementName()!=null){
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
}
if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
@@ -66,8 +68,14 @@
Page<SlGoodsShelf> page = new Page<>(slGoodsShelfQuery.getPageCurr(), slGoodsShelfQuery.getPageSize());
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
- if (slStoreManagementIdList.size()>0){
- wrapper1.in(SlGoodsShelf::getStoreManagementId,slStoreManagementIdList);
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
+ if (slStoreManagementIdList.size() > 0) {
+ wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
+ } else {
+ slStoreManagementIdList=new HashSet<>();
+ slStoreManagementIdList.add(0L);
+ wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
+ }
}
wrapper1.eq( SlGoodsShelf::getDelFlag,0);
wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
@@ -110,14 +118,36 @@
if (slGoodsShelfDTO.getStoreManagementNumber()!=null){
slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
}
- if (slGoodsShelfDTO.getGoodsShelfName()!=null){
- slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
+ if (slGoodsShelfDTO.getStoreManagementId()!=null){
+ slGoodsShelf.setStoreManagementId(slGoodsShelfDTO.getStoreManagementId());
}
this.updateById(slGoodsShelf);
}
}
@Override
+ public SlGoodsShelfVO getSlGoodsShelfOne(Long id) {
+ SlGoodsShelf byId1 = this.getById(id);
+ SlGoodsShelfVO slGoodsShelfVO=new SlGoodsShelfVO();
+ BeanUtils.copyProperties(byId1,slGoodsShelfVO.getClass());
+
+ SlStoreManagement byId = SlStoreManagementService.getById(byId1.getStoreManagementId());
+ slGoodsShelfVO.setStoreManagementId(byId1.getStoreManagementId());
+ slGoodsShelfVO.setStoreManagementName(byId.getStoreManagementName());
+ slGoodsShelfVO.setStoreManagementNumber(byId.getStoreManagementNumber());
+ slGoodsShelfVO.setProvinceName(byId.getProvinceName());
+ slGoodsShelfVO.setProvinceCode(byId.getProvinceCode());
+ slGoodsShelfVO.setCityName(byId.getCityName());
+ slGoodsShelfVO.setCityCode(byId.getCityCode());
+ slGoodsShelfVO.setCountyName(byId.getCountyName());
+ slGoodsShelfVO.setCountyCode(byId.getCountyCode());
+ slGoodsShelfVO.setTownCode(byId.getTownCode());
+ slGoodsShelfVO.setTownName(byId.getTownName());
+
+ return slGoodsShelfVO;
+ }
+
+ @Override
public List<SlGoodsShelf> wfanzGoodsShelfList(GoodsShelfQuery goodsShelfQuery) {
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(SlGoodsShelf::getStoreManagementId,goodsShelfQuery.getStoreManagementId());
--
Gitblit v1.7.1