From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
index 98c9dde..379c7ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.system.model.Multifile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,6 +12,7 @@
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 杩愮淮宸℃浠诲姟 - 宸℃鐐逛俊鎭〃
@@ -19,7 +22,7 @@
 @Data
 @ApiModel("杩愮淮宸℃浠诲姟 - 宸℃鐐逛俊鎭〃")
 @TableName("`yw_patrol_task_record`")
-public class YwPatrolTaskRecord {
+public class YwPatrolTaskRecord  extends LoginUserModel {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,7 +35,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +43,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,15 +75,15 @@
 
     @ApiModelProperty(value = "澶勭悊鏃堕棿")
     @ExcelColumn(name="澶勭悊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date dealDate;
 
     @ApiModelProperty(value = "鏄惁宸℃  0=寰呭紑濮嬶紱1=宸插贰妫�锛�", example = "1")
     @ExcelColumn(name="鏄惁宸℃  0=寰呭紑濮嬶紱1=宸插贰妫�")
     private Integer status;
 
-    @ApiModelProperty(value = "宸℃缁撴灉  0=姝e父锛�1=寮傚父", example = "1")
-    @ExcelColumn(name="宸℃缁撴灉  0=姝e父锛�1=寮傚父")
+    @ApiModelProperty(value = "宸℃缁撴灉  0=姝e父锛�1=寮傚父;2=璺宠繃锛�", example = "1")
+    @ExcelColumn(name="宸℃缁撴灉  0=姝e父锛�1=寮傚父锛�2=璺宠繃锛�")
     private Integer dealStatus;
 
     @ApiModelProperty(value = "澶勭悊澶囨敞")
@@ -94,4 +95,50 @@
     @TableField(exist = false)
     private String pointName;
 
+    @ApiModelProperty(value = "澶勭悊浜�")
+    @TableField(exist = false)
+    private String realname;
+
+    @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty(value = "宸℃鍐呭")
+    @TableField(exist = false)
+    private String content;
+
+    @ApiModelProperty(value = "宸℃鐐圭紪鐮�")
+    @TableField(exist = false)
+    private String pointCode;
+
+    @ApiModelProperty(value = "璁惧涓婚敭")
+    @TableField(exist = false)
+    private Integer deviceId;
+
+    @ApiModelProperty(value = "闄勪欢鍒楄〃")
+    @TableField(exist = false)
+    private List<Multifile> multifileList;
+
+
+    @ApiModelProperty(value = "宸℃璁″垝鍚嶇О")
+    @TableField(exist = false)
+    private String schemeTitle;
+
+    @ApiModelProperty(value = "宸℃浠诲姟缂栧彿")
+    @TableField(exist = false)
+    private String taskCode;
+
+    @ApiModelProperty(value = "寮�濮嬫棩鏈�")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startDate;
+
+    @ApiModelProperty(value = "缁撴潫鏃ユ湡")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+
+
+
+
 }

--
Gitblit v1.9.3