From 9196b530f3d15afa2f70eb16c6c4939dd83e03eb Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Fri, 25 Jun 2021 17:23:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplyStudentsNewController.java | 2 +- .../applystudentsnew/ApplyStudentsNewBO.java | 11 +++++++ .../applystudentsnew/ApplyStudentsNewDTO.java | 10 ++++++ .../applystudentsnew/ApplyStudentsNewPO.java | 9 +++++ .../applystudentsnew/ApplyStudentsNewVO.java | 10 ++++++ .../apply-students-new-mapper.xml | 16 ++++++++- .../static/route/applystudentsnew/update.html | 33 ++++++++++++++++--- 7 files changed, 84 insertions(+), 7 deletions(-) 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 @@ + @@ -105,6 +106,7 @@ + @@ -160,6 +162,7 @@ + @@ -211,6 +214,7 @@ get_card_time, retraining_time, job_type, + card_validity_end, creator, gmt_create, modifier, @@ -263,6 +267,7 @@ #{getCardTime}, #{retrainingTime}, #{jobType}, + #{cardValidityEnd}, #{creator}, #{gmtCreate}, #{modifier}, @@ -438,10 +443,13 @@ job_type = #{jobType}, - jgmt_modified = #{gmtModified}, + gmt_modified = #{gmtModified}, modifier = #{modifier}, + + + card_validity_end = #{cardValidityEnd}, apply_students_new_id = apply_students_new_id WHERE @@ -502,6 +510,7 @@ t1.get_card_time, t1.retraining_time, t1.job_type, + t1.card_validity_end, t1.apply_students_new_id FROM e_apply_students_new t1 @@ -579,6 +588,7 @@ t1.get_card_time, t1.retraining_time, t1.job_type, + t1.card_validity_end, t1.creator, t1.gmt_create, t1.modifier, @@ -643,6 +653,7 @@ t1.get_card_time, t1.retraining_time, t1.job_type, + t1.card_validity_end, t1.creator, t1.gmt_create, t1.modifier, @@ -707,6 +718,7 @@ t1.get_card_time, t1.retraining_time, t1.job_type, + t1.card_validity_end, t1.creator, t1.gmt_create, t1.modifier, @@ -811,6 +823,7 @@ t1.get_card_time, t1.retraining_time, t1.job_type, + t1.card_validity_end, t1.creator, t1.gmt_create, t1.modifier, @@ -892,6 +905,7 @@ t1.get_card_time, t1.retraining_time, t1.job_type, + t1.card_validity_end, t1.creator, t1.gmt_create, t1.modifier, diff --git a/src/main/resources/static/route/applystudentsnew/update.html b/src/main/resources/static/route/applystudentsnew/update.html index fc7e180..b83ed4c 100644 --- a/src/main/resources/static/route/applystudentsnew/update.html +++ b/src/main/resources/static/route/applystudentsnew/update.html @@ -152,8 +152,8 @@
- -
+ +
@@ -178,13 +178,19 @@
-
+
- +
-
+
+ +
+ +
+
+
@@ -277,6 +283,23 @@ var wangEditorObj = {}; var viewerObj = {}; + + + // 初始化日期 + function initDate() { + // 日期选择 + laydate.render({ + elem: '#cardValidity', + format: 'yyyy-MM-dd' + }); + laydate.render({ + elem: '#cardValidityEnd', + format: 'yyyy-MM-dd' + }); + } + + initDate(); + function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); }