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/permit/entity/Permit.java | 195 +++++++++++++++++++++++++++++-------------------
1 files changed, 117 insertions(+), 78 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/entity/Permit.java b/src/main/java/org/springblade/modules/permit/entity/Permit.java
index 22271f3..ab63223 100644
--- a/src/main/java/org/springblade/modules/permit/entity/Permit.java
+++ b/src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -16,16 +16,18 @@
*/
package org.springblade.modules.permit.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 java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+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;
/**
* 实体类
@@ -41,100 +43,137 @@
private static final long serialVersionUID = 1L;
/**
- * 统一社会信用代码
- */
- @ApiModelProperty(value = "统一社会信用代码")
- @TableField("creditCode")
+ * 统一社会信用代码
+ */
+ @ApiModelProperty(value = "统一社会信用代码")
+ @TableField("creditCode")
private String creditcode;
/**
- * 企业名称
- */
- @ApiModelProperty(value = "企业名称")
- @TableField("enterpriseName")
+ * 企业名称
+ */
+ @ApiModelProperty(value = "企业名称")
+ @TableField("enterpriseName")
private String enterprisename;
/**
- * 法定代表人
- */
- @ApiModelProperty(value = "法定代表人")
- private String representative;
+ * 法定代表人
+ */
+ @ApiModelProperty(value = "法定代表人")
+ private String representative;
/**
- * 登记状态
- */
- @ApiModelProperty(value = "登记状态")
- private String
-regstsat;
+ * 成立日期
+ */
+ @ApiModelProperty(value = "成立日期")
+ @TableField("establishTime")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date establishtime;
+
+ @ApiModelProperty(value = "提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date permitime;
/**
- * 成立日期
- */
- @ApiModelProperty(value = "成立日期")
- @TableField("establishTime")
- private LocalDateTime establishtime;
- /**
- * 注册资本
- */
- @ApiModelProperty(value = "注册资本")
- @TableField("registeredCapital")
+ * 注册资本
+ */
+ @ApiModelProperty(value = "注册资本")
+ @TableField("registeredCapital")
private String registeredcapital;
/**
- * 实缴资本
- */
- @ApiModelProperty(value = "实缴资本")
- private String capital;
- /**
- * 组织机构代码
- */
- @ApiModelProperty(value = "组织机构代码")
- @TableField("organizationCode")
+ * 组织机构代码
+ */
+ @ApiModelProperty(value = "组织机构代码")
+ @TableField("organizationCode")
private String organizationcode;
/**
- * 工商注册号
- */
- @ApiModelProperty(value = "工商注册号")
- @TableField("registrationNumber")
+ * 工商注册号
+ */
+ @ApiModelProperty(value = "工商注册号")
+ @TableField("registrationNumber")
private String registrationnumber;
/**
- * 纳税人识别号
- */
- @ApiModelProperty(value = "纳税人识别号")
- @TableField("identificationNumber")
+ * 纳税人识别号
+ */
+ @ApiModelProperty(value = "纳税人识别号")
+ @TableField("identificationNumber")
private String identificationnumber;
/**
- * 企业类型
- */
- @ApiModelProperty(value = "企业类型")
- private String enterprises;
+ * 企业类型
+ */
+ @ApiModelProperty(value = "企业类型")
+ private String enterprises;
/**
- * 注册地址
- */
- @ApiModelProperty(value = "注册地址")
- private String address;
+ * 注册地址
+ */
+ @ApiModelProperty(value = "注册地址")
+ private String address;
/**
- * 经营范围
- */
- @ApiModelProperty(value = "经营范围")
- private String business;
+ * 经营范围
+ */
+ @ApiModelProperty(value = "经营范围")
+ private String business;
/**
- * 所属地区
- */
- @ApiModelProperty(value = "所属地区")
- private String region;
+ * 所属地区
+ */
+ @ApiModelProperty(value = "所属地区")
+ private String region;
/**
- * 登记机关
- */
- @ApiModelProperty(value = "登记机关")
- private String registration;
+ * 登记机关
+ */
+ @ApiModelProperty(value = "登记机关")
+ private String registration;
/**
- * 所属行业
- */
- @ApiModelProperty(value = "所属行业")
- private String industry;
+ * 所属行业
+ */
+ @ApiModelProperty(value = "所属行业")
+ private String industry;
/**
- * 审核状态 0:审核通过 1：审核不通过 2: 审核中
- */
- @ApiModelProperty(value = "审核状态 0:审核通过 1：审核不通过 2: 审核中")
- private String type;
+ * 审核状态 0:审核通过 1：审核不通过 2: 审核中
+ */
+ @ApiModelProperty(value = "审核状态 0:审核通过 1：审核不通过 2: 审核中")
+ private String type;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ private String deptid;
+ private String ptype;
+ private String storage;
+ private String cardid;
+ private String representativecell;
+ private String contacts;
+ private String contactscell;
+ private String approve;
+ 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