From ec3294d78c54a9707d9ef74626bc4709d5daa1b1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 07 Mar 2022 11:35:31 +0800
Subject: [PATCH] 保安员批量导入修改，批量导入新增保安员证编号校验，同时向qfqk 推送数据

---
 src/main/java/org/springblade/modules/record/entity/Record.java |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 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 e796d9f..02cd6e1 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -154,13 +154,45 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date permitime;
 	private String approve;
-	private String examinetime;
 	private String cardid;
 	private String representativecell;
 	private String contacts;
 	private String contactscell;
 	private String storage;
 	private String jurisdiction;
+	//派出所审批
+	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 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