From 060fdcf1affe35136f1dd69d6cdd1cbe70d5eec0 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 3 Mar 2026 10:58:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?=
=?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=AF=A6=E6=83=85-=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=9B=9E=E6=98=BE=202=E3=80=81=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=EF=BC=9A=20=091=EF=BC=89=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=9C=8D?=
=?UTF-8?q?=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=B1=95=E7=A4=BA=E3=80=81=E5=8E=BB?=
=?UTF-8?q?=E9=99=A4=E8=B6=85=E6=97=B6=E6=97=B6=E9=95=BF=E3=80=81=E5=B0=86?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8C=87=E4=BB=A4=E5=9B=BE=E6=A0=87=E3=80=81?=
=?UTF-8?q?=E7=84=A6=E7=82=B9=E6=8C=87=E4=BB=A4=E5=9B=BE=E6=A0=87=E6=8C=AA?=
=?UTF-8?q?=E5=88=B0=E6=8C=87=E4=BB=A4=E6=8F=8F=E8=BF=B0=E4=B8=8A=E6=96=B9?=
=?UTF-8?q?=20=092=EF=BC=89=E5=8F=98=E6=9B=B4=E7=B1=BB=E5=9E=8B=EF=BC=9A?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=9B=9E?=
=?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/nu/dto/DirectiveAsyncMQDto.java | 11 +-
.../com/nu/dto/DirectiveOpeLogInfoMQDto.java | 103 +++++++++++++-----
.../entity/DirectiveOpeLogInfo.java | 7 ++
.../entity/DirectiveOpeLogMain.java | 1 +
.../entity/ConfigServiceDirective.java | 7 ++
.../xml/ConfigServiceDirectiveMapper.xml | 3 +-
6 files changed, 104 insertions(+), 28 deletions(-)
diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
index 4b5bbcd..27a0afe 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
@@ -1,6 +1,9 @@
package com.nu.dto;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
@@ -53,9 +56,13 @@ public class DirectiveAsyncMQDto implements Serializable {
*/
private String chargingFrequency;
/**
- * 周期类型 1日常护理 2周期护理 3即时护理
+ * 指令类型 1日常护理 2周期护理 3即时护理
*/
private String cycleType;
+ /**
+ * 服务属性 ds定时 js计时
+ */
+ private String serviceAttribute;
/**
* 排序
*/
@@ -159,7 +166,7 @@ public class DirectiveAsyncMQDto implements Serializable {
private String categoryName;
//服务类型中文名称
private String typeName;
- //周期类型中文名称
+ //指令类型中文名称
private String cycleTypeName;
//体型标签id,id,id
private String bodyTags;
diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java
index 2a2cdce..7b0e70c 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,59 +20,111 @@ import java.util.Date;
/**
* @Description: 服务指令操作日志详情表
* @Author: jeecg-boot
- * @Date: 2025-12-22
+ * @Date: 2025-12-22
* @Version: V1.0
*/
@Data
public class DirectiveOpeLogInfoMQDto implements Serializable {
private static final long serialVersionUID = 1L;
- /**id*/
+ /**
+ * id
+ */
private String id;
- /**nu_config_directive_ope_log_main.id*/
+ /**
+ * nu_config_directive_ope_log_main.id
+ */
private String pkId;
- /**分类标签*/
+ /**
+ * 分类标签
+ */
private String instructionTagId;
- /**分类标签名称*/
+ /**
+ * 分类标签名称
+ */
private String instructionTagName;
- /**服务类别id*/
+ /**
+ * 服务类别id
+ */
private String categoryId;
- /**服务类别名称*/
+ /**
+ * 服务类别名称
+ */
private String categoryName;
- /**服务类型id*/
+ /**
+ * 服务类型id
+ */
private String typeId;
- /**服务类型名称*/
+ /**
+ * 服务类型名称
+ */
private String typeName;
- /**服务指令id*/
+ /**
+ * 服务指令id
+ */
private String directiveId;
- /**服务指令名称*/
+ /**
+ * 服务指令名称
+ */
private String directiveName;
- /**收费价格*/
+ /**
+ * 收费价格
+ */
private BigDecimal tollPrice;
- /**提成价格*/
+ /**
+ * 提成价格
+ */
private BigDecimal comPrice;
- /**服务说明*/
+ /**
+ * 服务属性 ds定时 js计时
+ */
+ private java.lang.String serviceAttribute;
+ /**
+ * 服务说明
+ */
private String serviceContent;
- /**服务时长（分钟）*/
+ /**
+ * 服务时长（分钟）
+ */
private String serviceDuration;
- /**超时时长（分钟）*/
+ /**
+ * 超时时长（分钟）
+ */
private String timeoutDuration;
- /**所属部门*/
+ /**
+ * 所属部门
+ */
private String sysOrgCode;
- /**语音文件*/
+ /**
+ * 语音文件
+ */
private String mp3File;
- /**视频文件*/
+ /**
+ * 视频文件
+ */
private String mp4File;
- /**服务指令图片大图*/
+ /**
+ * 服务指令图片大图
+ */
private String previewFile;
- /**服务指令图片小图*/
+ /**
+ * 服务指令图片小图
+ */
private String previewFileSmall;
- /**即时指令图片*/
+ /**
+ * 即时指令图片
+ */
private String immediateFile;
- /**即时指令焦点图片*/
+ /**
+ * 即时指令焦点图片
+ */
private String immediateFileFocus;
- /**创建日期*/
+ /**
+ * 创建日期
+ */
private Date createTime;
- /**数据类型 1修改前 2修改后*/
+ /**
+ * 数据类型 1修改前 2修改后
+ */
private String dataType;
}
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java
index 62380e7..7252fcf 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java
@@ -87,6 +87,13 @@ public class DirectiveOpeLogInfo implements Serializable {
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理")
@Dict(dicCode = "period_type")
private String cycleType;
+ /**
+ * 服务属性 ds定时 js计时
+ */
+ @Excel(name = "服务属性 ds定时 js计时", width = 15)
+ @ApiModelProperty(value = "服务属性 ds定时 js计时")
+ @Dict(dicCode = "service_attribute")
+ private java.lang.String serviceAttribute;
/**服务说明*/
@Excel(name = "服务说明", width = 15)
@ApiModelProperty(value = "服务说明")
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogMain.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogMain.java
index d637f2b..853e97d 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogMain.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogMain.java
@@ -76,4 +76,5 @@ public class DirectiveOpeLogMain implements Serializable {
@Excel(name = "周期类型名称", width = 15)
@ApiModelProperty(value = "周期类型名称")
private String cycleTypeName;
+
}
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
index 04d4a5e..535dbb8 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
@@ -96,6 +96,13 @@ public class ConfigServiceDirective implements Serializable {
@ApiModelProperty(value = "收费频次")
@Dict(dicCode = "billing_frequency")
private java.lang.String chargingFrequency;
+ /**
+ * 服务属性 ds定时 js计时
+ */
+ @Excel(name = "服务属性 ds定时 js计时", width = 15)
+ @ApiModelProperty(value = "服务属性 ds定时 js计时")
+ @Dict(dicCode = "service_attribute")
+ private java.lang.String serviceAttribute;
/**
* 排序
*/
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
index 14f0688..7ee7aba 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
@@ -15,7 +15,7 @@
-
+
@@ -64,6 +64,7 @@
c.iz_reimbursement,
c.iz_preferential,
c.charging_frequency,
+ c.service_attribute,
c.sort,
c.service_content,
c.service_duration,