From 2e06e39c2af8a5697f72f526f96eedf39d2b1a66 Mon Sep 17 00:00:00 2001 From: hansha Date: Mon, 17 Jun 2024 15:58:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/da/dangan/domain/DaBirthDj.java | 8 +- .../java/com/da/dangan/domain/DaCzrkdj.java | 6 +- .../main/java/com/da/dangan/domain/DaQyz.java | 6 +- .../java/com/da/dangan/domain/DaYtzm.java | 382 ++++++++++-------- .../java/com/da/dangan/domain/DaZfnyhkcg.java | 13 +- .../main/java/com/da/dangan/domain/DaZqz.java | 6 +- 6 files changed, 224 insertions(+), 197 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java index 206ed15..674beb3 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java @@ -22,7 +22,7 @@ public class DaBirthDj extends BaseEntity private Long id; /** 业务类型(字典) */ - @Excel(name = "业务类型(字典)") + @Excel(name = "业务类型",dictType = "yw_type") private String ywType; /** 目录id */ @@ -107,7 +107,7 @@ public class DaBirthDj extends BaseEntity private String jsUnit; /** 出生登记类型(字典) */ - @Excel(name = "出生登记类型(字典)") + // @Excel(name = "出生登记类型(字典)") private String djType; /** 识别图片id */ @@ -127,11 +127,11 @@ public class DaBirthDj extends BaseEntity private String allPics; /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错(字典0否1是)") + @Excel(name = "是否纠错",dictType = "error_correct") private String errorCorrect; /** 审核状态(字典) */ - @Excel(name = "审核状态(字典)") + @Excel(name = "审核状态",dictType = "audit_status") private String auditStatus; /** 审核人 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java index 3fa16d5..5840424 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java @@ -25,7 +25,7 @@ public class DaCzrkdj extends BaseEntity { /** * 业务类型(字典) */ - @Excel(name = "业务类型(字典)") + @Excel(name = "业务类型",dictType = "yw_type") private String ywType; /** @@ -267,13 +267,13 @@ public class DaCzrkdj extends BaseEntity { /** * 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错(字典0否1是)") + @Excel(name = "是否纠错",dictType = "error_correct") private String errorCorrect; /** * 审核状态(字典) */ - @Excel(name = "审核状态(字典)") + @Excel(name = "审核状态",dictType = "audit_status") private String auditStatus; /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java index 415895a..b517c78 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java @@ -19,7 +19,7 @@ public class DaQyz extends BaseEntity private Long id; /** 业务类型(字典) */ - @Excel(name = "业务类型(字典)") + @Excel(name = "业务类型",dictType = "yw_type") private String ywType; /** 目录id */ @@ -123,11 +123,11 @@ public class DaQyz extends BaseEntity private String allPics; /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错(字典0否1是)") + @Excel(name = "是否纠错",dictType = "error_correct") private String errorCorrect; /** 审核状态(字典) */ - @Excel(name = "审核状态(字典)") + @Excel(name = "审核状态",dictType = "audit_status") private String auditStatus; /** 审核人 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java index 64fcf4c..137f988 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java @@ -14,382 +14,408 @@ import java.util.Date; * @author hs * @date 2024-06-14 */ -public class DaYtzm extends BaseEntity -{ +public class DaYtzm extends BaseEntity { private static final long serialVersionUID = 1L; - /** id */ + /** + * id + */ private Long id; - /** 业务类型(字典) */ - @Excel(name = "业务类型(字典)") + /** + * 业务类型(字典) + */ + @Excel(name = "业务类型", dictType = "yw_type") private String ywType; - /** 目录id */ + /** + * 目录id + */ @Excel(name = "目录id") private Long muId; - /** 年份 */ + /** + * 年份 + */ @Excel(name = "年份") private String year; - /** 序号 */ + /** + * 序号 + */ @Excel(name = "序号") private String xh; - /** 姓名女 */ + /** + * 姓名女 + */ @Excel(name = "姓名女") private String wName; - /** 工作单位女 */ + /** + * 工作单位女 + */ @Excel(name = "工作单位女") private String wUnit; - /** 身份证号女 */ + /** + * 身份证号女 + */ @Excel(name = "身份证号女") private String wCardId; - /** 姓名男 */ + /** + * 姓名男 + */ @Excel(name = "姓名男") private String mName; - /** 工作单位男 */ + /** + * 工作单位男 + */ @Excel(name = "工作单位男") private String mUnit; - /** 身份证号男 */ + /** + * 身份证号男 + */ @Excel(name = "身份证号男") private String mCardId; - /** 生育证号 */ + /** + * 生育证号 + */ @Excel(name = "生育证号") private String syzh; - /** 出生日期 */ + /** + * 出生日期 + */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd") private Date birthday; - /** 医院地址 */ + /** + * 医院地址 + */ @Excel(name = "医院地址") private String hospital; - /** 婴儿性别 */ + /** + * 婴儿性别 + */ @Excel(name = "婴儿性别") private String babySex; - /** 意见 */ + /** + * 意见 + */ @Excel(name = "意见") private String suggest; - /** 派出所位置 */ + /** + * 派出所位置 + */ @Excel(name = "派出所位置") private String pcsAddress; - /** 填表日 - 填表日期1 */ + /** + * 填表日 + * 填表日期1 + */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "填表日期1", width = 30, dateFormat = "yyyy-MM-dd") - private Date tbDate1; + private Date tbDate1; - /** 填表日 - 填表日期2 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "填表日期2", width = 30, dateFormat = "yyyy-MM-dd") - private Date tbDate2; - - /** 识别图片id */ - @Excel(name = "识别图片id") - private String picIds; - - /** 识别图片 */ - @Excel(name = "识别图片") - private String pictures; - - /** 相关图片id */ - @Excel(name = "相关图片id") - private String allPicIds; - - /** 相关图片 */ - @Excel(name = "相关图片") - private String allPics; - - /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错(字典0否1是)") - private String errorCorrect; - - /** 审核状态(字典) */ - @Excel(name = "审核状态(字典)") - private String auditStatus; - - /** 审核人 */ - @Excel(name = "审核人") - private String auditName; - - /** 审核结果 */ - @Excel(name = "审核结果") - private String auditResult; - - /** 审核原由 */ - @Excel(name = "审核原由") - private String auditReason; - - public void setId(Long id) - { + /** + * 填表日 + * 填表日期2 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "填表日期2", width = 30, dateFormat = "yyyy-MM-dd") + private Date tbDate2; + + /** + * 识别图片id + */ + @Excel(name = "识别图片id") + private String picIds; + + /** + * 识别图片 + */ + @Excel(name = "识别图片") + private String pictures; + + /** + * 相关图片id + */ + @Excel(name = "相关图片id") + private String allPicIds; + + /** + * 相关图片 + */ + @Excel(name = "相关图片") + private String allPics; + + /** + * 是否纠错(字典0否1是) + */ + @Excel(name = "是否纠错",dictType = "error_correct") + private String errorCorrect; + + /** + * 审核状态(字典) + */ + @Excel(name = "审核状态",dictType = "audit_status") + private String auditStatus; + + /** + * 审核人 + */ + @Excel(name = "审核人") + private String auditName; + + /** + * 审核结果 + */ + @Excel(name = "审核结果") + private String auditResult; + + /** + * 审核原由 + */ + @Excel(name = "审核原由") + private String auditReason; + + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setYwType(String ywType) - { + + public void setYwType(String ywType) { this.ywType = ywType; } - public String getYwType() - { + public String getYwType() { return ywType; } - public void setMuId(Long muId) - { + + public void setMuId(Long muId) { this.muId = muId; } - public Long getMuId() - { + public Long getMuId() { return muId; } - public void setYear(String year) - { + + public void setYear(String year) { this.year = year; } - public String getYear() - { + public String getYear() { return year; } - public void setXh(String xh) - { + + public void setXh(String xh) { this.xh = xh; } - public String getXh() - { + public String getXh() { return xh; } - public void setwName(String wName) - { + + public void setwName(String wName) { this.wName = wName; } - public String getwName() - { + public String getwName() { return wName; } - public void setwUnit(String wUnit) - { + + public void setwUnit(String wUnit) { this.wUnit = wUnit; } - public String getwUnit() - { + public String getwUnit() { return wUnit; } - public void setwCardId(String wCardId) - { + + public void setwCardId(String wCardId) { this.wCardId = wCardId; } - public String getwCardId() - { + public String getwCardId() { return wCardId; } - public void setmName(String mName) - { + + public void setmName(String mName) { this.mName = mName; } - public String getmName() - { + public String getmName() { return mName; } - public void setmUnit(String mUnit) - { + + public void setmUnit(String mUnit) { this.mUnit = mUnit; } - public String getmUnit() - { + public String getmUnit() { return mUnit; } - public void setmCardId(String mCardId) - { + + public void setmCardId(String mCardId) { this.mCardId = mCardId; } - public String getmCardId() - { + public String getmCardId() { return mCardId; } - public void setSyzh(String syzh) - { + + public void setSyzh(String syzh) { this.syzh = syzh; } - public String getSyzh() - { + public String getSyzh() { return syzh; } - public void setBirthday(Date birthday) - { + + public void setBirthday(Date birthday) { this.birthday = birthday; } - public Date getBirthday() - { + public Date getBirthday() { return birthday; } - public void setHospital(String hospital) - { + + public void setHospital(String hospital) { this.hospital = hospital; } - public String getHospital() - { + public String getHospital() { return hospital; } - public void setBabySex(String babySex) - { + + public void setBabySex(String babySex) { this.babySex = babySex; } - public String getBabySex() - { + public String getBabySex() { return babySex; } - public void setSuggest(String suggest) - { + + public void setSuggest(String suggest) { this.suggest = suggest; } - public String getSuggest() - { + public String getSuggest() { return suggest; } - public void setPcsAddress(String pcsAddress) - { + + public void setPcsAddress(String pcsAddress) { this.pcsAddress = pcsAddress; } - public String getPcsAddress() - { + public String getPcsAddress() { return pcsAddress; } - public void setTbDate1(Date tbDate1) - { + + public void setTbDate1(Date tbDate1) { this.tbDate1 = tbDate1; } - public Date getTbDate1() - { + public Date getTbDate1() { return tbDate1; } - public void setTbDate2(Date tbDate2) - { + + public void setTbDate2(Date tbDate2) { this.tbDate2 = tbDate2; } - public Date getTbDate2() - { + public Date getTbDate2() { return tbDate2; } - public void setPicIds(String picIds) - { + + public void setPicIds(String picIds) { this.picIds = picIds; } - public String getPicIds() - { + public String getPicIds() { return picIds; } - public void setPictures(String pictures) - { + + public void setPictures(String pictures) { this.pictures = pictures; } - public String getPictures() - { + public String getPictures() { return pictures; } - public void setAllPicIds(String allPicIds) - { + + public void setAllPicIds(String allPicIds) { this.allPicIds = allPicIds; } - public String getAllPicIds() - { + public String getAllPicIds() { return allPicIds; } - public void setAllPics(String allPics) - { + + public void setAllPics(String allPics) { this.allPics = allPics; } - public String getAllPics() - { + public String getAllPics() { return allPics; } - public void setErrorCorrect(String errorCorrect) - { + + public void setErrorCorrect(String errorCorrect) { this.errorCorrect = errorCorrect; } - public String getErrorCorrect() - { + public String getErrorCorrect() { return errorCorrect; } - public void setAuditStatus(String auditStatus) - { + + public void setAuditStatus(String auditStatus) { this.auditStatus = auditStatus; } - public String getAuditStatus() - { + public String getAuditStatus() { return auditStatus; } - public void setAuditName(String auditName) - { + + public void setAuditName(String auditName) { this.auditName = auditName; } - public String getAuditName() - { + public String getAuditName() { return auditName; } - public void setAuditResult(String auditResult) - { + + public void setAuditResult(String auditResult) { this.auditResult = auditResult; } - public String getAuditResult() - { + public String getAuditResult() { return auditResult; } - public void setAuditReason(String auditReason) - { + + public void setAuditReason(String auditReason) { this.auditReason = auditReason; } - public String getAuditReason() - { + public String getAuditReason() { return auditReason; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("ywType", getYwType()) .append("muId", getMuId()) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java index 7a6d501..218f25d 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java @@ -1,11 +1,12 @@ package com.da.dangan.domain; -import java.util.Date; +import com.da.common.annotation.Excel; +import com.da.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.da.common.annotation.Excel; -import com.da.common.core.domain.BaseEntity; + +import java.util.Date; /** * 转非农业人口批复存根对象 da_zfnyhkcg @@ -21,7 +22,7 @@ public class DaZfnyhkcg extends BaseEntity private Long id; /** 业务类型(字典) */ - @Excel(name = "业务类型(字典)") + @Excel(name = "业务类型",dictType = "yw_type") private String ywType; /** 目录id */ @@ -134,11 +135,11 @@ public class DaZfnyhkcg extends BaseEntity private String allPics; /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错(字典0否1是)") + @Excel(name = "是否纠错",dictType = "error_correct") private String errorCorrect; /** 审核状态(字典) */ - @Excel(name = "审核状态(字典)") + @Excel(name = "审核状态",dictType = "audit_status") private String auditStatus; /** 审核人 */ diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java index 2eb3153..83a23ce 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java @@ -22,7 +22,7 @@ public class DaZqz extends BaseEntity private Long id; /** 业务类型(字典) */ - @Excel(name = "业务类型(字典)") + @Excel(name = "业务类型",dictType = "yw_type") private String ywType; /** 目录id */ @@ -175,11 +175,11 @@ public class DaZqz extends BaseEntity private String allPics; /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错(字典0否1是)") + @Excel(name = "是否纠错",dictType = "error_correct") private String errorCorrect; /** 审核状态(字典) */ - @Excel(name = "审核状态(字典)") + @Excel(name = "审核状态",dictType = "audit_status") private String auditStatus; /** 审核人 */