Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

档案功能修改字段。

Browse Source
This commit is contained in:
Renpc-kilig 2021-06-25 17:23:26 +08:00
parent 2ba1dffa2f
commit 9196b530f3
7 changed files with 84 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/com/tenlion/controller/api/applystudentsnew/ApplyStudentsNewController.java
View File

@ -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()));

11
src/main/java/cn/com/tenlion/pojo/bos/applystudentsnew/ApplyStudentsNewBO.java
View File

@ -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;
}
}

10
src/main/java/cn/com/tenlion/pojo/dtos/applystudentsnew/ApplyStudentsNewDTO.java
View File

@ -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;
}
}

9
src/main/java/cn/com/tenlion/pojo/pos/applystudentsnew/ApplyStudentsNewPO.java
View File

@ -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;
}
}

10
src/main/java/cn/com/tenlion/pojo/vos/applystudentsnew/ApplyStudentsNewVO.java
View File

@ -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;
}
}

16
src/main/resources/mybatis/mapper/applystudentsnew/apply-students-new-mapper.xml
View File

@ -50,6 +50,7 @@
<result column="get_card_time" property="getCardTime"/>
<result column="retraining_time" property="retrainingTime"/>
<result column="job_type" property="jobType"/>
<result column="card_validity_end" property="cardValidityEnd"/>
</resultMap>
<resultMap id="applyStudentsNewBO" type="cn.com.tenlion.pojo.bos.applystudentsnew.ApplyStudentsNewBO">
@ -105,6 +106,7 @@
<result column="get_card_time" property="getCardTime"/>
<result column="retraining_time" property="retrainingTime"/>
<result column="job_type" property="jobType"/>
<result column="card_validity_end" property="cardValidityEnd"/>
</resultMap>
<resultMap id="applyStudentsNewPO" type="cn.com.tenlion.pojo.pos.applystudentsnew.ApplyStudentsNewPO">
@ -160,6 +162,7 @@
<result column="get_card_time" property="getCardTime"/>
<result column="retraining_time" property="retrainingTime"/>
<result column="job_type" property="jobType"/>
<result column="card_validity_end" property="cardValidityEnd"/>
</resultMap>
<!-- 新增 -->
@ -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},
</if>
<if test="gmtModified != null and gmtModified != ''">
jgmt_modified = #{gmtModified},
gmt_modified = #{gmtModified},
</if>
<if test="modifier != null and modifier != ''">
modifier = #{modifier},
</if>
<if test="cardValidityEnd != null and cardValidityEnd != ''">
card_validity_end = #{cardValidityEnd},
</if>
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,

33
src/main/resources/static/route/applystudentsnew/update.html
View File

@ -152,8 +152,8 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label" style="width: 120px;">单位所在区域或隶属部门</label>
<div class="layui-input-block" style="margin-left: 120px;">
<label class="layui-form-label" style="width: 186px;">单位所在区域或隶属部门</label>
<div class="layui-input-block" style="margin-left: 186px;">
<input type="text" id="area" name="area" class="layui-input" value="" placeholder="请输入单位所在区域或隶属部门" maxlength="255">
</div>
</div>
@ -178,13 +178,19 @@
</div>
</div>
<div class="layui-form-item layui-row">
<div class="layui-col-lg6">
<div class="layui-col-lg4">
<label class="layui-form-label">证件有效期</label>
<div class="layui-input-block">
<input type="text" id="cardValidity" name="cardValidity" class="layui-input" value="" placeholder="请输入证件有效期" maxlength="255" >
<input type="text" id="cardValidity" name="cardValidity" readonly class="layui-input" value="" placeholder="请输入证件有效期" maxlength="255" >
</div>
</div>
<div class="layui-col-lg6">
<div class="layui-col-lg4">
<label class="layui-form-label" style="width: 140px;">证件有效期截止</label>
<div class="layui-input-block" style="margin-left: 140px;">
<input type="text" id="cardValidityEnd" name="cardValidityEnd" readonly class="layui-input" value="" placeholder="请输入证件有效期截止时间" maxlength="255" >
</div>
</div>
<div class="layui-col-lg4">
<label class="layui-form-label">复审时间</label>
<div class="layui-input-block">
<input type="text" id="reviewTime" name="reviewTime" class="layui-input" value="" placeholder="请输入复审时间" maxlength="50" >
@ -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));
}