diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java index c8d14de..db1dbb7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/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/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml index 513f8af..060525d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml @@ -75,7 +75,7 @@ - update nu_config_directive_package set total_duration = #{duration} where id = #{id} + update nu_config_directive_package_main set total_duration = #{duration} where id = #{id} @@ -141,14 +141,14 @@ 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' and id in #{item.id} ) 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 @@ -163,7 +163,7 @@ - delete from nu_config_package_directive where package_id = #{package.id} + delete from nu_config_directive_package_item where package_id = #{package.id} - INSERT INTO nu_config_package_directive (package_id, directive_id, sort) + INSERT INTO nu_config_directive_package_item (package_id, directive_id, sort) VALUES (#{package.id}, #{directive.id}, #{directive.sort})