yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改表名 

原nu_config_directive_package
新nu_config_directive_package_main

原nu_config_package_directive
新nu_config_directive_package_item
This commit is contained in:
1378012178@qq.com 2026-02-03 10:46:44 +08:00
parent 8372fa02a0
commit f81731d15a
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml
View File

@ -62,7 +62,7 @@
a.total_duration as serviceDuration, a.total_duration as serviceDuration,
a.description as serviceContent, a.description as serviceContent,
a.timeout_duration as timeoutDuration a.timeout_duration as timeoutDuration
from nu_config_directive_package a from nu_config_directive_package_main a
where a.id = #{id} where a.id = #{id}
and a.del_flag = '0' and a.del_flag = '0'
and a.iz_enabled = 'Y' and a.iz_enabled = 'Y'

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
View File

@ -489,7 +489,7 @@
a.total_duration as serviceDuration, a.total_duration as serviceDuration,
a.description as serviceContent, a.description as serviceContent,
a.timeout_duration as timeoutDuration a.timeout_duration as timeoutDuration
from nu_config_directive_package a from nu_config_directive_package_main a
where a.id = #{directiveId} where a.id = #{directiveId}
and a.del_flag = '0' and a.del_flag = '0'
and a.iz_enabled = 'Y' and a.iz_enabled = 'Y'

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml
View File

@ -45,8 +45,8 @@
b.service_duration AS serviceDuration, b.service_duration AS serviceDuration,
b.service_content AS serviceContent, b.service_content AS serviceContent,
b.timeout_duration AS timeoutDuration b.timeout_duration AS timeoutDuration
FROM nu_config_directive_package p FROM nu_config_directive_package_main p
INNER JOIN nu_config_package_directive a ON p.id = a.package_id 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_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_category c ON b.category_id = c.id
LEFT JOIN nu_config_service_type d ON b.type_id = d.id LEFT JOIN nu_config_service_type d ON b.type_id = d.id

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml
View File

@ -211,7 +211,7 @@
FROM nu_biz_nu_care_directive_plan plan FROM nu_biz_nu_care_directive_plan plan
LEFT JOIN nu_base_info base ON plan.nu_id = base.nu_id 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_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_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_service_type stype ON directive.type_id = stype.id
WHERE 1=1 WHERE 1=1
@ -294,10 +294,10 @@
FROM nu_biz_nu_care_directive_plan p FROM nu_biz_nu_care_directive_plan p
LEFT JOIN nu_base_info base ON p.nu_id = base.nu_id 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_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_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_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} WHERE p.nu_id = #{dto.nuId}
AND ( AND (
-- 1: 每天执行 -- 1: 每天执行

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml
View File

@ -99,7 +99,7 @@
FROM nu_biz_nu_invoicing_directive_plan plan FROM nu_biz_nu_invoicing_directive_plan plan
LEFT JOIN nu_base_info base ON plan.nu_id = base.nu_id 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_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_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_service_type stype ON directive.type_id = stype.id
WHERE 1=1 WHERE 1=1

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/mapper/xml/LogisticsDirectivePlanMapper.xml
View File

@ -102,7 +102,7 @@
FROM nu_biz_nu_logistics_directive_plan plan FROM nu_biz_nu_logistics_directive_plan plan
LEFT JOIN nu_base_info base ON plan.nu_id = base.nu_id 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_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_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_service_type stype ON directive.type_id = stype.id
WHERE 1=1 WHERE 1=1

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml
View File

@ -10,7 +10,7 @@
c.category_name AS category_name, c.category_name AS category_name,
d.type_name AS type_name, d.type_name AS type_name,
e.instruction_name AS instruction_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_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_category c on b.category_id = c.id
left join nu_config_service_type d on b.type_id = d.id left join nu_config_service_type d on b.type_id = d.id

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java
View File

@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@TableName("nu_config_directive_package") @TableName("nu_config_directive_package_main")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_directive_package对象", description="服务指令包") @ApiModel(value="nu_directive_package对象", description="服务指令包")

12
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml
View File

@ -78,7 +78,7 @@
</collection> </collection>
</resultMap> </resultMap>
<update id="updateTotalDurationInt"> <update id="updateTotalDurationInt">
update nu_config_directive_package update nu_config_directive_package_main
set total_duration = #{duration} set total_duration = #{duration}
where id = #{id} where id = #{id}
</update> </update>
@ -150,7 +150,7 @@
cst.type_name AS cst_type_name, cst.type_name AS cst_type_name,
insTag.instruction_name AS instruction_name insTag.instruction_name AS instruction_name
FROM FROM
(SELECT * FROM nu_config_directive_package (SELECT * FROM nu_config_directive_package_main
<where> <where>
del_flag = '0' del_flag = '0'
<if test="ids != null and ids != ''"> <if test="ids != null and ids != ''">
@ -164,7 +164,7 @@
</if> </if>
</where> </where>
) dp ) 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_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_directive_body_tag bdt ON csd.id = bdt.directive_id
LEFT JOIN nu_config_body_tag cdbt ON bdt.tag_id = cdbt.id LEFT JOIN nu_config_body_tag cdbt ON bdt.tag_id = cdbt.id
@ -179,7 +179,7 @@
<!-- 查询总记录数 --> <!-- 查询总记录数 -->
<select id="queryTotal" resultType="java.lang.Long"> <select id="queryTotal" resultType="java.lang.Long">
SELECT COUNT(*) SELECT COUNT(*)
FROM nu_config_directive_package FROM nu_config_directive_package_main
<where> <where>
del_flag = '0' del_flag = '0'
<if test="directivePackage.packageName != null and directivePackage.packageName != ''"> <if test="directivePackage.packageName != null and directivePackage.packageName != ''">
@ -193,12 +193,12 @@
<delete id="deleteDirectives"> <delete id="deleteDirectives">
delete delete
from nu_config_package_directive from nu_config_directive_package_item
where package_id = #{package.id} where package_id = #{package.id}
</delete> </delete>
<insert id="saveDirectives"> <insert id="saveDirectives">
INSERT INTO nu_config_package_directive (package_id, directive_id, sort) INSERT INTO nu_config_directive_package_item (package_id, directive_id, sort)
VALUES VALUES
<foreach collection="package.getDirectives()" item="directive" separator=","> <foreach collection="package.getDirectives()" item="directive" separator=",">
(#{package.id}, #{directive.id}, #{directive.sort}) (#{package.id}, #{directive.id}, #{directive.sort})