From 91959308333370ada5ffd7030b9c72459f4671db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 21 Jan 2026 15:54:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E5=88=A0?= =?UTF-8?q?=E9=99=A4net=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE=E6=B1=A0?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E5=8D=95=E5=88=A0=E9=99=A4=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/entity/CareDirectiveInstantEntity.java | 12 -- .../com/nu/entity/DirectiveOrderEntity.java | 8 - .../nu/entity/DirectiveOrderSubEntity.java | 8 - .../java/com/nu/entity/ElderTagEntity.java | 4 - .../LogisticsDirectiveInstantEntity.java | 12 -- .../mapper/xml/DirectiveDataPoolMapper.xml | 140 +++++++++++++++++- .../biz/plan/care/entity/ElderTagPlan.java | 10 -- .../entity/LogisticsDirectivePlan.java | 12 -- 8 files changed, 134 insertions(+), 72 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveInstantEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveInstantEntity.java index 1fa33979..c861a925 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveInstantEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveInstantEntity.java @@ -40,28 +40,16 @@ public class CareDirectiveInstantEntity implements Serializable { private String directiveName; /**即时指令图标*/ private String immediateFile; - /**即时指令图标*/ - private String netImmediateFile; /**即时指令焦点图标*/ private String immediateFileFocus; - /**即时指令焦点图标*/ - private String netImmediateFileFocus; /**服务指令图片大图*/ private String previewFile; - /**服务指令图片大图*/ - private String netPreviewFile; /**服务指令图片小图*/ private String previewFileSmall; - /**服务指令图片小图*/ - private String netPreviewFileSmall; /**指令音频文件*/ private String mp3File; - /**指令音频文件-网络地址*/ - private String netMp3File; /**指令视频文件*/ private String mp4File; - /**指令视频文件-网络地址*/ - private String netMp4File; /**服务时长（分钟）*/ private String serviceDuration; /**服务描述*/ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java index 1bc292a8..2a66a004 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java @@ -70,20 +70,12 @@ public class DirectiveOrderEntity implements Serializable { private String cycleValue; /**服务指令图片大图*/ private String previewFile; - /**服务指令图片大图-网络地址*/ - private String netPreviewFile; /**服务指令图片小图*/ private String previewFileSmall; - /**服务指令图片小图-网络地址*/ - private String netPreviewFileSmall; /**语音文件*/ private String mp3File; - /**语音文件-网络地址*/ - private String netMp3File; /**视频文件*/ private String mp4File; - /**视频文件-网络地址*/ - private String netMp4File; /**服务时长（分钟）*/ private String serviceDuration; /**服务说明*/ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java index adde1441..bdf2872f 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java @@ -61,20 +61,12 @@ public class DirectiveOrderSubEntity implements Serializable { private String cycleValue; /**服务指令图片大图*/ private String previewFile; - /**服务指令图片大图-网络地址*/ - private String netPreviewFile; /**服务指令图片小图*/ private String previewFileSmall; - /**服务指令图片小图-网络地址*/ - private String netPreviewFileSmall; /**语音文件*/ private String mp3File; - /**语音文件-网络地址*/ - private String netMp3File; /**视频文件*/ private String mp4File; - /**视频文件-网络地址*/ - private String netMp4File; /**服务时长（分钟）*/ private String serviceDuration; /**服务说明*/ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderTagEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderTagEntity.java index 589597b5..25a7a605 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderTagEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderTagEntity.java @@ -34,12 +34,8 @@ public class ElderTagEntity implements Serializable { private String tagType; /**图标*/ private String pic; - /**图标*/ - private String netPic; /**焦点图标*/ private String picFocus; - /**图标*/ - private String netPicFocus; /**创建人*/ private String createBy; /**创建日期*/ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveInstantEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveInstantEntity.java index 7e5aa69f..2ecc25fd 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveInstantEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveInstantEntity.java @@ -41,28 +41,16 @@ public class LogisticsDirectiveInstantEntity implements Serializable { private String directiveName; /**即时指令图标*/ private String immediateFile; - /**即时指令图标*/ - private String netImmediateFile; /**即时指令焦点图标*/ private String immediateFileFocus; - /**即时指令焦点图标*/ - private String netImmediateFileFocus; /**服务指令图片大图*/ private String previewFile; - /**服务指令图片大图*/ - private String netPreviewFile; /**服务指令图片小图*/ private String previewFileSmall; - /**服务指令图片小图*/ - private String netPreviewFileSmall; /**指令音频文件*/ private String mp3File; - /**指令音频文件-网络地址*/ - private String netMp3File; /**指令视频文件*/ private String mp4File; - /**指令视频文件-网络地址*/ - private String netMp4File; /**服务时长（分钟）*/ private String serviceDuration; /**服务描述*/ 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 5cea3783..feaac232 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 @@ -92,9 +92,44 @@ - insert into ${tableName} - select a.*,#{operationFlag} - from nu_biz_nu_directive_data_pool a + insert into ${tableName} ( + id, + pool_type, + biz_id, + nu_id, + directive_id, + cycle_type_id, + cycle_value, + iz_package, + start_time, + iz_orders, + iz_start, + create_by, + create_time, + update_by, + update_time, + del_flag, + operation_flag + ) + select + id, + pool_type, + biz_id, + nu_id, + directive_id, + cycle_type_id, + cycle_value, + iz_package, + start_time, + iz_orders, + iz_start, + create_by, + create_time, + update_by, + update_time, + del_flag, + #{operationFlag} + from nu_biz_nu_directive_data_pool AND id = #{id} @@ -210,9 +245,102 @@ - insert into ${tableName} - select a.*,#{remarks} - from nu_biz_nu_directive_order a + insert into ${tableName} ( + id, + order_no, + order_type, + opt_type, + pool_id, + biz_id, + biz_type, + nu_id, + nu_name, + elder_id, + elder_name, + employee_id, + employee_name, + directive_id, + directive_name, + cycle_type_id, + cycle_type, + cycle_value, + preview_file, + preview_file_small, + mp3_file, + mp4_file, + service_duration, + service_content, + iz_package, + toll_price, + com_price, + real_com_price, + start_time, + end_time, + begin_emp, + begin_time, + finish_emp, + finish_time, + iz_start, + iz_finish, + initiator_id, + initiator_name, + create_emp, + create_by, + create_time, + update_emp, + update_by, + update_time, + del_flag, + remarks + ) + select + id, + order_no, + order_type, + opt_type, + pool_id, + biz_id, + biz_type, + nu_id, + nu_name, + elder_id, + elder_name, + employee_id, + employee_name, + directive_id, + directive_name, + cycle_type_id, + cycle_type, + cycle_value, + preview_file, + preview_file_small, + mp3_file, + mp4_file, + service_duration, + service_content, + iz_package, + toll_price, + com_price, + real_com_price, + start_time, + end_time, + begin_emp, + begin_time, + finish_emp, + finish_time, + iz_start, + iz_finish, + initiator_id, + initiator_name, + create_emp, + create_by, + create_time, + update_emp, + update_by, + update_time, + del_flag, + #{remarks} + from nu_biz_nu_directive_order where id = #{id} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/ElderTagPlan.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/ElderTagPlan.java index 29e6e5ec..8ea019f0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/ElderTagPlan.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/ElderTagPlan.java @@ -63,21 +63,11 @@ public class ElderTagPlan implements Serializable { @ApiModelProperty(value = "图标") @TableField(exist = false) private String pic; - /**图标*/ - @Excel(name = "图标", width = 15) - @ApiModelProperty(value = "图标") - @TableField(exist = false) - private String netPic; /**焦点图标*/ @Excel(name = "焦点图标", width = 15) @ApiModelProperty(value = "焦点图标") @TableField(exist = false) private String picFocus; - /**图标*/ - @Excel(name = "图标", width = 15) - @ApiModelProperty(value = "图标") - @TableField(exist = false) - private String netPicFocus; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java index e52cea93..0c8354fc 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java @@ -61,28 +61,16 @@ public class LogisticsDirectivePlan implements Serializable { private String cycleValue; /**即时指令图标*/ private String immediateFile; - /**即时指令图标*/ - private String netImmediateFile; /**即时指令焦点图标*/ private String immediateFileFocus; - /**即时指令焦点图标*/ - private String netImmediateFileFocus; /**服务指令图片大图*/ private String previewFile; - /**服务指令图片大图*/ - private String netPreviewFile; /**服务指令图片小图*/ private String previewFileSmall; - /**服务指令图片小图*/ - private String netPreviewFileSmall; /**指令音频文件*/ private String mp3File; - /**指令音频文件-网络地址*/ - private String netMp3File; /**指令视频文件*/ private String mp4File; - /**指令视频文件-网络地址*/ - private String netMp4File; /**服务指令时长*/ private String serviceDuration; /**服务描述*/