From ffcd2271b69e4833230e728ddf7ab2d0d3483995 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Jul 2021 17:25:48 +0800
Subject: [PATCH] 1.派遣单位新增行政区 2.就业记录新增保安员编号字段
---
src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java | 5 +++++
src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java | 13 +++++++++++--
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml | 3 +++
src/main/java/org/springblade/modules/experience/entity/Experience.java | 6 ++++++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
index 23b3138..f3493f1 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/Dispatcher.java
@@ -62,9 +62,9 @@
@ApiModelProperty(value = "派遣人")
private String dispatcher;
/**
- * 派遣时间
+ * 派遣开始时间
*/
- @ApiModelProperty(value = "派遣时间")
+ @ApiModelProperty(value = "派遣开始时间")
@TableField("dispatcherTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -89,4 +89,13 @@
@TableField("user_ids")
private String userIds;
+
+ /**
+ * 派遣结束时间
+ */
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
index 630b653..70acbed 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -77,5 +77,10 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ /**
+ * 行政区id
+ */
+ private Long jurisdiction;
+
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
index 5060f61..45d4220 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -32,6 +32,9 @@
<if test="dispatcherUnit.city!=null">
and sdu.city = #{dispatcherUnit.city}
</if>
+ <if test="dispatcherUnit.jurisdiction!=null">
+ and sdu.jurisdiction = #{dispatcherUnit.jurisdiction}
+ </if>
<if test="dispatcherUnit.district!=null">
and sdu.district = #{dispatcherUnit.district}
</if>
diff --git a/src/main/java/org/springblade/modules/experience/entity/Experience.java b/src/main/java/org/springblade/modules/experience/entity/Experience.java
index be8ddde..5515845 100644
--- a/src/main/java/org/springblade/modules/experience/entity/Experience.java
+++ b/src/main/java/org/springblade/modules/experience/entity/Experience.java
@@ -106,5 +106,11 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ /**
+ * 保安员编号
+ */
+ @TableField("securityId")
+ private String securityid;
+
}
--
Gitblit v1.9.3