From 1c4311135628b53daa336821ff452292a9d063e9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 28 八月 2024 09:14:10 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
index 15c634d..a734fee 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
@@ -18,6 +18,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;
@@ -45,20 +46,26 @@
@Override
public PageDTO<ManagementGoodsMaterialsVO> getManagementGoodsMaterialsList(ManagementGoodsMaterialsQuery managementGoodsMaterialsQuery) {
+ if (managementGoodsMaterialsQuery.getStoreManagementGrade() == 0){
+ managementGoodsMaterialsQuery.setStoreManagementGrade(null);
+ }
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- if (managementGoodsMaterialsQuery.getStoreManagementName()!=null){
+ if (managementGoodsMaterialsQuery.getStoreManagementName()!=null&&managementGoodsMaterialsQuery.getStoreManagementName()!=""){
wrapper.like(SlStoreManagement::getStoreManagementName,managementGoodsMaterialsQuery.getStoreManagementName());
}
- if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null){
+ if (managementGoodsMaterialsQuery.getStoreManagementGrade()!=null){
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,managementGoodsMaterialsQuery.getStoreManagementGrade());
+ }
+ if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null&&managementGoodsMaterialsQuery.getStoreManagementNo()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementNo,managementGoodsMaterialsQuery.getStoreManagementNo());
}
- if (managementGoodsMaterialsQuery.getCityCode()!=null){
+ if (managementGoodsMaterialsQuery.getCityCode()!=null&&managementGoodsMaterialsQuery.getCityCode()!=""){
wrapper.eq(SlStoreManagement::getCityCode,managementGoodsMaterialsQuery.getCityCode());
}
- if (managementGoodsMaterialsQuery.getCountyCode()!=null){
+ if (managementGoodsMaterialsQuery.getCountyCode()!=null&&managementGoodsMaterialsQuery.getCountyCode()!=""){
wrapper.eq(SlStoreManagement::getCountyCode,managementGoodsMaterialsQuery.getCountyCode());
}
- if (managementGoodsMaterialsQuery.getTownCode()!=null){
+ if (managementGoodsMaterialsQuery.getTownCode()!=null&&managementGoodsMaterialsQuery.getTownCode()!=""){
wrapper.eq(SlStoreManagement::getTownCode,managementGoodsMaterialsQuery.getTownCode());
}
List<SlStoreManagement> slStoreManagements = slStoreManagementMapper.selectList(wrapper);
@@ -67,7 +74,7 @@
.collect(Collectors.toSet());
LambdaQueryWrapper<SlGoodsMaterials> wrapper1= Wrappers.lambdaQuery();
- if (managementGoodsMaterialsQuery.getGoodsMaterialsName()!=null){
+ if (managementGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&managementGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
wrapper1.like(SlGoodsMaterials::getGoodsMaterialsName,managementGoodsMaterialsQuery.getGoodsMaterialsName());
}
@@ -77,18 +84,26 @@
SlGoodsMaterialsList = slGoodsMaterials.stream().map(SlGoodsMaterials::getId)
.collect(Collectors.toSet());
-
Page<ManagementGoodsMaterials> page = new Page<>(managementGoodsMaterialsQuery.getPageCurr(), managementGoodsMaterialsQuery.getPageSize());
LambdaQueryWrapper< ManagementGoodsMaterials> wrapper3= Wrappers.lambdaQuery();
if (slVolumeProductionIdList.size()>0){
wrapper3.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
+ }else{
+ slVolumeProductionIdList=new HashSet<>();
+ slVolumeProductionIdList.add(0L);
+ wrapper3.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
}
if (SlGoodsMaterialsList.size()>0){
wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
+ }else{
+ SlGoodsMaterialsList=new HashSet<>();
+ SlGoodsMaterialsList.add(0L);
+ wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
}
- wrapper3.apply("repertory_zhai<repertory");
- wrapper3.eq( ManagementGoodsMaterials::getDelFlag,0);
+ wrapper3.apply("repertory_zhai < repertory");
+ wrapper3.ne(ManagementGoodsMaterials::getRepertory,0);
+ wrapper3.eq(ManagementGoodsMaterials::getDelFlag,0);
wrapper3.orderByDesc(ManagementGoodsMaterials::getCreateTime);
Page<ManagementGoodsMaterials> page1 = this.page(page, wrapper3);
PageDTO<ManagementGoodsMaterialsVO> storeManagementGoodSmaterialsVOPageDTO = PageDTO.of(page1, ManagementGoodsMaterialsVO.class);
@@ -97,10 +112,9 @@
SlGoodsMaterials slGoodsMaterials1 = slGoodsMaterialsMapper.selectById(li.getGoodsMaterialsId());
li.setGoodsMaterialsName(slGoodsMaterials1.getGoodsMaterialsName());
li.setIsConsume(slGoodsMaterials1.getIsConsume());
- li.setRepertory(slGoodsMaterials1.getRepertory());
-
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(li.getManagementId());
li.setProvinceCode(slStoreManagement.getProvinceCode());
+ li.setStoreManagementName(slStoreManagement.getStoreManagementName());
li.setProvinceName(slStoreManagement.getProvinceName());
li.setCityCode(slStoreManagement.getCityCode());
li.setCityName(slStoreManagement.getCityName());
--
Gitblit v1.7.1