From b0b09870e7bfd3d3cda7a38cc924e86c633938e5 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 08:56:03 +0800
Subject: [PATCH] 增加app任务详情查看时间和查看位置 修复用户不按部门过滤的问题
---
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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 ba53338..e2279ec 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;
/**
@@ -66,6 +68,29 @@
/** app浠诲姟璇︽儏鍥剧墖淇℃伅 */
private List<ArdAppTaskDetailPic> ardAppTaskDetailPic;
+ /** 棣栨鏌ョ湅鏃堕棿 */
+ @Excel(name = "棣栨鏌ョ湅鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date viewTime;
+ /** 棣栨鏌ョ湅浣嶇疆 */
+ @Excel(name = "棣栨鏌ョ湅浣嶇疆")
+ private String viewPosition;
+
+ 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;
--
Gitblit v1.9.3