From 4869cbba175ed1f8488ac1fda6fede13da72b3d9 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 27 八月 2024 11:35:56 +0800
Subject: [PATCH] 同行人缓存
---
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
index d2ca42d..19fd8cd 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
@@ -2,12 +2,14 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.annotation.Excel;
+import com.project.enforce.domain.EnforcePeer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
@@ -51,8 +53,12 @@
@Excel(name = "鎵�灞炲尯鍩�")
@ApiModelProperty("鎵�灞炲尯鍩�")
private String regionName;
- @Excel(name = "鎵ф硶鍘熷洜")
- @ApiModelProperty("鎵ф硶鍘熷洜")
+
+ @ApiModelProperty("鎵ф硶鍐呭")
+ private String enforceContent;
+
+
+ @ApiModelProperty("鎵ф硶涓婚")
private String enforceReason;
@ApiModelProperty("鎵ф硶绫诲瀷")
@@ -77,6 +83,21 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
+
+
+ @Excel(name = "璁″垝鎵ф硶鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date planTime;
+
+ @ApiModelProperty("鎵爜鍏ュ満鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date inTime;
+
+ @ApiModelProperty("浼佷笟纭鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+
@Excel(name = "鎵ф硶闃熷憳浜烘暟")
@ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
@@ -86,8 +107,8 @@
@Excel(name = "棰勮鍘熷洜")
@ApiModelProperty("棰勮鍘熷洜")
private String warnReason;
- @Excel(name = "璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
- @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
+ @Excel(name = "璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2宸插鎵瑰緟鎵ц锛�3宸叉墽琛屽緟涓婃姤锛�4宸蹭笂鎶�")
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2宸插鎵瑰緟鎵ц锛�3宸叉墽琛屽緟涓婃姤锛�4宸蹭笂鎶�")
private Integer orderStatus;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
@@ -104,6 +125,10 @@
@Excel(name = "褰撳墠瀹℃壒灞傜骇:")
@ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
private Integer checkLevel;
+
+ @ApiModelProperty("褰撳墠瀹℃壒浜篿ds")
+ private String checkIds;
+
@Excel(name = "鎵ц浜篿d")
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
@@ -152,8 +177,20 @@
@ApiModelProperty("鏄惁鎶曡瘔锛�0鍚︼紝1鏄�")
private Integer isComplaint;
+ /** 鎶曡瘔绫诲瀷 */
+ @ApiModelProperty("鎶曡瘔绫诲瀷")
+ private String complaintType;
+
/** 鎶曡瘔鍐呭 */
@ApiModelProperty("鎶曡瘔鍐呭")
private String complaintReason;
+
+
+ @ApiModelProperty("鍚岃浜烘暟缁�")
+ private List<EnforcePeer> peers;
+
+
+ @ApiModelProperty("璇勪环鏁版嵁")
+ private EnforceEvaluateVo evaluateVo;
}
--
Gitblit v1.9.1