From def329ac7a0215b6650d3aeccc7ca7d2fca62e5a Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 09:44:38 +0800
Subject: [PATCH] 配置
---
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 30 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 5303b0e..0472f38 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
@@ -1,13 +1,15 @@
package com.project.enforce.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+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,30 +53,48 @@
@Excel(name = "鎵�灞炲尯鍩�")
@ApiModelProperty("鎵�灞炲尯鍩�")
private String regionName;
- @Excel(name = "鎵ф硶鍘熷洜")
- @ApiModelProperty("鎵ф硶鍘熷洜")
+
+ @ApiModelProperty("鎵ф硶鍐呭")
+ private String enforceContent;
+
+
+ @ApiModelProperty("鎵ф硶涓婚")
private String enforceReason;
+
+ @ApiModelProperty("鎵ф硶绫诲瀷")
+ private String enforceType;
+
@Excel(name = "鐢宠浜篿d")
@ApiModelProperty("鐢宠浜篿d")
private Long applyId;
@Excel(name = "鐢宠浜�")
@ApiModelProperty("鐢宠浜�")
- private Long applyUser;
+ private String applyUser;
@Excel(name = "鐢宠浜虹數璇�")
@ApiModelProperty("鐢宠浜虹數璇�")
- private Long applyPhone;
+ private String applyPhone;
@Excel(name = "鐢宠浜哄崟浣�")
@ApiModelProperty("鐢宠浜哄崟浣�")
private Long applyDeptId;
@Excel(name = "鐢宠浜哄崟浣�")
@ApiModelProperty("鐢宠浜哄崟浣�")
- private Long applyDeptName;
+ private String applyDeptName;
@Excel(name = "鐢宠鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
- @Excel(name = "鎵ф硶闃熷憳鏁伴噺")
- @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+
+
+ @Excel(name = "璁″垝鎵ф硶鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private Date planTime;
+
+ @ApiModelProperty("鎵爜鍏ュ満鏃堕棿")
+ private Date inTime;
+
+ @Excel(name = "鎵ф硶闃熷憳浜烘暟")
+ @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
@Excel(name = "棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
@ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
@@ -82,49 +102,43 @@
@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 = "瀹℃壒浜篿d")
- @ApiModelProperty("瀹℃壒浜篿d")
- private Long checkId;
- @Excel(name = "瀹℃壒浜�")
- @ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
- @Excel(name = "瀹℃壒浜虹數璇�")
- @ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
private Long checkDeptId;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
- @Excel(name = "瀹℃壒鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("瀹℃壒鏃堕棿")
- private Date checkTime;
+ private String checkDeptName;
@Excel(name = "璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
@Excel(name = "瀹℃壒鍘熷洜")
@ApiModelProperty("瀹℃壒鍘熷洜")
private String checkReason;
+ @Excel(name = "褰撳墠瀹℃壒灞傜骇:")
+ @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
+ private Integer checkLevel;
+
+ @ApiModelProperty("褰撳墠瀹℃壒浜篿ds")
+ private String checkIds;
+
@Excel(name = "鎵ц浜篿d")
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
@Excel(name = "鎵ц浜�")
@ApiModelProperty("鎵ц浜�")
- private Long executeUser;
+ private String executeUser;
@Excel(name = "鎵ц浜虹數璇�")
@ApiModelProperty("鎵ц浜虹數璇�")
- private Long executePhone;
+ private String executePhone;
@Excel(name = "鎵ц浜哄崟浣�")
@ApiModelProperty("鎵ц浜哄崟浣�")
private Long executeDeptId;
@Excel(name = "鎵ц浜哄崟浣�")
@ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptName;
+ private String executeDeptName;
@Excel(name = "鎵ц鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鎵ц鏃堕棿")
@@ -154,4 +168,19 @@
@ApiModelProperty("璇勪环鎬诲緱鍒�")
private BigDecimal totalScore;
+ /** 鏄惁鎶曡瘔锛�0鍚︼紝1鏄� */
+ @ApiModelProperty("鏄惁鎶曡瘔锛�0鍚︼紝1鏄�")
+ private Integer isComplaint;
+
+ /** 鎶曡瘔绫诲瀷 */
+ @ApiModelProperty("鎶曡瘔绫诲瀷")
+ private String complaintType;
+
+ /** 鎶曡瘔鍐呭 */
+ @ApiModelProperty("鎶曡瘔鍐呭")
+ private String complaintReason;
+
+
+ @ApiModelProperty("鍚岃浜烘暟缁�")
+ private List<EnforcePeer> peers;
}
--
Gitblit v1.9.1