From 3c5072913efbda0c2341cac904a55383ad82f8c8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 13 五月 2025 15:41:37 +0800
Subject: [PATCH] 开票台账前后端联调

---
 src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java |   80 +++++++++++++++++++++++----------------
 1 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
index 46e18ea..6582757 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.sales.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,11 +25,14 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Service
@@ -50,10 +54,19 @@
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int invoiceLedgerAdd(InvoiceLedgerDto invoiceLedgerDto) {
+    public int invoiceLedgerSaveOrUpdate(InvoiceLedgerDto invoiceLedgerDto) {
         InvoiceLedger invoiceLedger = new InvoiceLedger();
         BeanUtils.copyProperties(invoiceLedgerDto, invoiceLedger);
-        int result = invoiceLedgerMapper.insert(invoiceLedger);
+        int result;
+        if(invoiceLedgerDto.getId() == null){
+            result = invoiceLedgerMapper.insert(invoiceLedger);
+        }else {
+            result = invoiceLedgerMapper.updateById(invoiceLedger);
+            //鍒犻櫎鎵�鏈夐檮浠跺叧鑱�
+            LambdaQueryWrapper<InvoiceLedgerFile> delWrapper = new LambdaQueryWrapper<>();
+            delWrapper.eq(InvoiceLedgerFile::getInvoiceLedgerId, invoiceLedgerDto.getId());
+            invoiceLedgerFileMapper.delete(delWrapper);
+        }
         List<FileVo> fileList = invoiceLedgerDto.getFileList();
         if(CollectionUtils.isNotEmpty(fileList)){
             fileList.forEach(fileVo -> {
@@ -76,34 +89,6 @@
         LambdaQueryWrapper<InvoiceLedger> delWrapper = new LambdaQueryWrapper<>();
         delWrapper.in(InvoiceLedger::getId, ids);
         return invoiceLedgerMapper.delete(delWrapper);
-    }
-
-    /**
-     * 寮�绁ㄥ彴璐︿慨鏀�
-     * @param invoiceLedgerDto
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int invoiceLedgerUpdate(InvoiceLedgerDto invoiceLedgerDto) {
-        InvoiceLedger invoiceLedger = new InvoiceLedger();
-        BeanUtils.copyProperties(invoiceLedgerDto, invoiceLedger);
-        int result = invoiceLedgerMapper.updateById(invoiceLedger);
-        // 鍒犻櫎鍏宠仈闄勪欢
-        LambdaQueryWrapper<InvoiceLedgerFile> delWrapper = new LambdaQueryWrapper<>();
-        delWrapper.eq(InvoiceLedgerFile::getInvoiceLedgerId, invoiceLedger.getId());
-        invoiceLedgerFileMapper.delete(delWrapper);
-        // 閲嶆柊鎻掑叆闄勪欢鍏宠仈琛�
-        List<FileVo> fileList = invoiceLedgerDto.getFileList();
-        if(CollectionUtils.isNotEmpty(fileList)){
-            fileList.forEach(fileVo -> {
-                InvoiceLedgerFile invoiceLedgerFile = new InvoiceLedgerFile();
-                BeanUtils.copyProperties(fileVo, invoiceLedgerFile);
-                invoiceLedgerFile.setInvoiceLedgerId(invoiceLedger.getId());
-                invoiceLedgerFileMapper.insert(invoiceLedgerFile);
-            });
-        }
-        return result;
     }
 
     /**
@@ -139,9 +124,14 @@
         FileVo fileVo = new FileVo();
         try {
             String baseDir = uploadFile + File.separatorChar + "invoiceLedger";
-            String filePath = FileUploadUtils.upload(baseDir, file);
-            fileVo.setFileName(file.getOriginalFilename());
-            fileVo.setFilePath(filePath);
+            File dirFile = new File(baseDir);
+            if(!dirFile.exists()){
+                dirFile.mkdirs();
+            }
+            String filePath = baseDir + File.separatorChar + UUID.randomUUID() + "_" + file.getOriginalFilename();
+            file.transferTo(new File(filePath));
+            fileVo.setName(file.getOriginalFilename());
+            fileVo.setUrl(filePath);
             fileVo.setFileSize((int)file.getSize());
         }catch (Exception e){
             e.printStackTrace();
@@ -168,4 +158,28 @@
         util.exportExcel(response, invoiceLedgerExcelDtoList, "渚涘簲鍟嗗鍑�");
     }
 
+    /**
+     * 寮�绁ㄥ彴璐﹁鎯�
+     * @param id
+     * @return
+     */
+    @Override
+    public InvoiceLedgerDto invoiceLedgerDetail(Integer id) {
+        InvoiceLedgerDto invoiceLedgerDto  = invoiceLedgerMapper.invoiceLedgerInfo(id);
+        if(ObjectUtils.isEmpty(invoiceLedgerDto)){
+            throw new RuntimeException("寮�绁ㄥ彴璐︽煡鎵惧け璐�");
+        }
+        // 鏌ヨ闄勪欢
+        QueryWrapper<InvoiceLedgerFile> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("invoice_ledger_id", id);
+        List<InvoiceLedgerFile> invoiceLedgerFileList = invoiceLedgerFileMapper.selectList(queryWrapper);
+        List<FileVo> fileList = invoiceLedgerFileList.stream().map(item -> {
+            FileVo fileVo = new FileVo();
+            BeanUtils.copyProperties(item, fileVo);
+            return fileVo;
+        }).collect(Collectors.toList());
+        invoiceLedgerDto.setFileList(fileList);
+        return invoiceLedgerDto;
+    }
+
 }

--
Gitblit v1.9.3