From b5df1cee65f3e9dcf554efcd3f1642a8c79d1e76 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 30 九月 2024 02:12:24 +0800 Subject: [PATCH] 点位监测更换对象+存入mongo+提取utils --- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 62 +++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 7 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java index dda5d06..95fbeb0 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java @@ -1,11 +1,15 @@ package com.ycl.platform.domain.vo; +import annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.platform.base.AbsVo; import com.ycl.platform.domain.entity.WorkOrder; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; + +import enumeration.general.WorkOrderStatusEnum; import org.springframework.lang.NonNull; import org.springframework.beans.BeanUtils; import io.swagger.annotations.ApiModel; @@ -20,32 +24,63 @@ * @since 2024-03-05 */ @Data -@Accessors(chain = true) -public class WorkOrderVO extends AbsVo { +public class WorkOrderVO{ /** 宸ュ崟鍙� */ + @Excel(name = "宸ュ崟鍙�",sort = 1) private String workOrderNo; - + private Integer id; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "鏁呴殰鏃堕棿",sort = 6,dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; /** 鐘舵�� */ - private String status; + private WorkOrderStatusEnum status; /** 杩愮淮鍗曚綅 */ private Integer unitId; + @Excel(name = "杩愮淮鍗曚綅",sort = 4) private String unitName; + private String unitContact; + private String unitContactPhone; - /** 宸ュ崟鏉ユ簮 */ + /** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */ + @Excel(name = "璁惧鍚嶇О",sort = 3) private String source; /** - * 鐐逛綅 + * 璁惧缂栧彿 */ - private Integer pointId; + @Excel(name = "璁惧缂栧彿",sort = 2) + private String serialNumber; + + private Boolean provinceTag; + + private Boolean importantTag; + + private Boolean importantCommandImageTag; + + /** + * 鏄惁閲嶇偣鐐逛綅 + */ + private Boolean important; /** 鏁呴殰绫诲瀷 */ + private List<String> errorTypeList; + + /** 鏁呴殰绫诲瀷 */ + @Excel(name = "鏁呴殰绫诲瀷") private String errorType; + + /** 宸ュ崟妫�娴嬪浘鐗� */ + private String imgListStr; + + private List<String> imgList; /** 杩愮淮浜哄憳 */ private Integer ywPeopleId; + private String ywPeopleName; /** 杩愮淮澶勭悊鏃堕棿 */ @@ -64,6 +99,19 @@ /** 0鏈秴鏃� 1瓒呮椂 */ private Integer overtime; + /** 涓嬪彂鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date distributeTime; + + private Date auditTime; + /** 涓嬪彂浜� */ + private String realName; + + /** + * 鏄惁鎵h繃绉垎 + */ + private Boolean deduct; + public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) { if(vo == null) { vo = new WorkOrderVO(); -- Gitblit v1.8.0