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 674beb3..2006b2f 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
@@ -2,12 +2,9 @@ package com.da.dangan.domain;
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 java.util.Date;
-
/**
* 出生登记对象 da_birth_dj
*
@@ -38,9 +35,8 @@ public class DaBirthDj extends BaseEntity
private String name;
/** 出生时间 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "出生时间", width = 30, dateFormat = "yyyy-MM-dd")
- private Date birthday;
+ @Excel(name = "出生时间")
+ private String birthday;
/** 性别 */
@Excel(name = "性别")
@@ -191,16 +187,16 @@ public class DaBirthDj extends BaseEntity
{
return name;
}
- public void setBirthday(Date birthday)
- {
- this.birthday = birthday;
- }
- public Date getBirthday()
- {
+ public String getBirthday() {
return birthday;
}
- public void setSex(String sex)
+
+ public void setBirthday(String birthday) {
+ this.birthday = birthday;
+ }
+
+ public void setSex(String sex)
{
this.sex = sex;
}
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 5840424..31421c3 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
@@ -2,12 +2,9 @@ package com.da.dangan.domain;
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 java.util.Date;
-
/**
* 常住人口登记对象 da_czrkdj
*
@@ -58,12 +55,9 @@ public class DaCzrkdj extends BaseEntity {
@Excel(name = "性别")
private String sex;
- /**
- * 出生日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date birthday;
+ /** 出生日期 */
+ @Excel(name = "出生日期")
+ private String birthday;
/**
* 出生地址
@@ -350,12 +344,12 @@ public class DaCzrkdj extends BaseEntity {
return sex;
}
- public void setBirthday(Date birthday) {
- this.birthday = birthday;
+ public String getBirthday() {
+ return birthday;
}
- public Date getBirthday() {
- return birthday;
+ public void setBirthday(String birthday) {
+ this.birthday = birthday;
}
public void setAddress(String address) {
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 137f988..2c07580 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
@@ -2,12 +2,9 @@ package com.da.dangan.domain;
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 java.util.Date;
-
/**
* 一胎证明对象 da_ytzm
*
@@ -91,9 +88,8 @@ public class DaYtzm extends BaseEntity {
/**
* 出生日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date birthday;
+ @Excel(name = "出生日期")
+ private String birthday;
/**
* 医院地址
@@ -123,17 +119,15 @@ public class DaYtzm extends BaseEntity {
* 填表日
* 填表日期1
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "填表日期1", width = 30, dateFormat = "yyyy-MM-dd")
- private Date tbDate1;
+ @Excel(name = "填表日期1")
+ private String tbDate1;
/**
* 填表日
* 填表日期2
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "填表日期2", width = 30, dateFormat = "yyyy-MM-dd")
- private Date tbDate2;
+ @Excel(name = "填表日期2")
+ private String tbDate2;
/**
* 识别图片id
@@ -285,12 +279,28 @@ public class DaYtzm extends BaseEntity {
return syzh;
}
- public void setBirthday(Date birthday) {
+ public String getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(String birthday) {
this.birthday = birthday;
}
- public Date getBirthday() {
- return birthday;
+ public String getTbDate1() {
+ return tbDate1;
+ }
+
+ public void setTbDate1(String tbDate1) {
+ this.tbDate1 = tbDate1;
+ }
+
+ public String getTbDate2() {
+ return tbDate2;
+ }
+
+ public void setTbDate2(String tbDate2) {
+ this.tbDate2 = tbDate2;
}
public void setHospital(String hospital) {
@@ -325,22 +335,6 @@ public class DaYtzm extends BaseEntity {
return pcsAddress;
}
- public void setTbDate1(Date tbDate1) {
- this.tbDate1 = tbDate1;
- }
-
- public Date getTbDate1() {
- return tbDate1;
- }
-
- public void setTbDate2(Date tbDate2) {
- this.tbDate2 = tbDate2;
- }
-
- public Date getTbDate2() {
- return tbDate2;
- }
-
public void setPicIds(String picIds) {
this.picIds = picIds;
}
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 218f25d..f9e144c 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
@@ -2,12 +2,9 @@ package com.da.dangan.domain;
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 java.util.Date;
-
/**
* 转非农业人口批复存根对象 da_zfnyhkcg
*
@@ -114,9 +111,8 @@ public class DaZfnyhkcg extends BaseEntity
private String cbr;
/** 承办日期 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "承办日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date cbDate;
+ @Excel(name = "承办日期")
+ private String cbDate;
/** 识别图片id */
@Excel(name = "识别图片id")
@@ -370,21 +366,20 @@ public class DaZfnyhkcg extends BaseEntity
{
return cbr;
}
- public void setCbDate(Date cbDate)
+ public void setPicIds(String picIds)
{
- this.cbDate = cbDate;
+ this.picIds = picIds;
}
- public Date getCbDate()
- {
+ public String getCbDate() {
return cbDate;
}
- public void setPicIds(String picIds)
- {
- this.picIds = picIds;
+
+ public void setCbDate(String cbDate) {
+ this.cbDate = cbDate;
}
- public String getPicIds()
+ public String getPicIds()
{
return picIds;
}
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 83a23ce..f70472f 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
@@ -2,12 +2,9 @@ package com.da.dangan.domain;
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 java.util.Date;
-
/**
* 准迁证对象 da_zqz
*
@@ -62,9 +59,8 @@ public class DaZqz extends BaseEntity
private String sex1;
/** 出生日期1 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "出生日期1", width = 30, dateFormat = "yyyy-MM-dd")
- private Date birthDate1;
+ @Excel(name = "出生日期1")
+ private String birthDate1;
/** 身份证号1 */
@Excel(name = "身份证号1")
@@ -83,9 +79,8 @@ public class DaZqz extends BaseEntity
private String sex2;
/** 出生日期2 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "出生日期2", width = 30, dateFormat = "yyyy-MM-dd")
- private Date birthDate2;
+ @Excel(name = "出生日期2")
+ private String birthDate2;
/** 身份证号2 */
@Excel(name = "身份证号2")
@@ -100,9 +95,8 @@ public class DaZqz extends BaseEntity
private String name3;
/** 出生日期3 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "出生日期3", width = 30, dateFormat = "yyyy-MM-dd")
- private Date birthDate3;
+ @Excel(name = "出生日期3")
+ private String birthDate3;
/** 性别3 */
@Excel(name = "性别3")
@@ -125,9 +119,8 @@ public class DaZqz extends BaseEntity
private String sex4;
/** 出生日期4 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "出生日期4", width = 30, dateFormat = "yyyy-MM-dd")
- private Date birthDate4;
+ @Excel(name = "出生日期4")
+ private String birthDate4;
/** 身份证号4 */
@Excel(name = "身份证号4")
@@ -154,9 +147,8 @@ public class DaZqz extends BaseEntity
private String cbr;
/** 签发日期 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "签发日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date qfDate;
+ @Excel(name = "签发日期")
+ private String qfDate;
/** 识别图片id */
@Excel(name = "识别图片id")
@@ -293,15 +285,7 @@ public class DaZqz extends BaseEntity
{
return sex1;
}
- public void setBirthDate1(Date birthDate1)
- {
- this.birthDate1 = birthDate1;
- }
- public Date getBirthDate1()
- {
- return birthDate1;
- }
public void setCardId1(String cardId1)
{
this.cardId1 = cardId1;
@@ -338,15 +322,7 @@ public class DaZqz extends BaseEntity
{
return sex2;
}
- public void setBirthDate2(Date birthDate2)
- {
- this.birthDate2 = birthDate2;
- }
- public Date getBirthDate2()
- {
- return birthDate2;
- }
public void setCardId2(String cardId2)
{
this.cardId2 = cardId2;
@@ -374,15 +350,7 @@ public class DaZqz extends BaseEntity
{
return name3;
}
- public void setBirthDate3(Date birthDate3)
- {
- this.birthDate3 = birthDate3;
- }
- public Date getBirthDate3()
- {
- return birthDate3;
- }
public void setSex3(String sex3)
{
this.sex3 = sex3;
@@ -428,15 +396,7 @@ public class DaZqz extends BaseEntity
{
return sex4;
}
- public void setBirthDate4(Date birthDate4)
- {
- this.birthDate4 = birthDate4;
- }
- public Date getBirthDate4()
- {
- return birthDate4;
- }
public void setCardId4(String cardId4)
{
this.cardId4 = cardId4;
@@ -491,15 +451,47 @@ public class DaZqz extends BaseEntity
{
return cbr;
}
- public void setQfDate(Date qfDate)
- {
- this.qfDate = qfDate;
+
+ public String getBirthDate1() {
+ return birthDate1;
}
- public Date getQfDate()
- {
+ public void setBirthDate1(String birthDate1) {
+ this.birthDate1 = birthDate1;
+ }
+
+ public String getBirthDate2() {
+ return birthDate2;
+ }
+
+ public void setBirthDate2(String birthDate2) {
+ this.birthDate2 = birthDate2;
+ }
+
+ public String getBirthDate3() {
+ return birthDate3;
+ }
+
+ public void setBirthDate3(String birthDate3) {
+ this.birthDate3 = birthDate3;
+ }
+
+ public String getBirthDate4() {
+ return birthDate4;
+ }
+
+ public void setBirthDate4(String birthDate4) {
+ this.birthDate4 = birthDate4;
+ }
+
+ public String getQfDate() {
return qfDate;
}
+
+ public void setQfDate(String qfDate) {
+ this.qfDate = qfDate;
+ }
+
public void setPicIds(String picIds)
{
this.picIds = picIds;
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml
index 9e72fd0..3c10c75 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml
@@ -87,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and audit_result = #{auditResult}
and audit_reason = #{auditReason}
+ order by id desc