From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java
index 0cde530..fa18faf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,16 +24,20 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_template_detail")
@ApiModel(value="TTemplateDetail对象", description="任务模板详情")
-public class TTemplateDetail extends BaseModel {
+public class TTemplateDetail implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
- @ApiModelProperty(value = "周期 单位天")
+ @ApiModelProperty(value = "周期值")
@TableField("cycle")
private Integer cycle;
+
+ @ApiModelProperty(value = "周期 单位 1=天 2=周 3=月 4=季度 5=年度")
+ @TableField("cycle_type")
+ private Integer cycleType;
@ApiModelProperty(value = "每个保洁员被抽查")
@TableField("num1")
@@ -45,7 +51,13 @@
@TableField("num3")
private Integer num3;
- @ApiModelProperty(value = "点位类型覆盖率json")
+ @ApiModelProperty(value = "点位类型覆盖率json [{\n" +
+ "\t\t\"id\": \"18678093453\",\n" +
+ "\t\t\"value\": 18\n" +
+ "\n" +
+ "\t}, {\n" +
+ "\t\t\"id\": \"18678093453\",\n" +
+ "\t\t\"value\": 18\n" + "}]\n")
@TableField("num4")
private String num4;
@@ -53,5 +65,37 @@
@TableField("template_id")
private String templateId;
+ @ApiModelProperty(value = "当前周期值")
+ @TableField("current_value")
+ private Integer currentValue;
+ @ApiModelProperty(value = "记录创建人，前端忽略")
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
+ private String createBy;
+ /**
+ * 新增和更新执行
+ */
+ @ApiModelProperty(value = "记录修改人，前端忽略")
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
+ /**
+ * 删除 未删除
+ */
+ @JsonIgnore
+ @TableField("`disabled`")
+ @TableLogic
+ private Boolean disabled;
+
+ @ApiModelProperty(value = "记录创建时间，前端忽略")
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 最后修改时间
+ */
+ @ApiModelProperty(value = "记录修改时间，前端忽略")
+ @TableField("update_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
}
--
Gitblit v1.7.1