Merge branch 'dev_New_pro' into dev_New_pro_财务

zss

7 天以前 b5d5cb947a194ceb34cd2797ab077f1484989305

 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;
    }
}