From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
index 56e2a5b..069ed5b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
@@ -1,15 +1,17 @@
package com.ycl.platform.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.YwPoint;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
+
+import enumeration.general.ImportantTagEnum;
+import enumeration.general.ProvinceTagEnum;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -20,22 +22,23 @@
* @since 2024-03-05
*/
@Data
-@Accessors(chain = true)
public class YwPointVO extends AbsVo {
/** 鐐逛綅鍚嶇О */
private String pointName;
/** 鐐逛綅寮�濮嬫椂闂� */
- private LocalDateTime startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
/** 鐐逛綅缁撴潫鏃堕棿 */
- private LocalDateTime endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
/** 杩愮淮鍗曚綅 */
- private Integer unitId;
-
+ private Long unitId;
private String unitName;
+
/** 杩愮淮鐘舵�� */
private String status;
@@ -44,7 +47,16 @@
private Short category;
+ /** 鐩戠閮ㄩ棬 */
+ private Long deptId;
+ private List<Long> deptIds;
private String deptName;
+
+ /** 閲嶇偣鐐逛綅鏍囩 */
+ private ImportantTagEnum importantTag;
+ /** 鐪佸巺鐐逛綅鏍囩 */
+ private ProvinceTagEnum provinceTag;
+
public static YwPointVO getVoByEntity(@NonNull YwPoint entity, YwPointVO vo) {
if(vo == null) {
vo = new YwPointVO();
--
Gitblit v1.8.0