From 53585f97a69576a16543202070dc5192d9ca66b3 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 8 Mar 2024 15:07:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=80=97=E6=9D=90=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/entity/basic/UdiRelevanceEntity.java | 5 +++++ .../com/glxp/api/req/basic/AddProductRequest.java | 7 +++++++ .../req/basic/CompanyProductRelevanceRequest.java | 4 ++++ .../glxp/api/req/basic/FilterUdiInfoRequest.java | 4 ++++ .../glxp/api/req/basic/FilterUdiRelRequest.java | 4 ++++ .../glxp/api/req/basic/UdiRelevanceRequest.java | 4 ++++ .../api/req/basic/UdiRelevanceSaveRequest.java | 4 ++++ .../basic/CompanyProductRelevanceResponse.java | 4 ++++ .../glxp/api/res/basic/UdiRelevanceResponse.java | 4 ++++ .../com/glxp/api/res/thrsys/UdiInfoResponse.java | 4 ++++ .../service/basic/impl/UdiProductServiceImpl.java | 2 +- .../mapper/basic/CompanyProductRelevanceDao.xml | 2 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 15 +++++++++------ .../mybatis/mapper/basic/UdiRlSupDao.xml | 2 +- src/main/resources/schemas/schema_v2.4.sql | 2 +- 15 files changed, 57 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 40511b81b..55ca8fb94 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -108,6 +108,11 @@ public class UdiRelevanceEntity { */ @TableField(value = "attributeType") private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + @TableField(value = "hcType") + private Integer hcType; /** * 是否允许多次使用出库 */ diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index c5b976f65..266255323 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.basic; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; @@ -52,6 +53,12 @@ public class AddProductRequest { @JsonProperty("attributeType") @NotEmpty(message = "产品属性必填！") private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + @JsonProperty("hcType") + @NotEmpty(message = "耗材分类必填！") + private Integer hcType; /** * 医疗器械注册人 diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index 610f0826e..ee4367ec4 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -58,6 +58,10 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String corpId; private String billType; private String manufactory; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java index 4be373121..8982e5ec9 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java @@ -54,6 +54,10 @@ public class FilterUdiInfoRequest extends ListPageRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 742399d96..aade4731f 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -59,6 +59,10 @@ public class FilterUdiRelRequest extends ListPageRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java index 71a5afbb6..e5a95178b 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -38,6 +38,10 @@ public class UdiRelevanceRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String supName; private String originUuid; private String price; diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 720142be9..86a1fcd70 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -30,6 +30,10 @@ public class UdiRelevanceSaveRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private Boolean useMuti; private Integer useNum; diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java index 87160e075..2bc415c44 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -66,6 +66,10 @@ public class CompanyProductRelevanceResponse { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String scbssfbhph; private String scbssfbhxlh; private String scbssfbhscrq; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 6b0ce9879..15573d21d 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -31,6 +31,10 @@ public class UdiRelevanceResponse { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private Boolean useMuti; private Integer useNum; private String supName; diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index 11e517e64..a2b60e1c3 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -68,6 +68,10 @@ public class UdiInfoResponse { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private boolean isDisable; private boolean useMuti; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 1e8086870..4440051cb 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -247,7 +247,7 @@ public class UdiProductServiceImpl implements UdiProductService { udiRelevanceEntity.setNeedCert(false); udiRelevanceEntity.setPurType(1); udiRelevanceEntity.setAttributeType(addProductRequest.getAttributeType()); - + udiRelevanceEntity.setHcType(addProductRequest.getHcType()); // TODO: 2024/2/27 初始化其他字段 setUpdateInfo(udiProductEntity,udiRelevanceEntity); diff --git a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 7451ccc45..b4a0b2b53 100644 --- a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -100,7 +100,7 @@ basic_udirel.mainId, basic_udirel.isAdavence, basic_udirel.purType, - basic_udirel.attributeType, + basic_udirel.attributeType,basic_udirel.hcType, basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 8178b09e3..c0a484add 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1228,7 +1228,7 @@ INTO basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, + lockStatus, isAdavence,purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) @@ -1245,7 +1245,7 @@ #{isDisable}, #{isLock}, #{lockStatus}, - #{isAdavence},#{purType},#{attributeType}, + #{isAdavence},#{purType},#{attributeType},#{hcType}, #{useMuti}, #{useNum}, #{supName}, @@ -1264,7 +1264,7 @@ INTO basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, + lockStatus, isAdavence,purType,attributeType, hcType,useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) @@ -1281,7 +1281,7 @@ #{isDisable}, #{isLock}, #{lockStatus}, - #{isAdavence},#{purType},#{attributeType}, + #{isAdavence},#{purType},#{attributeType},#{hcType}, #{useMuti}, #{useNum}, #{supName}, @@ -1361,6 +1361,9 @@ attributeType=#{attributeType}, + + hcType=#{hcType}, + useMuti=#{useMuti}, @@ -1440,7 +1443,7 @@ into basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, + lockStatus, isAdavence,purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) @@ -1460,7 +1463,7 @@ #{item.isDisable}, #{item.isLock}, #{item.lockStatus}, - #{item.isAdavence},#{item.purType},#{item.attributeType}, + #{item.isAdavence},#{item.purType},#{item.attributeType},#{item.hcType}, #{item.useMuti}, #{item.useNum}, #{item.supName}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 3c55b5a3b..f3ff198a0 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -47,7 +47,7 @@ basic_udirel.mainId, basic_udirel.isAdavence, basic_udirel.purType, - basic_udirel.attributeType, + basic_udirel.attributeType,basic_udirel.hcType, basic_udirel.lowStockNum, basic_udirel.overStockNum, basic_udirel.recentDateTime, diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 6beea27eb..0b807ba81 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -506,7 +506,7 @@ SET FOREIGN_KEY_CHECKS = 1; CALL Pro_Temp_ColumnWork('thr_corp', 'kfdm', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'purType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'attributeType', 'tinyint', 1); - +CALL Pro_Temp_ColumnWork('basic_udirel', 'hcType', 'tinyint', 1); INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, `sort`, `localEdit`)