From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001 From: tangzy <tangzy123456> Date: Mon, 06 Dec 2021 14:03:37 +0800 Subject: [PATCH] 1.资格审查排序 --- src/main/java/org/springblade/modules/recordk/entity/Recordk.java | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java index dc0f6a2..613de10 100644 --- a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java +++ b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java @@ -16,23 +16,18 @@ */ package org.springblade.modules.recordk.entity; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; - -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.springframework.format.annotation.DateTimeFormat; /** * 实体类 @@ -151,6 +146,35 @@ private Date officetime; @TableId(value = "id", type = IdType.AUTO) private Integer id; - + private String deptid; + private String representativecell; + private String contacts; + private String contactscell; + private String approve; + private String cardid; + private String ptype; + //派出所审批 + private String papprove; + //县审批 + private String xapprove; + //市审批 + private String sapprove; + //派出意见 + private String popinion; + //县意见 + private String xopinion; + //市意见 + private String sopinion; + private String jurisdiction; +// +// @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 HH:mm:ss",timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// private Date permitime; } -- Gitblit v1.9.3