单位类型

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));
     }

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;
-
 }

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;
                 }

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
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="typeName != null and typeName != ''">type_name,</if>
-            <if test="status != null">status,</if>
             <if test="companyId != null">company_id,</if>
             del_flag,
             <if test="createBy != null">create_by,</if>
@@ -17,7 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="typeName != null and typeName != ''">#{typeName},</if>
-            <if test="status != null">#{status},</if>
             <if test="companyId != null">#{companyId},</if>
             0,
             <if test="createBy != null">#{createBy},</if>
@@ -30,7 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update bm_unit_type
         <trim prefix="SET" suffixOverrides=",">
             <if test="typeName != null and typeName != ''">type_name = #{typeName},</if>
-            <if test="status != null">status = #{status},</if>
             <if test="companyId != null">company_id = #{companyId},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime !=null">update_time = #{updateTime},</if>
@@ -43,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectBmUnitList" resultType="com.bonus.material.basic.domain.BmUnitType">
-        select type_id as typeId, type_name as typeName, company_id as companyId, del_flag as delFlag, status as status
+        select type_id as typeId, type_name as typeName, company_id as companyId, del_flag as delFlag
         from bm_unit_type
         where
         del_flag = '0'
@@ -53,12 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectListByID" resultType="com.bonus.material.basic.domain.BmUnitType">
-        select type_id as typeId, type_name as typeName, company_id as companyId, del_flag as delFlag, status as status from bm_unit_type
+        select type_id as typeId, type_name as typeName, company_id as companyId, del_flag as delFlag from bm_unit_type
         where del_flag = '0' and type_id = #{typeId}
     </select>
 
     <select id="selectBmUnitTypeByTypeName" resultType="com.bonus.material.basic.domain.BmUnitType">
-        select type_id as typeId, type_name as typeName, company_id as companyId, del_flag as delFlag, status as status from bm_unit_type
+        select type_id as typeId, type_name as typeName, company_id as companyId, del_flag as delFlag from bm_unit_type
         where del_flag = '0' and type_name = #{typeName}
     </select>
 </mapper>