From 3fa04e2d1e41455b84b1bba63429a4513f44e74e Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 22 七月 2024 19:01:57 +0800
Subject: [PATCH] 森林防火 供应商管理

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 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 a1f01f0..f631cb8 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
@@ -79,7 +79,7 @@
     }
 
     @Override
-    public VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Integer id) {
+    public VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Long id) {
         SlVolumeProductionRkgl byId = this.getById(id);
         VolumeProductionRkgInfoVO v=BeanUtils.copyBean(byId, VolumeProductionRkgInfoVO.class);
         SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
@@ -103,10 +103,16 @@
                 .collect(Collectors.toSet());
 
         LambdaQueryWrapper< SlVolumeProductionRkgl> wrapper1= Wrappers.lambdaQuery();
-        wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
-        wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus,getVolumeProductionRkQuery.getAuditStatus());
+        if (getVolumeProductionRkQuery.getPresentState()!=0&&getVolumeProductionRkQuery.getPresentState()!=null){
+            wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
+        }
+        if (getVolumeProductionRkQuery.getAuditStatus()!=0&&getVolumeProductionRkQuery.getAuditStatus()!=null) {
+            wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus, getVolumeProductionRkQuery.getAuditStatus());
+        }
         if (goodsSkuIdList.size()>0){
             wrapper1.in(SlVolumeProductionRkgl::getSysId,goodsSkuIdList);
+        }else{
+
         }
         wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
         wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
@@ -127,10 +133,10 @@
     @Override
     public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
         Long userid = SecurityUtils.getUserId();
-        if (volumeProductionRkglDTO.getId()!=null){
+        if (volumeProductionRkglDTO.getId()==null){
             SlVolumeProductionRkgl slVolumeProductionRkgl=new  SlVolumeProductionRkgl();
             slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
-            slVolumeProductionRkgl.setAuthorization(volumeProductionRkglDTO.getAuthorization());
+            slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
             slVolumeProductionRkgl.setAuditStatus(1);
             slVolumeProductionRkgl.setManagementId(volumeProductionRkglDTO.getManagementId());
             slVolumeProductionRkgl.setPresentState(1);
@@ -155,17 +161,17 @@
                 byId.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
             }
             if (volumeProductionRkglDTO.getAuthorization()!=null){
-                byId.setAuthorization(volumeProductionRkglDTO.getAuthorization());
+                byId.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
             }
             this.updateById(byId);
         }
     }
 
     @Override
-    public VolumeProductionRkgInventoryVO getVolumeProductionRkgInventory(Integer id) {
+    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());
@@ -173,7 +179,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();
@@ -184,7 +190,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();
@@ -195,7 +201,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();
@@ -211,6 +217,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();
@@ -220,16 +227,18 @@
                 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;
     }
 
     @Override
-    public void rk(Integer id) {
+    public void rk(Long id) {
         LambdaQueryWrapper<SlVolumeProductionRk> wrapper1 = Wrappers.lambdaQuery();
         wrapper1.eq(SlVolumeProductionRk::getVolumeProductionRkglId, id);
         wrapper1.eq(SlVolumeProductionRk::getDelFlag, 0);
@@ -241,6 +250,9 @@
             wrapper2.eq(ManagementGoodsMaterials::getManagementId,list.getManagementId());
             wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0);
             ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
+
+            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
+
             if (managementGoodsMaterials!=null){
                 Long repertorySum = managementGoodsMaterials.getRepertorySum();
                 Long repertoryZhai = managementGoodsMaterials.getRepertoryZhai();
@@ -248,6 +260,7 @@
                 Long re1=repertoryZhai+list.getRkNum();
                 managementGoodsMaterials.setRepertorySum(re);
                 managementGoodsMaterials.setRepertoryZhai(re1);
+                managementGoodsMaterials.setRepertory(slGoodsMaterials.getRepertory());
                 managementGoodsMaterialsMapper.updateById(managementGoodsMaterials);
             }else{
                 ManagementGoodsMaterials managementGoodsMaterials1=new ManagementGoodsMaterials();
@@ -255,6 +268,7 @@
                 managementGoodsMaterials1.setGoodsMaterialsId(list.getMaterialsId());
                 managementGoodsMaterials1.setRepertoryZhai(list.getRkNum());
                 managementGoodsMaterials1.setRepertorySum(list.getRkNum());
+                managementGoodsMaterials.setRepertory(slGoodsMaterials.getRepertory());
                 managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
             }
         }

--
Gitblit v1.7.1