diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index 7d67fee56..eb88aa88e 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -1,5 +1,7 @@ package com.glxp.api.res.basic; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @@ -87,4 +89,32 @@ public class UdiRlSupResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + + /** + * 一级分类名称(学科,品名) + */ + @TableField(value = "catalogname1") + @ApiModelProperty(value="一级分类名称(学科,品名)") + private String catalogname1; + + /** + * 二级分类名称(用途、品目) + */ + @TableField(value = "catalogname2") + @ApiModelProperty(value="二级分类名称(用途、品目)") + private String catalogname2; + + /** + * 三级分类名称(部位、功能、品种) + */ + @TableField(value = "catalogname3") + @ApiModelProperty(value="三级分类名称(部位、功能、品种)") + private String catalogname3; + + /** + * 耗材材质 + */ + @TableField(value = "matrial") + @ApiModelProperty(value="耗材材质") + private String matrial; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index fdda8571e..a17c97ef1 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -912,6 +912,19 @@ categoryName=#{categoryName}, + + catalogname1=#{catalogname1}, + + + catalogname2=#{catalogname2}, + + + catalogname3=#{catalogname3}, + + + matrial=#{matrial}, + + where id = #{id} diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index f3ff198a0..03a751532 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -104,7 +104,11 @@ basic_products.basicPrductRemak6, basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, - basic_corp.name companyName + basic_corp.name companyName, + basic_products.catalogname1, + basic_products.catalogname2, + basic_products.catalogname3, + basic_products.matrial FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id