提交

src/main/java/cn/ezhizao/project/business/company/controller/BizCompanyController.java

@@ -14,6 +14,7 @@ import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.project.business.channel.domain.BizChannel;
 import cn.ezhizao.project.business.channel.service.IBizChannelService;
+import cn.ezhizao.project.business.company.domain.BizCompanyImport;
 import cn.ezhizao.project.business.company.domain.DictRegion;
 import cn.ezhizao.project.business.company.domain.vo.Region;
 import cn.ezhizao.project.business.company.service.IDictRegionService;
@@ -113,9 +114,9 @@ public class BizCompanyController extends BaseController
         // 获取 入Excel 表头字段
         List<String> excelHeaders = util.readExcelHeaders(file.getInputStream());
         //获取实体类字段
-        List<String> names=getExcelAnnotatedFields(BizCompany.class);
+        List<String> names=getExcelAnnotatedFields(BizCompanyImport.class);
         //如果不存在模板中的字段，返回错误
-        if (!excelHeaders.containsAll(names)) {
+        if (!names.containsAll(excelHeaders)) {
             return error("导入数据与模板不匹配！");
         }
         String message = bizCompanyService.importCompany(companyList, operName, getTenantId() == null ? 0 : getTenantId());

src/main/java/cn/ezhizao/project/business/company/domain/BizCompanyImport.java

@@ -0,0 +1,36 @@
+package cn.ezhizao.project.business.company.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Size;
+
+@Data
+@TableName(value = "biz_company")
+public class BizCompanyImport {
+
+    /** 客户名称 */
+    @Excel(name = "客户名称",width = 35)
+    @ApiModelProperty(value = "客户名称")
+    @Size(min = 0, max = 100)
+    private String name;
+
+    @TableField(exist = false)
+    @Excel(name = "来源类型")
+    private String sourceCategoryName;
+
+    @TableField(exist = false)
+    @Excel(name="来源名称")
+    private String sourceName;
+
+    @Excel(name = "负责人")
+    @TableField(exist = false)
+    private String leaderName;
+
+    @Excel(name = "客服")
+    @TableField(exist = false)
+    private String adviserName;
+}