From 069153106a8ce1d7a7c1d5b48c07b849fd65971f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 04 七月 2024 18:08:56 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
index d0e4191..b67c136 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -5,11 +5,9 @@
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.management.domain.SlGoodsShelf;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery;
-import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO;
import com.ruoyi.management.mapper.SlStoreManagementMapper;
@@ -17,11 +15,14 @@
import com.ruoyi.management.service.SlVolumeProductionRkglService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -45,7 +46,7 @@
public PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList(SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery) {
Page<SlVolumeProductionRkgl> page = new Page<>(supplierVolumeProductionRkglQuery.getPageCurr(), supplierVolumeProductionRkglQuery.getPageSize());
LambdaQueryWrapper< SlVolumeProductionRkgl> wrapper1= Wrappers.lambdaQuery();
- wrapper1.like(SlVolumeProductionRkgl::getSupplierId,supplierVolumeProductionRkglQuery.getSupplierId());
+ wrapper1.eq(SlVolumeProductionRkgl::getSupplierId,supplierVolumeProductionRkglQuery.getSupplierId());
wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
Page<SlVolumeProductionRkgl> page2 = this.page(page, wrapper1);
@@ -74,4 +75,37 @@
v.setSysName(data1.getNickName());
return v;
}
+
+ @Override
+ public PageDTO<SupplierVolumeProductionRkglVO> getslVolumeProductionRkglList(getVolumeProductionRkQuery getVolumeProductionRkQuery) {
+ Page<SlVolumeProductionRkgl> page = new Page<>(getVolumeProductionRkQuery.getPageCurr(), getVolumeProductionRkQuery.getPageSize());
+
+ List<SysUser> data1 = sysUserClient.getUserSupplierList(getVolumeProductionRkQuery).getData();
+ Set<Long> goodsSkuIdList = null;
+ goodsSkuIdList = data1.stream().map(SysUser::getUserId)
+ .collect(Collectors.toSet());
+
+ LambdaQueryWrapper< SlVolumeProductionRkgl> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
+ wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus,getVolumeProductionRkQuery.getAuditStatus());
+ if (goodsSkuIdList.size()>0){
+ wrapper1.in(SlVolumeProductionRkgl::getSupplierId,goodsSkuIdList);
+ }
+ wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
+ wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
+ Page<SlVolumeProductionRkgl> page2 = this.page(page, wrapper1);
+
+ PageDTO<SupplierVolumeProductionRkglVO> SlGoodsShelfDTO = PageDTO.of(page2, SupplierVolumeProductionRkglVO.class);
+ List<SupplierVolumeProductionRkglVO> list2 = SlGoodsShelfDTO.getList();
+ for(SupplierVolumeProductionRkglVO list:list2){
+ SysUser data = sysUserClient.getSysUser(list.getSupplierId()).getData();
+ list.setNickName(data.getNickName());
+ list.setPhonenumber(data.getPhonenumber());
+ SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
+ list.setStoreManagementName(slStoreManagement.getStoreManagementName());
+ }
+ return SlGoodsShelfDTO;
+ }
+
+
}
--
Gitblit v1.7.1