From d7c499a3427fe415b9d6d041fa0512861aad6614 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 12 Nov 2024 17:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=92=8C=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E7=AE=A1=E7=90=86=E7=9A=84=E8=8D=AF=E5=93=81=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=BB=B4=E6=8A=A4=20=E5=A2=9E=E5=8A=A0=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=88=86=E7=B1=BB=E9=80=BB=E8=BE=91=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=8D=AF=E5=93=81=E5=B1=82=E7=BA=A7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E9=80=89=E5=85=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=86=E7=B1=BB=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/basic/UdiProductEntity.java | 6 +++++- .../com/glxp/api/req/basic/AddProductRequest.java | 5 ++++- .../com/glxp/api/req/basic/SupplementRequest.java | 5 ++++- .../java/com/glxp/api/req/basic/UdiInfoRequest.java | 4 ++++ .../com/glxp/api/res/basic/UdiRelevanceResponse.java | 4 ++++ .../java/com/glxp/api/res/basic/UdiRlSupResponse.java | 5 ++++- .../api/service/basic/impl/UdiProductServiceImpl.java | 4 ++-- .../resources/mybatis/mapper/basic/UdiProductDao.xml | 11 +++++++++-- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 3 ++- .../resources/mybatis/mapper/basic/UdiRlSupDao.xml | 7 ++----- src/main/resources/schemas/schema_v2.4.sql | 8 +++++++- 11 files changed, 47 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 2e4767bb..94940e66 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -342,7 +342,11 @@ public class UdiProductEntity { */ @TableField(value = "xjdw") private String xjdw; - + /** + * 明细分类 + */ + @TableField(value = "detailSort") + private Integer detailSort; public Integer getMyBhxjsl() { if (bhxjsl == null || bhxjsl == 0) return 1; 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 88e9fa8d..318d4503 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -296,5 +296,8 @@ public class AddProductRequest { * 使用允许采集的最大层级 */ private Integer useMaxLevel; - + /** + * 明细分类 + */ + private Integer detailSort; } 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 3e3d38ed..4c9893bd 100644 --- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java @@ -74,6 +74,9 @@ public class SupplementRequest { private String prepnUnit; private String prepnSpec; private String ggxh; - + /** + * 明细分类 + */ + private Integer detailSort; } 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 7e14ab3f..80de4a0c 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java @@ -127,6 +127,10 @@ public class UdiInfoRequest { private String prepnSpec; private String prepnUnit; private String bzgg; + /** + * 明细分类 + */ + private Integer detailSort; public void setCheck(Boolean check) { 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 dff673ab..5ca28c63 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -329,5 +329,9 @@ public class UdiRelevanceResponse { */ @TableField(value = "unpackUseTime") private Integer unpackUseTime; + /** + * 明细分类 + */ + private Integer detailSort; } 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 652509a7..29ec2d70 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -184,5 +184,8 @@ public class UdiRlSupResponse { * 拆包后可用时长(小时) */ private Integer unpackUseTime; - + /** + * 明细分类 + */ + private Integer detailSort; } 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 4d47406b..24ae56c8 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 @@ -370,7 +370,7 @@ public class UdiProductServiceImpl implements UdiProductService { // BeanUtils.copyProperties(updateLevelDrugRequest, udiProductEntity); BeanUtils.copyProperties(addProductRequest, udiProductEntity); udiProductEntity.setNameCode(updateLevelDrugRequest.getNameCode()); - udiProductEntity.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl()); + udiProductEntity.setBhxjsl(updateLevelDrugRequest.getBhxjsl()); udiProductEntity.setPackUnit(updateLevelDrugRequest.getPackUnit()); udiProductEntity.setSjcpbm(updateLevelDrugRequest.getSjcpbm()); udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc()); @@ -449,7 +449,7 @@ public class UdiProductServiceImpl implements UdiProductService { entity.setPackUnit(request.getPackUnit()); entity.setSjcpbm(request.getSjcpbm()); entity.setBhxjcpbm(request.getBhxjcpbm()); - entity.setBhxjsl(request.getMyBhxjsl()); + entity.setBhxjsl(request.getBhxjsl()); entity.setDiType(request.getDiType()); entity.setXjdw(request.getXjdw()); entity.setUpdateTime(new Date()); diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 2aa7beec..6d2a34e0 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -202,7 +202,7 @@ matrial, destinyType, productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg, - requireScanCode) + requireScanCode,detailSort) values (#{id}, #{uuid}, #{originUuid}, #{nameCode}, @@ -276,7 +276,11 @@ #{physicType}, #{medicareType}, #{bzgg}, - #{requireScanCode}) + #{requireScanCode}, + #{detailSort} + + + ) @@ -1227,6 +1231,9 @@ price=#{price}, + + detailSort=#{detailSort}, + WHERE uuid = #{uuid} diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 72be0f89..5ca4ab87 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -493,7 +493,8 @@ basic_products.workPlaceCount, basic_products.bhltcjsl, basic_products.bhsycjsl, - th.hsmc hslbName + th.hsmc hslbName, + basic_products.detailSort FROM basic_products inner JOIN basic_udirel ON basic_products.uuid = basic_udirel.uuid diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 2aab094e..549ef5fd 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -144,7 +144,8 @@ basic_products.majorStatus, basic_products.physicType, basic_products.medicareType, - basic_products.indate + basic_products.indate, + basic_products.detailSort FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id @@ -168,9 +169,6 @@ AND ggxh LIKE concat('%', #{ggxh}, '%') - - AND basic_products.bzgg LIKE concat('%', #{bzgg}, '%') - AND basic_udirel.purType = #{purType} @@ -272,7 +270,6 @@ - GROUP BY rlId ORDER BY company_product_relevance.updateTime DESC diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 71e53884..3747ecd7 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -1181,4 +1181,10 @@ CALL Pro_Temp_ColumnWork('third_ali_drug', 'approvalNum', 1); -call Modify_index('third_ali_drug', 'approvalNum', 'approvalNum', 'BTREE'); \ No newline at end of file +call Modify_index('third_ali_drug', 'approvalNum', 'approvalNum', 'BTREE'); + + +CALL Pro_Temp_ColumnWork('basic_products', 'detailSort', + ' tinyint DEFAULT NULL COMMENT ''明细分类''', + 1); +