From ddb9b1a011b26fec839618fe908dd7d1bacf4a9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 22 Oct 2021 20:02:36 +0800
Subject: [PATCH] 1.保安单位树接口修改 2.现场保安员,单位检查字段修改,接口修改 3.缴费记录接口修改 4.出资人,管理人员字段调整,接口修改,导出新增示例 5.考试中题目返回去除答案
---
src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java b/src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java
index 0e8438a..1aa8782 100644
--- a/src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java
+++ b/src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java
@@ -44,54 +44,48 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- /**
- * 保安员姓名
- */
- @ApiModelProperty(value = "保安员姓名")
- @TableField("realName")
- private String realname;
- /**
- * 保安员身份证号
- */
- @ApiModelProperty(value = "保安员身份证号")
- private String carid;
- /**
- * 保安员单位
- */
- @ApiModelProperty(value = "保安员单位")
- @TableField("sName")
- private String sname;
- /**
- * 检查人姓名
- */
- @ApiModelProperty(value = "检查人姓名")
- private String inspectman;
- /**
- * 检查人单位
- */
- @ApiModelProperty(value = "检查人单位")
- @TableField("deptName")
- private String deptname;
+
/**
* 检查日期
*/
@ApiModelProperty(value = "检查日期")
@TableField("reviewTime")
- private String reviewtime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reviewtime;
+
/**
* 检查内容
*/
@ApiModelProperty(value = "检查内容")
- private String insid;
+ private String content;
/**
* 检查结果
*/
@ApiModelProperty(value = "检查结果")
- private String examinationType;
+ private String result;
+
private String url;
- private String jid;
- private String deptid;
+
+ /**
+ * 检查人单位id
+ */
+ @TableField("examiner_dept_id")
+ private String examinerDeptId;
+
+ /**
+ * 检查人id
+ */
+ @TableField("examiner_id")
+ private String examinerId;
+
private String jurisdiction;
+ /**
+ * 保安员姓名
+ */
+ @ApiModelProperty(value = "保安员姓名")
+ @TableField("security_id")
+ private String securityId;
}
--
Gitblit v1.9.3