diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java index bfc36b1a..751a7d6c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java @@ -51,7 +51,7 @@ public class BmUnitTypeController extends BaseController { @ApiOperation(value = "获取往来单位类型详细信息") @RequiresPermissions("basic:unitType:query") @GetMapping(value = "/{typeId}") - public AjaxResult getInfo(@PathVariable("id") Long typeId) + public AjaxResult getInfo(@PathVariable("typeId") Long typeId) { return AjaxResult.success(bmUnitTypeService.selectListByID(typeId)); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java index 17ee58c2..4b06402f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitType.java @@ -1,5 +1,6 @@ package com.bonus.material.basic.domain; +import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,6 +16,7 @@ public class BmUnitType extends BaseEntity { private Long typeId; @ApiModelProperty(value = "单位类型名称") + @Excel(name = "单位类型") private String typeName; @ApiModelProperty(value = "数据所属组织") @@ -23,7 +25,4 @@ public class BmUnitType extends BaseEntity { /** 删除标志(0代表存在 2代表删除) */ private String delFlag; - @ApiModelProperty(value = "单位类型状态 0代表启用,1代表不启用") - private int status; - } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitTypeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitTypeServiceImpl.java index 4984e096..810a986b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitTypeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitTypeServiceImpl.java @@ -189,11 +189,6 @@ public class BmUnitTypeServiceImpl implements IBmUnitTypeService { throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符,请检查导入模板"); } break; - case 1: - if (!"状态(0 启用 1 不启用)".equals(headerValue)) { - throw new IllegalArgumentException("第 " + (cellNum + 1) + " 列表头列名与预期不符,请检查导入模板"); - } - break; default: break; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitTypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitTypeMapper.xml index 1bfa44fd..eb59f898 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitTypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitTypeMapper.xml @@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into bm_unit_type type_name, - status, company_id, del_flag, create_by, @@ -17,7 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{typeName}, - #{status}, #{companyId}, 0, #{createBy}, @@ -30,7 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bm_unit_type type_name = #{typeName}, - status = #{status}, company_id = #{companyId}, update_by = #{updateBy}, update_time = #{updateTime}, @@ -43,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/template/BmUnitTypeTemplate.xlsx b/bonus-modules/bonus-material/src/main/resources/mapper/material/template/BmUnitTypeTemplate.xlsx index 1601d17a..be837dd8 100644 Binary files a/bonus-modules/bonus-material/src/main/resources/mapper/material/template/BmUnitTypeTemplate.xlsx and b/bonus-modules/bonus-material/src/main/resources/mapper/material/template/BmUnitTypeTemplate.xlsx differ