From 90746aae01216e955a5afacc99f17c5eb0563552 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 10:09:52 +0800
Subject: [PATCH] 代码提交 依赖整理 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 baa4ddf..e85fd49 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
@@ -18,6 +18,7 @@
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.LogClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
@@ -56,6 +57,9 @@
@Resource
private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;
+
+ @Resource
+ private LogClient logClient;
@Override
public PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList(SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery) {
@@ -127,16 +131,19 @@
list.setNickName(data.getNickName());
list.setPhonenumber(data.getPhonenumber());
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
- list.setStoreManagementName(slStoreManagement.getStoreManagementName());
+ if (slStoreManagement!=null){
+ list.setStoreManagementName(slStoreManagement.getStoreManagementName());
+ }
}
return SlGoodsShelfDTO;
}
@Override
- public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ public Long addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
Long userid = SecurityUtils.getUserId();
+ SlVolumeProductionRkgl slVolumeProductionRkgl=null;
if (volumeProductionRkglDTO.getId()==null){
- SlVolumeProductionRkgl slVolumeProductionRkgl=new SlVolumeProductionRkgl();
+ new SlVolumeProductionRkgl();
slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
slVolumeProductionRkgl.setAuditStatus(1);
@@ -149,24 +156,26 @@
slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
this.save(slVolumeProductionRkgl);
}else{
- SlVolumeProductionRkgl byId = this.getById(volumeProductionRkglDTO.getId());
+ slVolumeProductionRkgl = this.getById(volumeProductionRkglDTO.getId());
if (volumeProductionRkglDTO.getSource()!=null){
- byId.setSource(volumeProductionRkglDTO.getSource());
+ slVolumeProductionRkgl.setSource(volumeProductionRkglDTO.getSource());
}
if (volumeProductionRkglDTO.getRemark()!=null){
- byId.setRemark(volumeProductionRkglDTO.getRemark());
+ slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
}
if (volumeProductionRkglDTO.getSupplierId()!=null){
- byId.setSupplierId(volumeProductionRkglDTO.getSupplierId());
+ slVolumeProductionRkgl.setSupplierId(volumeProductionRkglDTO.getSupplierId());
}
if (volumeProductionRkglDTO.getAttachmentUrl()!=null){
- byId.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
+ slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
}
if (volumeProductionRkglDTO.getAuthorization()!=null){
- byId.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
+ slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
}
- this.updateById(byId);
+ this.updateById(slVolumeProductionRkgl);
+
}
+ return slVolumeProductionRkgl.getId();
}
@Override
@@ -279,6 +288,8 @@
byId.setAuditStatus(6);
byId.setEndTime(new Date());
this.updateById(byId);
+
+ logClient.savelong();
}
}
--
Gitblit v1.7.1