From 11502c7f9f26edda0733c43a17b5b773ee8447e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 五月 2026 16:47:47 +0800
Subject: [PATCH] refactor(account): 财务模块更新
---
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index 98b3f23..6adaf2a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -3,7 +3,6 @@
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.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.SupplierManageDto;
@@ -13,8 +12,6 @@
import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.project.system.mapper.SysDictDataMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import jakarta.servlet.http.HttpServletResponse;
@@ -33,7 +30,6 @@
private final SupplierManageMapper supplierMapper;
private final PurchaseLedgerMapper purchaseLedgerMapper;
- private final SysDictDataMapper sysDictDataMapper;
/**
* 渚涘簲鍟嗘柊澧�
@@ -111,22 +107,13 @@
}
@Override
- public R importData(MultipartFile file) {
+ public Boolean importData(MultipartFile file) {
+
try {
ExcelUtil<SupplierManageExcelDto> util = new ExcelUtil<SupplierManageExcelDto>(SupplierManageExcelDto.class);
List<SupplierManageExcelDto> list = util.importExcel(file.getInputStream());
-
- if (CollectionUtils.isEmpty(list)) {
- return R.fail("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
- }
-
ArrayList<SupplierManage> supplierManages = new ArrayList<>();
list.stream().forEach(dto -> {
- // 渚涘簲鍟嗙被鍨嬫槸鍚﹀瓨鍦� 锛堢敳涔欎笝涓侊級
- String supplierType = dto.getSupplierType();
- if (!supplierType.equals("鐢�") && !supplierType.equals("涔�") && !supplierType.equals("涓�") && !supplierType.equals("涓�")) {
- throw new RuntimeException("渚涘簲鍟嗙被鍨� " + supplierType + " 涓嶅瓨鍦紒");
- }
SupplierManage supplierManage = new SupplierManage();
BeanUtils.copyProperties(dto,supplierManage);
supplierManage.setMaintainTime(LocalDate.now());
@@ -137,10 +124,10 @@
});
this.saveOrUpdateBatch(supplierManages);
- return R.ok("瀵煎叆鎴愬姛");
+ return true;
}catch (Exception e){
e.printStackTrace();
- return R.fail(e.getMessage());
}
+ return false;
}
}
--
Gitblit v1.9.3