From f81731d15aecbd51ae60fd1c2e48cbb808d81a5a Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 3 Feb 2026 10:46:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=A1=A8=E5=90=8D=20=E5=8E=9Fnu=5Fcon?= =?UTF-8?q?fig=5Fdirective=5Fpackage=20=E6=96=B0nu=5Fconfig=5Fdirective=5F?= =?UTF-8?q?package=5Fmain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原nu_config_package_directive 新nu_config_directive_package_item --- .../datapool/mapper/xml/DirectiveDataPoolMapper.xml | 2 +- .../biz/order/mapper/xml/DirectiveOrderMapper.xml | 2 +- .../biz/order/mapper/xml/DirectiveOrderSubMapper.xml | 6 +++--- .../plan/care/mapper/xml/CareDirectivePlanMapper.xml | 6 +++--- .../mapper/xml/InvoicingDirectivePlanMapper.xml | 2 +- .../mapper/xml/LogisticsDirectivePlanMapper.xml | 2 +- .../mapper/xml/NuBizCustomerCareTempInfoMapper.xml | 2 +- .../directivepackage/entity/DirectivePackage.java | 2 +- .../mapper/xml/DirectivePackageMapper.xml | 12 ++++++------ 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml index feaac232..67bd8f4c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml @@ -62,7 +62,7 @@ a.total_duration as serviceDuration, a.description as serviceContent, a.timeout_duration as timeoutDuration - from nu_config_directive_package a + from nu_config_directive_package_main a where a.id = #{id} and a.del_flag = '0' and a.iz_enabled = 'Y' diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml index 0e5d507b..3f00f9b1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml @@ -489,7 +489,7 @@ a.total_duration as serviceDuration, a.description as serviceContent, a.timeout_duration as timeoutDuration - from nu_config_directive_package a + from nu_config_directive_package_main a where a.id = #{directiveId} and a.del_flag = '0' and a.iz_enabled = 'Y' diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml index 8dcf6e36..5e885ddd 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml @@ -45,8 +45,8 @@ b.service_duration AS serviceDuration, b.service_content AS serviceContent, b.timeout_duration AS timeoutDuration - FROM nu_config_directive_package p - INNER JOIN nu_config_package_directive a ON p.id = a.package_id + FROM nu_config_directive_package_main p + INNER JOIN nu_config_directive_package_item a ON p.id = a.package_id LEFT JOIN nu_config_service_directive b ON a.directive_id = b.id LEFT JOIN nu_config_service_category c ON b.category_id = c.id LEFT JOIN nu_config_service_type d ON b.type_id = d.id @@ -64,4 +64,4 @@ ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml index 4fc0c8b3..b6f87caf 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml @@ -211,7 +211,7 @@ FROM nu_biz_nu_care_directive_plan plan LEFT JOIN nu_base_info base ON plan.nu_id = base.nu_id LEFT JOIN nu_config_service_directive directive ON plan.iz_package = 'N' AND plan.directive_id = directive.id - LEFT JOIN nu_config_directive_package package ON plan.iz_package = 'Y' AND plan.directive_id = package.id + LEFT JOIN nu_config_directive_package_main package ON plan.iz_package = 'Y' AND plan.directive_id = package.id LEFT JOIN nu_config_service_category category ON directive.category_id = category.id LEFT JOIN nu_config_service_type stype ON directive.type_id = stype.id WHERE 1=1 @@ -294,10 +294,10 @@ FROM nu_biz_nu_care_directive_plan p LEFT JOIN nu_base_info base ON p.nu_id = base.nu_id LEFT JOIN nu_config_service_directive directive ON p.iz_package = 'N' AND p.directive_id = directive.id - LEFT JOIN nu_config_directive_package package ON p.iz_package = 'Y' AND p.directive_id = package.id + LEFT JOIN nu_config_directive_package_main package ON p.iz_package = 'Y' AND p.directive_id = package.id LEFT JOIN nu_config_service_category category ON directive.category_id = category.id LEFT JOIN nu_config_service_type stype ON directive.type_id = stype.id - LEFT JOIN nu_config_package_directive pd ON p.iz_package = 'Y' AND p.directive_id = pd.package_id + LEFT JOIN nu_config_directive_package_item pd ON p.iz_package = 'Y' AND p.directive_id = pd.package_id WHERE p.nu_id = #{dto.nuId} AND ( -- 1: 每天执行 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml index 2c7cbec9..b7908159 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml @@ -99,7 +99,7 @@ FROM nu_biz_nu_invoicing_directive_plan plan LEFT JOIN nu_base_info base ON plan.nu_id = base.nu_id LEFT JOIN nu_config_service_directive directive ON plan.iz_package = 'N' AND plan.directive_id = directive.id - LEFT JOIN nu_config_directive_package package ON plan.iz_package = 'Y' AND plan.directive_id = package.id + LEFT JOIN nu_config_directive_package_main package ON plan.iz_package = 'Y' AND plan.directive_id = package.id LEFT JOIN nu_config_service_category category ON directive.category_id = category.id LEFT JOIN nu_config_service_type stype ON directive.type_id = stype.id WHERE 1=1 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml index 86055dcb..0c54ced3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml @@ -102,7 +102,7 @@ FROM nu_biz_nu_logistics_directive_plan plan LEFT JOIN nu_base_info base ON plan.nu_id = base.nu_id LEFT JOIN nu_config_service_directive directive ON plan.iz_package = 'N' AND plan.directive_id = directive.id - LEFT JOIN nu_config_directive_package package ON plan.iz_package = 'Y' AND plan.directive_id = package.id + LEFT JOIN nu_config_directive_package_main package ON plan.iz_package = 'Y' AND plan.directive_id = package.id LEFT JOIN nu_config_service_category category ON directive.category_id = category.id LEFT JOIN nu_config_service_type stype ON directive.type_id = stype.id WHERE 1=1 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml index f33a8acd..d4bde567 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml @@ -10,7 +10,7 @@ c.category_name AS category_name, d.type_name AS type_name, e.instruction_name AS instruction_name - from nu_config_package_directive a + from nu_config_directive_package_item a left join nu_config_service_directive b on a.directive_id = b.id left join nu_config_service_category c on b.category_id = c.id left join nu_config_service_type d on b.type_id = d.id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java index f67ae421..fcc67dec 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java @@ -22,7 +22,7 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("nu_config_directive_package") +@TableName("nu_config_directive_package_main") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_directive_package对象", description="服务指令包") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml index 9d0ae2a1..ad93cb51 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml @@ -78,7 +78,7 @@ - update nu_config_directive_package + update nu_config_directive_package_main set total_duration = #{duration} where id = #{id} @@ -150,7 +150,7 @@ cst.type_name AS cst_type_name, insTag.instruction_name AS instruction_name FROM - (SELECT * FROM nu_config_directive_package + (SELECT * FROM nu_config_directive_package_main del_flag = '0' @@ -164,7 +164,7 @@ ) dp - LEFT JOIN nu_config_package_directive pd ON dp.id = pd.package_id + LEFT JOIN nu_config_directive_package_item pd ON dp.id = pd.package_id LEFT JOIN nu_config_service_directive csd ON pd.directive_id = csd.id LEFT JOIN nu_directive_body_tag bdt ON csd.id = bdt.directive_id LEFT JOIN nu_config_body_tag cdbt ON bdt.tag_id = cdbt.id @@ -179,7 +179,7 @@