diff --git a/src/main/java/cn/com/tenlion/controller/api/applystudentsnew/ApplyStudentsNewController.java b/src/main/java/cn/com/tenlion/controller/api/applystudentsnew/ApplyStudentsNewController.java
index 55493c2..0c97446 100644
--- a/src/main/java/cn/com/tenlion/controller/api/applystudentsnew/ApplyStudentsNewController.java
+++ b/src/main/java/cn/com/tenlion/controller/api/applystudentsnew/ApplyStudentsNewController.java
@@ -363,7 +363,7 @@ public class ApplyStudentsNewController extends DefaultBaseController {
params.put("grade", nullToempty(applyStudentsNewDTO.getExamGrade()));
params.put("cardTime", nullToempty(applyStudentsNewDTO.getCardTime()));
params.put("cardNumber", nullToempty(applyStudentsNewDTO.getIdCard()));
- params.put("cardValidity", nullToempty(applyStudentsNewDTO.getCardValidity()));
+ params.put("cardValidity", nullToempty(applyStudentsNewDTO.getCardValidity()) + "至" + nullToempty(applyStudentsNewDTO.getCardValidityEnd()));
params.put("orgName", nullToempty(applyStudentsNewDTO.getOrgName()));
if(!"530279c5-32a9-44db-bbf0-a04ef1cdae66".equals(params.get("workTypeParent"))) {
params.put("health", nullToempty(applyStudentsNewDTO.getHealth()));
diff --git a/src/main/java/cn/com/tenlion/pojo/bos/applystudentsnew/ApplyStudentsNewBO.java b/src/main/java/cn/com/tenlion/pojo/bos/applystudentsnew/ApplyStudentsNewBO.java
index 996f349..8c3a706 100644
--- a/src/main/java/cn/com/tenlion/pojo/bos/applystudentsnew/ApplyStudentsNewBO.java
+++ b/src/main/java/cn/com/tenlion/pojo/bos/applystudentsnew/ApplyStudentsNewBO.java
@@ -1,5 +1,7 @@
package cn.com.tenlion.pojo.bos.applystudentsnew;
+import io.swagger.annotations.ApiModelProperty;
+
/**
*
* @ClassName: ApplyStudentsNewBO
@@ -61,6 +63,7 @@ public class ApplyStudentsNewBO {
private String getCardTime;
private String retrainingTime;
private String jobType;
+ private String cardValidityEnd;
public String getApplyStudentsNewId() {
return applyStudentsNewId == null ? "" : applyStudentsNewId.trim();
@@ -469,4 +472,12 @@ public class ApplyStudentsNewBO {
public void setJobType(String jobType) {
this.jobType = jobType;
}
+
+ public String getCardValidityEnd() {
+ return cardValidityEnd;
+ }
+
+ public void setCardValidityEnd(String cardValidityEnd) {
+ this.cardValidityEnd = cardValidityEnd;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/applystudentsnew/ApplyStudentsNewDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/applystudentsnew/ApplyStudentsNewDTO.java
index 2de88d6..0620fc9 100644
--- a/src/main/java/cn/com/tenlion/pojo/dtos/applystudentsnew/ApplyStudentsNewDTO.java
+++ b/src/main/java/cn/com/tenlion/pojo/dtos/applystudentsnew/ApplyStudentsNewDTO.java
@@ -120,6 +120,8 @@ public class ApplyStudentsNewDTO {
private String retrainingTime;
@ApiModelProperty(name = "jobType", value = "作业类别")
private String jobType;
+ @ApiModelProperty(name = "cardValidityEnd", value = "证件有效期截止时间")
+ private String cardValidityEnd;
public String getApplyStudentsNewId() {
return applyStudentsNewId;
@@ -536,4 +538,12 @@ public class ApplyStudentsNewDTO {
public void setJobType(String jobType) {
this.jobType = jobType;
}
+
+ public String getCardValidityEnd() {
+ return cardValidityEnd;
+ }
+
+ public void setCardValidityEnd(String cardValidityEnd) {
+ this.cardValidityEnd = cardValidityEnd;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/pos/applystudentsnew/ApplyStudentsNewPO.java b/src/main/java/cn/com/tenlion/pojo/pos/applystudentsnew/ApplyStudentsNewPO.java
index bf122e9..08de8df 100644
--- a/src/main/java/cn/com/tenlion/pojo/pos/applystudentsnew/ApplyStudentsNewPO.java
+++ b/src/main/java/cn/com/tenlion/pojo/pos/applystudentsnew/ApplyStudentsNewPO.java
@@ -63,6 +63,7 @@ public class ApplyStudentsNewPO {
private String getCardTime;
private String retrainingTime;
private String jobType;
+ private String cardValidityEnd;
public String getApplyStudentsNewId() {
return applyStudentsNewId == null ? "" : applyStudentsNewId.trim();
@@ -471,4 +472,12 @@ public class ApplyStudentsNewPO {
public void setJobType(String jobType) {
this.jobType = jobType;
}
+
+ public String getCardValidityEnd() {
+ return cardValidityEnd;
+ }
+
+ public void setCardValidityEnd(String cardValidityEnd) {
+ this.cardValidityEnd = cardValidityEnd;
+ }
}
diff --git a/src/main/java/cn/com/tenlion/pojo/vos/applystudentsnew/ApplyStudentsNewVO.java b/src/main/java/cn/com/tenlion/pojo/vos/applystudentsnew/ApplyStudentsNewVO.java
index 63266be..fa2d46c 100644
--- a/src/main/java/cn/com/tenlion/pojo/vos/applystudentsnew/ApplyStudentsNewVO.java
+++ b/src/main/java/cn/com/tenlion/pojo/vos/applystudentsnew/ApplyStudentsNewVO.java
@@ -104,6 +104,8 @@ public class ApplyStudentsNewVO {
private String retrainingTime;
@ApiModelProperty(name = "jobType", value = "作业类别")
private String jobType;
+ @ApiModelProperty(name = "cardValidityEnd", value = "证件有效期截止时间")
+ private String cardValidityEnd;
public String getOrgId() {
return orgId == null ? "" : orgId.trim();
@@ -464,4 +466,12 @@ public class ApplyStudentsNewVO {
public void setJobType(String jobType) {
this.jobType = jobType;
}
+
+ public String getCardValidityEnd() {
+ return cardValidityEnd;
+ }
+
+ public void setCardValidityEnd(String cardValidityEnd) {
+ this.cardValidityEnd = cardValidityEnd;
+ }
}
diff --git a/src/main/resources/mybatis/mapper/applystudentsnew/apply-students-new-mapper.xml b/src/main/resources/mybatis/mapper/applystudentsnew/apply-students-new-mapper.xml
index 33142fc..ea557b9 100644
--- a/src/main/resources/mybatis/mapper/applystudentsnew/apply-students-new-mapper.xml
+++ b/src/main/resources/mybatis/mapper/applystudentsnew/apply-students-new-mapper.xml
@@ -50,6 +50,7 @@