From bb60b5747d5f4b85655a541d4990ec7464497b1b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 五月 2024 18:18:02 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/PatArchive.java |  258 +++++++++++++++++++++++----------------------------
 1 files changed, 116 insertions(+), 142 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index 773f0e9..fbfa3e8 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -1,8 +1,13 @@
 package com.smartor.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,254 +19,223 @@
  * @author smartor
  * @date 2023-03-04
  */
+@ApiModel(value = "PatArchive", description = "鎮h�呮。妗堝璞�")
+@Data
 public class PatArchive extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
      * 鑷ID
      */
+    @ApiModelProperty("鑷ID")
     private Long patid;
 
     /**
      * 濮撳悕
      */
+    @ApiModelProperty("濮撳悕")
     @Excel(name = " 濮撳悕 ")
     private String name;
 
     /**
      * 鎬у埆  1:鐢� 2:濂�
      */
+    @ApiModelProperty("鎬у埆")
     @Excel(name = " 鎬у埆 ")
     private Long sex;
 
     /**
+     * 璇佷欢绫诲瀷
+     */
+    @ApiModelProperty("璇佷欢绫诲瀷")
+    @Excel(name = " 璇佷欢绫诲瀷 ")
+    private String idcardtype;
+
+
+    /**
      * 璇佷欢鍙风爜
      */
+    @ApiModelProperty("绫嶈疮")
+    @Excel(name = " 绫嶈疮 ")
+    private String nativePlace;
+
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("灞呬綇鍦�")
+    @Excel(name = " 灞呬綇鍦� ")
+    private String placeOfResidence;
+
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("鍑虹敓鍦�")
+    @Excel(name = " 鍑虹敓鍦� ")
+    private String birthplace;
+
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("璇佷欢鍙风爜")
     @Excel(name = " 璇佷欢鍙风爜 ")
-    private String iccardno;
+    private String idcardno;
 
     /**
      * 鐢熸棩
      */
+    @ApiModelProperty("鐢熸棩")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date birthdate;
 
     /**
+     * 鍏ラ櫌鏃堕棿
+     */
+    @ApiModelProperty("鍏ラ櫌鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inhosptime;
+
+    /**
      * 骞撮緞
      */
+    @ApiModelProperty("骞撮緞")
     @Excel(name = " 骞撮緞 ")
     private Long age;
 
     /**
      * 鏉ユ簮
      */
+    @ApiModelProperty("鏉ユ簮")
     @Excel(name = " 鏉ユ簮 ")
-    private Long source;
+    private Long sourcefrom;
 
     /**
      * 寤烘。鏃堕棿
      */
+    @ApiModelProperty("寤烘。鏃堕棿")
+    @Excel(name = " 寤烘。鏃堕棿 ")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date archivetime;
 
     /**
      * 寤烘。浜�
      */
+    @ApiModelProperty("寤烘。浜�")
+    @Excel(name = " 寤烘。浜� ")
     private String archiveby;
 
     /**
      * 鎵嬫満鍙风爜
      */
+    @ApiModelProperty("鎵嬫満鍙风爜")
     @Excel(name = " 鎵嬫満鍙风爜 ")
     private String telcode;
+
 
     /**
      * 浜插睘鍙风爜
      */
+    @ApiModelProperty("浜插睘鍙风爜")
+    @Excel(name = " 浜插睘鍙风爜 ")
     private String relativetelcode;
 
     /**
-     * 璇佷欢绫诲瀷
+     * 姘戞棌
      */
-    private String iccardtype;
+    @ApiModelProperty("姘戞棌")
+    @Excel(name = " 姘戞棌 ")
+    private String nation;
 
     /**
      * 鏈烘瀯ID
      */
+    @ApiModelProperty("鏈烘瀯ID")
     @Excel(name = " 鏈烘瀯ID ")
     private String orgid;
 
     /**
      * 寰俊openid
      */
+    @ApiModelProperty("寰俊openid")
+    @Excel(name = " 寰俊openid ")
     private String openid;
 
     /**
      * 鍒犻櫎鏍囪
      */
+    @ApiModelProperty("鍒犻櫎鏍囪")
     private String delFlag;
 
     /**
      * 涓婁紶鏍囪
      */
+    @ApiModelProperty("涓婁紶鏍囪")
     private Long isupload;
 
     /**
      * 涓婁紶鏃堕棿
      */
+    @ApiModelProperty("涓婁紶鏃堕棿")
     private Date uploadTime;
 
     /**
      * 鏍囩
      */
+    @ApiModelProperty("鏍囩")
+    @Excel(name = " 鏍囩 ", cellType = Excel.ColumnType.STRING)
     private String tag;
 
-    public void setPatid(Long patid) {
-        this.patid = patid;
-    }
+    /**
+     * 鏍囩
+     */
+    @ApiModelProperty("鏍囩id")
+    @Excel(name = " 鏍囩id ", cellType = Excel.ColumnType.STRING)
+    private Long tagid;
 
-    public Long getPatid() {
-        return patid;
-    }
+    @ApiModelProperty("鏍囩闆嗗悎")
+    private List<PatArchivetag> tagList;
 
-    public void setName(String name) {
-        this.name = name;
-    }
+    /**
+     * 鏍囩
+     */
+    @ApiModelProperty("鎮h�呯被鍨�")
+    @Excel(name = " 鎮h�呯被鍨� ", cellType = Excel.ColumnType.STRING)
+    private String pattype;
 
-    public String getName() {
-        return name;
-    }
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("閽夐拤鍙�")
+    @Excel(name = " 閽夐拤鍙� ")
+    private String dduserid;
 
-    public void setSex(Long sex) {
-        this.sex = sex;
-    }
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("绉戝")
+    @Excel(name = " 绉戝 ")
+    private String dept;
 
-    public Long getSex() {
-        return sex;
-    }
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("绉戝")
+    @Excel(name = " 绉戝 ")
+    private String bedNo;
 
-    public void setIccardno(String iccardno) {
-        this.iccardno = iccardno;
-    }
-
-    public String getIccardno() {
-        return iccardno;
-    }
-
-    public void setBirthdate(Date birthdate) {
-        this.birthdate = birthdate;
-    }
-
-    public Date getBirthdate() {
-        return birthdate;
-    }
-
-    public void setAge(Long age) {
-        this.age = age;
-    }
-
-    public Long getAge() {
-        return age;
-    }
-
-    public void setSource(Long source) {
-        this.source = source;
-    }
-
-    public Long getSource() {
-        return source;
-    }
-
-    public void setArchivetime(Date archivetime) {
-        this.archivetime = archivetime;
-    }
-
-    public Date getArchivetime() {
-        return archivetime;
-    }
-
-    public void setArchiveby(String archiveby) {
-        this.archiveby = archiveby;
-    }
-
-    public String getArchiveby() {
-        return archiveby;
-    }
-
-    public void setTelcode(String telcode) {
-        this.telcode = telcode;
-    }
-
-    public String getTelcode() {
-        return telcode;
-    }
-
-    public void setRelativetelcode(String relativetelcode) {
-        this.relativetelcode = relativetelcode;
-    }
-
-    public String getRelativetelcode() {
-        return relativetelcode;
-    }
-
-    public void setIccardtype(String iccardtype) {
-        this.iccardtype = iccardtype;
-    }
-
-    public String getIccardtype() {
-        return iccardtype;
-    }
-
-    public void setOrgid(String orgid) {
-        this.orgid = orgid;
-    }
-
-    public String getOrgid() {
-        return orgid;
-    }
-
-    public void setOpenid(String openid) {
-        this.openid = openid;
-    }
-
-    public String getOpenid() {
-        return openid;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setIsupload(Long isupload) {
-        this.isupload = isupload;
-    }
-
-    public Long getIsupload() {
-        return isupload;
-    }
-
-    public void setUploadTime(Date uploadTime) {
-        this.uploadTime = uploadTime;
-    }
-
-    public Date getUploadTime() {
-        return uploadTime;
-    }
-
-    public String getTag() {
-        return tag;
-    }
-
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
+    /**
+     * 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳
+     */
+    @ApiModelProperty("浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳")
+    @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
+    private String viptype;
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("iccardno", getIccardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("iccardtype", getIccardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("idcardno", getIdcardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("sourcefrom", getSourcefrom()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("idcardtype", getIdcardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
     }
 }

--
Gitblit v1.9.3