From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
index bf0a2a4..e52e26e 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
@@ -1,5 +1,6 @@
package com.ruoyi.app.task.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.app.taskdetail.domain.ArdAppTaskDetailPic;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -7,6 +8,7 @@
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
import java.util.List;
/**
@@ -54,8 +56,80 @@
@Excel(name = "任务ID")
private String taskId;
+ /**
+ * 状态（0未完成 1已完成）
+ */
+ @Excel(name = "状态", readConverterExp = "0=未完成,1=已完成")
+ private String status;
+
+ /** 打卡图片url */
+ @Excel(name = "打卡图片url")
+ private String clockInPicUrl;
+
/** app任务详情图片信息 */
private List<ArdAppTaskDetailPic> ardAppTaskDetailPic;
+ /** 查看时间 */
+ @Excel(name = "查看时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date viewTime;
+ /** 查看位置 */
+ @Excel(name = "查看位置")
+ private String viewPosition;
+ /** 弹窗标记 */
+ @Excel(name = "弹窗标记")
+ private String viewFlag;
+ /** 打卡时间*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "打卡时间")
+ private Date clockInTime;
+
+ public String getViewFlag() {
+ return viewFlag;
+ }
+
+ public void setViewFlag(String viewFlag) {
+ this.viewFlag = viewFlag;
+ }
+
+ public Date getClockInTime() {
+ return clockInTime;
+ }
+
+ public void setClockInTime(Date clockInTime) {
+ this.clockInTime = clockInTime;
+ }
+
+ public Date getViewTime() {
+ return viewTime;
+ }
+
+ public void setViewTime(Date viewTime) {
+ this.viewTime = viewTime;
+ }
+
+ public String getViewPosition() {
+ return viewPosition;
+ }
+
+ public void setViewPosition(String viewPosition) {
+ this.viewPosition = viewPosition;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getClockInPicUrl() {
+ return clockInPicUrl;
+ }
+
+ public void setClockInPicUrl(String clockInPicUrl) {
+ this.clockInPicUrl = clockInPicUrl;
+ }
public List<ArdAppTaskDetailPic> getArdAppTaskDetailPic() {
return ardAppTaskDetailPic;
--
Gitblit v1.9.3