diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java index aadbcb1e..b1c492d6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/PartType.java @@ -27,9 +27,9 @@ public class PartType extends BaseEntity /** 类型ID */ private Long id; - /** 类型名称 */ - @Excel(name = "名称") - @ApiModelProperty(value = "类型名称") + /** 规格型号 */ + @Excel(name = "规格型号") + @ApiModelProperty(value = "规格型号") @NotBlank(message = "名称不能为空") @Size(max=30, message = "名称长度不能超过30") private String paName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeVo.java index b7913fc1..17859d96 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeVo.java @@ -22,7 +22,7 @@ public class MaTypeVo extends Type { private String itemType; @Excel(name = "物资类型") - @ApiModelProperty(value = "施工类型") + @ApiModelProperty(value = "物资类型") private String materialType; @Excel(name = "物资名称") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/PartTypeVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/PartTypeVo.java new file mode 100644 index 00000000..43311725 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/PartTypeVo.java @@ -0,0 +1,19 @@ +package com.bonus.material.ma.domain.vo; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.material.ma.domain.PartType; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PartTypeVo extends PartType { + + @Excel(name = "配件类型") + @ApiModelProperty(value = "配件类型") + private String partType; + + @Excel(name = "配件名称") + @ApiModelProperty(value = "配件名称") + private String partName; + +} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml index b253e837..7d5d46aa 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/PartTypeMapper.xml @@ -172,10 +172,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT DISTINCT m.pa_id AS id, m.pa_name AS paName, + m1.pa_name AS partName, + m2.pa_name As partType, m.parent_id as parentId, m.LEVEL as level, m.remark as remark