diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java index 17b85d41..c7b01186 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java @@ -11,8 +11,8 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.MessageUtils; -import com.jero.modules.activiti.util.ExcelUtils; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.sys.entity.LawsWorkingGroupUser; import com.jero.modules.sys.service.ILawsWorkingGroupUserService; @@ -172,21 +172,18 @@ public class LawsWorkingGroupUserController extends JeroController headers; + boolean b; try { - headers = ExcelUtils.getHeaderFromExcel(file.getInputStream(), 0); + b = ImportExcelUtil.checkTemplateTitle(file, LawsWorkingGroupUser.class, 0, 0); } catch (Exception e) { - log.error(e.getMessage(), e); - throw new JeroBootException("导入模板错误"); + e.printStackTrace(); + throw new JeroBootException(ResultCommon.PLEASE_USE_A_FILE_WITH_THE_SUFFIX_XLSX); + } + // 校验excel 字段是否正确 + if (!b) { + throw new JeroBootException(ResultCommon.HEADER_INCONSISTENT_WITH_TEMPLATE); } - // 使用静态方法验证header - boolean isMatched = headers.equals(ExcelUtils.getSortedHeadersFromClass(LawsWorkingGroupUser.class)); - if (!isMatched) { - throw new JeroBootException("导入模板错误"); - } InputStream inputStream = file.getInputStream(); List all; try { diff --git a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java index 44092a1e..4013329f 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -73,17 +74,21 @@ public class LawsWorkingGroupUser implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "姓名") + @Excel(name = "姓名") private String realname; @TableField(exist = false) @ApiModelProperty(value = "工号") + @Excel(name = "工号") private String username; @TableField(exist = false) @ApiModelProperty(value = "角色") + @Excel(name = "角色") private String userRoleName; @TableField(exist = false) @ApiModelProperty(value = "岗位") + @Excel(name = "岗位") private String userPostName; }