From dc060dc2c97d3cf5f099aa3435e6dba5279d76b4 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 26 Mar 2024 11:27:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8C=BB=E4=BF=9D?=
=?UTF-8?q?=E8=80=97=E6=9D=90=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=B0=83?=
=?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/thrsys/ThrProductsAddDiEntity.java | 30 +++++++++++++++++
.../glxp/api/req/basic/SupplementRequest.java | 31 ++++++++++++++++++
.../api/req/basic/UdiInfoExportRequest.java | 1 +
.../glxp/api/req/basic/UdiInfoRequest.java | 31 ++++++++++++++++++
.../req/thrsys/AddThrDiProductsRequest.java | 32 +++++++++++++++++++
.../glxp/api/res/basic/UdiRlSupResponse.java | 31 ++++++++++++++++++
.../mybatis/mapper/basic/UdiProductDao.xml | 30 +++++++++++++++++
.../mybatis/mapper/basic/UdiRlSupDao.xml | 6 +++-
.../mapper/thrsys/ThrProductsAddDiDao.xml | 12 +++++--
src/main/resources/schemas/schema_v2.3.sql | 15 +++++++++
10 files changed, 216 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
index 8a9aeed7..f75cbb55 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
@@ -333,4 +333,34 @@ public class ThrProductsAddDiEntity {
private String nameCode;
+
+ /**
+ * 一级分类名称(学科，品名）
+ */
+ @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/java/com/glxp/api/req/basic/SupplementRequest.java b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java
index 6241a2df..00abce6a 100644
--- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java
@@ -1,5 +1,7 @@
package com.glxp.api.req.basic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
//选入产品补充信息
@@ -31,4 +33,33 @@ public class SupplementRequest {
* 产品分类高值 ：1：高值耗材；2.普通耗材
*/
private Integer hcType;
+
+
+ /**
+ * 一级分类名称(学科，品名）
+ */
+ @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/java/com/glxp/api/req/basic/UdiInfoExportRequest.java b/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java
index 5374a2d4..6c3e8d53 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java
@@ -25,4 +25,5 @@ public class UdiInfoExportRequest extends ListPageRequest {
private String thirdId4;
private String price;
private SupplementRequest supplementRequest;
+
}
diff --git a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
index 891ec1fb..3617756c 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
@@ -1,5 +1,7 @@
package com.glxp.api.req.basic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@@ -89,6 +91,35 @@ public class UdiInfoRequest {
private String mjfs;
private String categoryName;
+
+ /**
+ * 一级分类名称(学科，品名）
+ */
+ @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;
+
public void setCheck(Boolean check) {
isCheck = check;
}
diff --git a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java
index 421530da..e25028a5 100644
--- a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java
+++ b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java
@@ -1,5 +1,7 @@
package com.glxp.api.req.thrsys;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@@ -61,4 +63,34 @@ public class AddThrDiProductsRequest {
private Integer hcType;
+
+ /**
+ * 一级分类名称(学科，品名）
+ */
+ @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/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
index ef8c1296..cbb0432f 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
@@ -103,4 +105,33 @@ public class UdiRlSupResponse {
private boolean groupBuy; //是否集采产品
private String cphhhbh;
private Long uid;
+
+
+ /**
+ * 一级分类名称(学科，品名）
+ */
+ @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 85304dc4..9ecfeeca 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -915,6 +915,19 @@
categoryName=#{categoryName},
+
+ catalogname1=#{catalogname1},
+
+
+ catalogname2=#{catalogname2},
+
+
+ catalogname3=#{catalogname3},
+
+
+ matrial=#{matrial},
+
+
where id = #{id}
@@ -1106,6 +1119,23 @@
categoryName=#{categoryName},
+
+
+
+ catalogname1=#{catalogname1},
+
+
+
+ catalogname2=#{catalogname2},
+
+
+
+ catalogname3=#{catalogname3},
+
+
+
+ matrial=#{matrial},
+
WHERE uuid = #{uuid}
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 3912e75d..ce03e359 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -115,7 +115,11 @@
basic_products.cphhhbh,
basic_udirel.groupBuy,
basic_udirel.id as uid,
- 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
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
index 98688a9a..49b36e6c 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
@@ -16,7 +16,11 @@
qxlb, tyshxydm, zczbhhzbapzbh,
ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
supName, model, `standard`,
- qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType,hcType)
+ qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType,hcType,
+ catalogname1,
+ catalogname2,
+ catalogname3,
+ matrial)
values
(#{item.uuid},
@@ -42,7 +46,11 @@
, #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh}
, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model}
, #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type},
- #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType},#{item.hcType})
+ #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType},#{item.hcType},
+ #{catalogname1},
+ #{catalogname2},
+ #{catalogname3},
+ #{matrial})
diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql
index ea7b4b80..702db7ae 100644
--- a/src/main/resources/schemas/schema_v2.3.sql
+++ b/src/main/resources/schemas/schema_v2.3.sql
@@ -756,4 +756,19 @@ CALL Pro_Temp_ColumnWork('basic_products', 'matrial',
' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''耗材材质''',
1);
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'catalogname1',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''一级分类名称(学科，品名）''',
+ 1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'catalogname2',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''二级分类名称(用途、品目）''',
+ 1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'catalogname3',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''三级分类名称(部位、功能、品种）''',
+ 1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'matrial',
+ ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''耗材材质''',
+ 1);