From d6793b7bb7c63ab4aeface9e5f1555f8d3e5b819 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 15 Oct 2025 09:39:43 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=91=98=E5=B7=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=9C=9F=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nu/dto/EmployeesApplyMQDto.java | 5 +++++ .../modules/employeesInfo/entity/BizEmployeesInfo.java | 10 ++++++++++ .../controller/EmployeesApplyController.java | 4 ++-- .../modules/employeesapply/entity/EmployeesApply.java | 9 +++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java index ec3b3db9..4814cd5f 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java @@ -99,4 +99,9 @@ public class EmployeesApplyMQDto implements Serializable { private Date opeTime; /**修改状态 1修改申请中 2通过 3驳回 */ private java.lang.String modifyStatus; + + /**身份证有效开始日期 */ + private Date startTime; + /**身份证有效结束日期 */ + private Date endTime; } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java index b951ebf1..76532551 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/BizEmployeesInfo.java @@ -13,6 +13,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * @Description: 员工信息 @@ -221,4 +222,13 @@ public class BizEmployeesInfo implements Serializable { @Excel(name = "修改状态", width = 15) @ApiModelProperty(value = "修改状态") private java.lang.String modifyStatus; + + /**有效开始日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") + @DateTimeFormat(pattern="yyyy.MM.dd") + private Date startTime; + /**有效结束日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") + @DateTimeFormat(pattern="yyyy.MM.dd") + private Date endTime; } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java index c31faee5..abe299ca 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java @@ -153,7 +153,7 @@ public class EmployeesApplyController extends JeecgController audit(@RequestBody EmployeesApply employeesApply) { employeesApplyService.audit(employeesApply); - return Result.OK("编辑成功!"); + return Result.OK("审核成功!"); } } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java index 4d0b43b9..09ba7f47 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java @@ -217,4 +217,13 @@ public class EmployeesApply implements Serializable { @TableField(exist = false) private String paramsTime; + /**有效开始日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") + @DateTimeFormat(pattern="yyyy.MM.dd") + private Date startTime; + /**有效结束日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") + @DateTimeFormat(pattern="yyyy.MM.dd") + private Date endTime; + }