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 5884537..2eb3153 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 @@ -1,17 +1,18 @@ 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_zqz - * + * * @author hs - * @date 2024-06-14 + * @date 2024-06-15 */ public class DaZqz extends BaseEntity { @@ -60,6 +61,11 @@ public class DaZqz extends BaseEntity @Excel(name = "性别1") private String sex1; + /** 出生日期1 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期1", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthDate1; + /** 身份证号1 */ @Excel(name = "身份证号1") private String cardId1; @@ -76,6 +82,11 @@ public class DaZqz extends BaseEntity @Excel(name = "性别2") private String sex2; + /** 出生日期2 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期2", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthDate2; + /** 身份证号2 */ @Excel(name = "身份证号2") private String cardId2; @@ -88,6 +99,11 @@ public class DaZqz extends BaseEntity @Excel(name = "姓名3") private String name3; + /** 出生日期3 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期3", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthDate3; + /** 性别3 */ @Excel(name = "性别3") private String sex3; @@ -108,6 +124,11 @@ public class DaZqz extends BaseEntity @Excel(name = "性别4") private String sex4; + /** 出生日期4 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期4", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthDate4; + /** 身份证号4 */ @Excel(name = "身份证号4") private String cardId4; @@ -173,354 +194,390 @@ public class DaZqz extends BaseEntity @Excel(name = "审核原由") private String auditReason; - public void setId(Long id) + 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 setNum(String num) + public void setNum(String num) { this.num = num; } - public String getNum() + public String getNum() { return num; } - public void setName(String name) + public void setName(String name) { this.name = name; } - public String getName() + public String getName() { return name; } - public void setCardId(String cardId) + public void setCardId(String cardId) { this.cardId = cardId; } - public String getCardId() + public String getCardId() { return cardId; } - public void setAddress(String address) + public void setAddress(String address) { this.address = address; } - public String getAddress() + public String getAddress() { return address; } - public void setDjJg(String djJg) + public void setDjJg(String djJg) { this.djJg = djJg; } - public String getDjJg() + public String getDjJg() { return djJg; } - public void setRelation1(String relation1) + public void setRelation1(String relation1) { this.relation1 = relation1; } - public String getRelation1() + public String getRelation1() { return relation1; } - public void setName1(String name1) + public void setName1(String name1) { this.name1 = name1; } - public String getName1() + public String getName1() { return name1; } - public void setSex1(String sex1) + public void setSex1(String sex1) { this.sex1 = sex1; } - public String getSex1() + public String getSex1() { return sex1; } - public void setCardId1(String cardId1) + public void setBirthDate1(Date birthDate1) + { + this.birthDate1 = birthDate1; + } + + public Date getBirthDate1() + { + return birthDate1; + } + public void setCardId1(String cardId1) { this.cardId1 = cardId1; } - public String getCardId1() + public String getCardId1() { return cardId1; } - public void setRelation2(String relation2) + public void setRelation2(String relation2) { this.relation2 = relation2; } - public String getRelation2() + public String getRelation2() { return relation2; } - public void setName2(String name2) + public void setName2(String name2) { this.name2 = name2; } - public String getName2() + public String getName2() { return name2; } - public void setSex2(String sex2) + public void setSex2(String sex2) { this.sex2 = sex2; } - public String getSex2() + public String getSex2() { return sex2; } - public void setCardId2(String cardId2) + public void setBirthDate2(Date birthDate2) + { + this.birthDate2 = birthDate2; + } + + public Date getBirthDate2() + { + return birthDate2; + } + public void setCardId2(String cardId2) { this.cardId2 = cardId2; } - public String getCardId2() + public String getCardId2() { return cardId2; } - public void setRelation3(String relation3) + public void setRelation3(String relation3) { this.relation3 = relation3; } - public String getRelation3() + public String getRelation3() { return relation3; } - public void setName3(String name3) + public void setName3(String name3) { this.name3 = name3; } - public String getName3() + public String getName3() { return name3; } - public void setSex3(String sex3) + public void setBirthDate3(Date birthDate3) + { + this.birthDate3 = birthDate3; + } + + public Date getBirthDate3() + { + return birthDate3; + } + public void setSex3(String sex3) { this.sex3 = sex3; } - public String getSex3() + public String getSex3() { return sex3; } - public void setCardId3(String cardId3) + public void setCardId3(String cardId3) { this.cardId3 = cardId3; } - public String getCardId3() + public String getCardId3() { return cardId3; } - public void setRelation4(String relation4) + public void setRelation4(String relation4) { this.relation4 = relation4; } - public String getRelation4() + public String getRelation4() { return relation4; } - public void setName4(String name4) + public void setName4(String name4) { this.name4 = name4; } - public String getName4() + public String getName4() { return name4; } - public void setSex4(String sex4) + public void setSex4(String sex4) { this.sex4 = sex4; } - public String getSex4() + public String getSex4() { return sex4; } - public void setCardId4(String cardId4) + public void setBirthDate4(Date birthDate4) + { + this.birthDate4 = birthDate4; + } + + public Date getBirthDate4() + { + return birthDate4; + } + public void setCardId4(String cardId4) { this.cardId4 = cardId4; } - public String getCardId4() + public String getCardId4() { return cardId4; } - public void setFwdw(String fwdw) + public void setFwdw(String fwdw) { this.fwdw = fwdw; } - public String getFwdw() + public String getFwdw() { return fwdw; } - public void setQrAddress(String qrAddress) + public void setQrAddress(String qrAddress) { this.qrAddress = qrAddress; } - public String getQrAddress() + public String getQrAddress() { return qrAddress; } - public void setZqReason(String zqReason) + public void setZqReason(String zqReason) { this.zqReason = zqReason; } - public String getZqReason() + public String getZqReason() { return zqReason; } - public void setPzjg(String pzjg) + public void setPzjg(String pzjg) { this.pzjg = pzjg; } - public String getPzjg() + public String getPzjg() { return pzjg; } - public void setCbr(String cbr) + public void setCbr(String cbr) { this.cbr = cbr; } - public String getCbr() + public String getCbr() { return cbr; } - public void setQfDate(Date qfDate) + public void setQfDate(Date qfDate) { this.qfDate = qfDate; } - public Date getQfDate() + public Date getQfDate() { return qfDate; } - 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; } @@ -528,50 +585,54 @@ public class DaZqz extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ywType", getYwType()) - .append("muId", getMuId()) - .append("num", getNum()) - .append("name", getName()) - .append("cardId", getCardId()) - .append("address", getAddress()) - .append("djJg", getDjJg()) - .append("relation1", getRelation1()) - .append("name1", getName1()) - .append("sex1", getSex1()) - .append("cardId1", getCardId1()) - .append("relation2", getRelation2()) - .append("name2", getName2()) - .append("sex2", getSex2()) - .append("cardId2", getCardId2()) - .append("relation3", getRelation3()) - .append("name3", getName3()) - .append("sex3", getSex3()) - .append("cardId3", getCardId3()) - .append("relation4", getRelation4()) - .append("name4", getName4()) - .append("sex4", getSex4()) - .append("cardId4", getCardId4()) - .append("fwdw", getFwdw()) - .append("qrAddress", getQrAddress()) - .append("zqReason", getZqReason()) - .append("pzjg", getPzjg()) - .append("cbr", getCbr()) - .append("qfDate", getQfDate()) - .append("picIds", getPicIds()) - .append("pictures", getPictures()) - .append("allPicIds", getAllPicIds()) - .append("allPics", getAllPics()) - .append("errorCorrect", getErrorCorrect()) - .append("auditStatus", getAuditStatus()) - .append("auditName", getAuditName()) - .append("auditResult", getAuditResult()) - .append("auditReason", getAuditReason()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + .append("id", getId()) + .append("ywType", getYwType()) + .append("muId", getMuId()) + .append("num", getNum()) + .append("name", getName()) + .append("cardId", getCardId()) + .append("address", getAddress()) + .append("djJg", getDjJg()) + .append("relation1", getRelation1()) + .append("name1", getName1()) + .append("sex1", getSex1()) + .append("birthDate1", getBirthDate1()) + .append("cardId1", getCardId1()) + .append("relation2", getRelation2()) + .append("name2", getName2()) + .append("sex2", getSex2()) + .append("birthDate2", getBirthDate2()) + .append("cardId2", getCardId2()) + .append("relation3", getRelation3()) + .append("name3", getName3()) + .append("birthDate3", getBirthDate3()) + .append("sex3", getSex3()) + .append("cardId3", getCardId3()) + .append("relation4", getRelation4()) + .append("name4", getName4()) + .append("sex4", getSex4()) + .append("birthDate4", getBirthDate4()) + .append("cardId4", getCardId4()) + .append("fwdw", getFwdw()) + .append("qrAddress", getQrAddress()) + .append("zqReason", getZqReason()) + .append("pzjg", getPzjg()) + .append("cbr", getCbr()) + .append("qfDate", getQfDate()) + .append("picIds", getPicIds()) + .append("pictures", getPictures()) + .append("allPicIds", getAllPicIds()) + .append("allPics", getAllPics()) + .append("errorCorrect", getErrorCorrect()) + .append("auditStatus", getAuditStatus()) + .append("auditName", getAuditName()) + .append("auditResult", getAuditResult()) + .append("auditReason", getAuditReason()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml index 0d4ac76..d1a8440 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -16,18 +16,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -52,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, yw_type, mu_id, num, name, card_id, address, dj_jg, relation1, name1, sex1, card_id1, relation2, name2, sex2, card_id2, relation3, name3, sex3, card_id3, relation4, name4, sex4, card_id4, fwdw, qr_address, zq_reason, pzjg, cbr, qf_date, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_zqz + select id, yw_type, mu_id, num, name, card_id, address, dj_jg, relation1, name1, sex1, birth_date1, card_id1, relation2, name2, sex2, birth_date2, card_id2, relation3, name3, birth_date3, sex3, card_id3, relation4, name4, sex4, birth_date4, card_id4, fwdw, qr_address, zq_reason, pzjg, cbr, qf_date, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_zqz