修改厂家导入

huminmin

3 天以前 a317d0d886cda2d4c3eca6022456803cf619a45a

修改厂家导入

 src/main/java/com/ruoyi/stock/controller/ManufacturerController.java

@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.ManufacturerDto;
import com.ruoyi.stock.execl.ManufacturerExcelDto;
import com.ruoyi.stock.pojo.Manufacturer;
import com.ruoyi.stock.service.ManufacturerService;
import io.swagger.v3.oas.annotations.Operation;
@@ -121,7 +122,7 @@
    @Log(title = "厂家-下载模板", businessType = BusinessType.EXPORT)
    @Operation(summary = "下载厂家模板")
    public void downloadTemplate(HttpServletResponse response) {
        ExcelUtil<Manufacturer> util = new ExcelUtil<>(Manufacturer.class);
        ExcelUtil<ManufacturerExcelDto> util = new ExcelUtil<>(ManufacturerExcelDto.class);
        util.importTemplateExcel(response, "厂家档案模板");
    }


 src/main/java/com/ruoyi/stock/pojo/Manufacturer.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -38,63 +39,72 @@
    private Long id;

    /**
     * 厂商名称
     * 厂家名称
     */
    @ApiModelProperty("厂商名称")
    @ApiModelProperty("厂家名称")
    @Excel(name = "厂家名称")
    private String name;

    /**
     * 纳税人识别号
     */
    @ApiModelProperty("纳税人识别号")
    @Excel(name = "纳税人识别号")
    private String taxpayerIdentificationNum;

    /**
     * 厂商地址
     * 厂家地址
     */
    @ApiModelProperty("厂商地址")
    @ApiModelProperty("厂家地址")
    @Excel(name = "公司地址")
    private String companyAddress;

    /**
     * 厂商类型
     * 厂家类型
     */
    @ApiModelProperty("厂商类型")
    @ApiModelProperty("厂家类型")
    private String type;

    /**
     * 厂商电话
     * 厂家电话
     */
    @ApiModelProperty("厂商电话")
    @ApiModelProperty("公司电话")
    @Excel(name = "公司电话")
    private String companyPhone;

    /**
     * 银行账户名称
     */
    @ApiModelProperty("银行账户名称")
    @Excel(name = "开户行")
    private String bankAccountName;

    /**
     * 银行账户号码
     */
    @ApiModelProperty("银行账户号码")
    @Excel(name = "账号")
    private String bankAccountNum;

    /**
     * 联系人姓名
     */
    @ApiModelProperty("联系人姓名")
    @Excel(name = "联系人")
    private String contactUserName;

    /**
     * 联系人电话
     */
    @ApiModelProperty("联系人电话")
    @Excel(name = "联系电话")
    private String contactUserPhone;

    /**
     * 维护人ID
     */
    @ApiModelProperty("维护人ID")
    @Excel(name = "维护人")
    private Long maintainUserId;

    /**
@@ -147,5 +157,6 @@
     * 是否白名单
     */
    @ApiModelProperty("是否白名单")
    @Excel(name = "是否白名单")
    private Long isWhite;
}

 src/main/java/com/ruoyi/stock/service/impl/ManufacturerServiceImpl.java

@@ -20,10 +20,13 @@
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;

/**
@@ -116,11 +119,17 @@
    @Transactional
    public Boolean importData(MultipartFile file) {
        try {
            ExcelUtil<Manufacturer> util = new ExcelUtil<>(Manufacturer.class);
            List<Manufacturer> list = util.importExcel(file.getInputStream());
            if (list != null && !list.isEmpty()) {
                this.saveBatch(list);
            }
            ExcelUtil<ManufacturerExcelDto> util = new ExcelUtil<>(ManufacturerExcelDto.class);
            List<ManufacturerExcelDto> list = util.importExcel(file.getInputStream());
            ArrayList<Manufacturer> manufacturers = new ArrayList<>();
            list.stream().forEach(dto -> {
                Manufacturer manufacturer = new Manufacturer();
                BeanUtils.copyProperties(dto,manufacturer);
                manufacturer.setMaintainTime(LocalDate.now());
                manufacturer.setMaintainUserId(SecurityUtils.getLoginUser().getUser().getUserId());
                manufacturers.add(manufacturer);
            });
            this.saveOrUpdateBatch(manufacturers);
            return true;
        } catch (Exception e) {
            log.error("导入失败", e);