From 7d0a54fe83a06b768ee2a9878e50b3671d05f625 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 14 Oct 2024 16:25:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmUnitTypeController.java | 2 +- .../material/basic/domain/BmUnitType.java | 5 ++--- .../service/impl/BmUnitTypeServiceImpl.java | 5 ----- .../material/basic/BmUnitTypeMapper.xml | 9 +++------ .../material/template/BmUnitTypeTemplate.xlsx | Bin 9870 -> 9726 bytes 5 files changed, 6 insertions(+), 15 deletions(-) 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 1601d17a9096d22a5f39c66b8728977e0965f044..be837dd83996febaf521751823df0900c3ce6842 100644 GIT binary patch delta 4027 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