From 22c8ab9035ba169b07f5d1bc09f3a8ca4402754d Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 26 六月 2024 10:12:11 +0800
Subject: [PATCH] 生产配置
---
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 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 1573111..0f55ef1 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,9 +53,17 @@
@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;
@@ -73,6 +83,17 @@
@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;
+
@Excel(name = "鎵ф硶闃熷憳浜烘暟")
@ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
@@ -82,8 +103,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("瀹℃壒浜哄崟浣�")
@@ -100,6 +121,10 @@
@Excel(name = "褰撳墠瀹℃壒灞傜骇:")
@ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
private Integer checkLevel;
+
+ @ApiModelProperty("褰撳墠瀹℃壒浜篿ds")
+ private String checkIds;
+
@Excel(name = "鎵ц浜篿d")
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
@@ -144,4 +169,23 @@
@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;
+
+
+ @ApiModelProperty("璇勪环鏁版嵁")
+ private EnforceEvaluateVo evaluateVo;
}
--
Gitblit v1.9.1