From 3ee4564f6450857a43f508271259b468cf3d1f79 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 24 七月 2024 18:31:59 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
index 9e9587c..4fda64a 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.ManagementGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;
@@ -14,6 +15,7 @@
import com.ruoyi.management.domain.dto.StoreManagementQuery;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.domain.vo.SlStoreManagementInventoryVO;
+import com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlStoreManagementMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkglMapper;
@@ -21,6 +23,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -35,7 +38,7 @@
public class SlStoreManagementServiceImpl extends ServiceImpl<SlStoreManagementMapper, SlStoreManagement> implements SlStoreManagementService {
@Resource
- private SlVolumeProductionRkMapper SlVolumeProductionRkMapper;
+ private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;
@Override
public PageDTO<SlStoreManagement> getStoreManagementList(StoreManagementQuery storeManagementQuery) {
@@ -47,9 +50,16 @@
if(storeManagementQuery.getStoreManagementNo()!=null&&storeManagementQuery.getStoreManagementNo()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
}
- if (storeManagementQuery.getStoreManagementGrade()!=0 && storeManagementQuery.getStoreManagementGrade()!=null){
- wrapper.eq(SlStoreManagement::getStoreManagementGrade,storeManagementQuery.getStoreManagementGrade());
+
+ if ( storeManagementQuery.getStoreManagementGrade()!=null &&!storeManagementQuery.getStoreManagementGrade().equals("0") ){
+ String[] split = storeManagementQuery.getStoreManagementGrade().split(",");
+ List<Integer> arr=new ArrayList<>();
+ for(int i=0;i<split.length;i++){
+ arr.add(Integer.valueOf(split[i]));
+ }
+ wrapper.in(SlStoreManagement::getStoreManagementGrade,arr);
}
+
wrapper.eq( SlStoreManagement::getDelFlag,0);
wrapper.orderByDesc(SlStoreManagement::getCreateTime);
Page<SlStoreManagement> page1 = this.page(page, wrapper);
@@ -159,10 +169,20 @@
Page<SlStoreManagement> page = new Page<>(storeManagementQuery.getPageCurr(), storeManagementQuery.getPageSize());
LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName());
+ if (storeManagementQuery.getStoreManagementName()!=null){
+ wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName());
+ }
+ if (storeManagementQuery.getStoreManagementNo()!=null){
wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
- if (storeManagementQuery.getStoreManagementGrade()!=0 && storeManagementQuery.getStoreManagementGrade()!=null){
- wrapper.eq(SlStoreManagement::getStoreManagementGrade,storeManagementQuery.getStoreManagementGrade());
+ }
+
+ if ( storeManagementQuery.getStoreManagementGrade()!=null&&!storeManagementQuery.getStoreManagementGrade().equals("0")){
+ String[] split = storeManagementQuery.getStoreManagementGrade().split(",");
+ List<Integer> arr=new ArrayList<>();
+ for(int i=0;i<split.length;i++){
+ arr.add(Integer.valueOf(split[i]));
+ }
+ wrapper.in(SlStoreManagement::getStoreManagementGrade,arr);
}
wrapper.eq( SlStoreManagement::getDelFlag,0);
wrapper.orderByDesc(SlStoreManagement::getCreateTime);
@@ -171,8 +191,11 @@
PageDTO<SlStoreManagementInventoryVO> InventoryVO = PageDTO.of(page1, SlStoreManagementInventoryVO.class);
List<SlStoreManagementInventoryVO> list2 = InventoryVO.getList();
for(SlStoreManagementInventoryVO list:list2){
- Integer managementInventoryList = SlVolumeProductionRkMapper.getManagementInventoryList(list.getId());
- list.setGoodsMaterialsNum(managementInventoryList);
+ LambdaQueryWrapper<ManagementGoodsMaterials> wrapper1= Wrappers.lambdaQuery();
+
+ wrapper1.eq(ManagementGoodsMaterials::getManagementId,list.getId());
+ List<ManagementGoodsMaterials> managementGoodsMaterials = managementGoodsMaterialsMapper.selectList(wrapper1);
+ list.setGoodsMaterialsNum(managementGoodsMaterials.size());
}
return InventoryVO;
--
Gitblit v1.7.1