From f66630e72727bcf0e46ffd5134fbb2fd88f6ea75 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 02 Dec 2021 18:40:04 +0800
Subject: [PATCH] 1.统计

---
 src/main/java/org/springblade/modules/record/entity/Record.java |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index 7d24cad..8846c7f 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -145,6 +145,11 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date officetime;
 
+	@ApiModelProperty(value = "提交时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date permitime;
+
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 	private String deptid;
@@ -155,10 +160,38 @@
 	private String cardid;
 	private String jurisdiction;
 	private String ptype;
-	@ApiModelProperty(value = "提交时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	//派出所审批
+	private String papprove;
+	//县审批
+	private String xapprove;
+	//市审批
+	private String sapprove;
+	//派出意见
+	private String popinion;
+	//县意见
+	private String xopinion;
+	//市意见
+	private String sopinion;
+	@ApiModelProperty(value = "审批时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date overtime;
+
+
+	@ApiModelProperty(value = "派出所审批时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date permitime;
+	private Date ptime;
+
+	@ApiModelProperty(value = "县审批时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date stime;
+
+	@ApiModelProperty(value = "市审批时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date xtime;
 
 
 }

--
Gitblit v1.9.3