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/SlVolumeProductionRkglServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 0c20646..baa4ddf 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
@@ -112,7 +112,9 @@
if (goodsSkuIdList.size()>0){
wrapper1.in(SlVolumeProductionRkgl::getSysId,goodsSkuIdList);
}else{
-
+ goodsSkuIdList=new HashSet<>();
+ goodsSkuIdList.add(0l);
+ wrapper1.in(SlVolumeProductionRkgl::getSysId,goodsSkuIdList);
}
wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
@@ -121,7 +123,7 @@
PageDTO<SupplierVolumeProductionRkglVO> SlGoodsShelfDTO = PageDTO.of(page2, SupplierVolumeProductionRkglVO.class);
List<SupplierVolumeProductionRkglVO> list2 = SlGoodsShelfDTO.getList();
for(SupplierVolumeProductionRkglVO list:list2){
- SysUser data = sysUserClient.getSysUser(list.getSupplierId()).getData();
+ SysUser data = sysUserClient.getSysUser(list.getSysId()).getData();
list.setNickName(data.getNickName());
list.setPhonenumber(data.getPhonenumber());
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
@@ -171,7 +173,7 @@
public VolumeProductionRkgInventoryVO getVolumeProductionRkgInventory(Long id) {
SlVolumeProductionRkgl byId = this.getById(id);
VolumeProductionRkgInventoryVO vo = new VolumeProductionRkgInventoryVO();
- SysUser data = sysUserClient.getSysUser(byId.getId()).getData();
+ SysUser data = sysUserClient.getSysUser(byId.getSysId()).getData();
vo.setSysPhone(data.getPhonenumber());
vo.setSysName(data.getNickName());
vo.setStartiTime(byId.getStartiTime());
@@ -179,7 +181,7 @@
vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
String directorId = slStoreManagement.getDirectorId();
List<String> stri = Arrays.asList(directorId.split(","));
- String str1 = null;
+ String str1 ="";
if (stri.size() > 0) {
for (String str : stri) {
SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -190,7 +192,7 @@
String competentId = slStoreManagement.getCompetentId();
List<String> stri1 = Arrays.asList(competentId.split(","));
- String str11 = null;
+ String str11 = "";
if (stri1.size() > 0) {
for (String str : stri1) {
SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -201,7 +203,7 @@
String administratorId = slStoreManagement.getAdministratorId();
List<String> stri11 = Arrays.asList(administratorId.split(","));
- String str111 = null;
+ String str111 = "";
if (stri11.size() > 0) {
for (String str : stri11) {
SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
@@ -217,6 +219,7 @@
wrapper1.eq(SlVolumeProductionRk::getVolumeProductionRkglId, byId.getId());
wrapper1.eq(SlVolumeProductionRk::getDelFlag, 0);
wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
+ SysUser data1 = sysUserClient.getSysUser(byId.getSupplierId()).getData();
List<SlVolumeProductionRk> page2 = slVolumeProductionRkMapper.selectList(wrapper1);
for (SlVolumeProductionRk list : page2) {
ManagementimgVolumeProductionRkVO rkVO = new ManagementimgVolumeProductionRkVO();
@@ -226,11 +229,13 @@
rkVO.setRkModel(list.getRkModel());
rkVO.setRkNum(list.getRkNum());
rkVO.setRkPice(list.getRkPice());
- rkVO.setStoreManagementNumber(rkVO.getStoreManagementNumber());
+ rkVO.setStoreManagementNumber(list.getStoreManagementNumber());
SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
rkVO.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ rkVO.setSupplierName(data1.getNickName());
managementList.add(rkVO);
}
+ vo.setManagementimgVolumeProductionRkVOList(managementList);
return vo;
}
--
Gitblit v1.7.1