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

Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup

Browse Source
This commit is contained in:
wans 2021-05-25 17:29:37 +08:00
commit 454527cd4c
7 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/cn/com/tenlion/service/applystudents/impl/ApplyStudentsServiceImpl.java
View File

@ -20,6 +20,8 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.exceptions.ParamsException;
import ink.wgink.module.dictionary.pojo.dtos.DataDTO;
import ink.wgink.module.dictionary.service.IDataService;
import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.SuccessResultList;
import ink.wgink.util.UUIDUtil;
@ -53,6 +55,8 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp
private IExamApplyService examApplyService;
@Autowired
private IWorkTypeService workTypeService;
@Autowired
private IDataService dataService;
public String saveRelationReturnId(ApplyStudentsVO applyStudentsVO){
@ -222,6 +226,18 @@ public class ApplyStudentsServiceImpl extends DefaultBaseService implements IApp
continue;
}
}
DataDTO dataDTO = dataService.get(applyStudentsDTO.getApplySex());
if(null != dataDTO) {
applyStudentsDTO.setApplySex(dataDTO.getDataName());
}
dataDTO = dataService.get(applyStudentsDTO.getApplyCultureLevel());
if(null != dataDTO) {
applyStudentsDTO.setApplyCultureLevel(dataDTO.getDataName());
}
dataDTO = dataService.get(applyStudentsDTO.getApplyPhysicalState());
if(null != dataDTO) {
applyStudentsDTO.setApplyPhysicalState(dataDTO.getDataName());
}
ClassPlanDTO classPlanDTO = classPlanService.get(applyStudentsDTO.getApplyClassId());
applyStudentsDTO.setClassPlanDTO(classPlanDTO);
/*if(null != classPlanDTO) {

2
src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java
View File

@ -76,6 +76,8 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe
return examCheckId;
}
@Override
public void remove(List<String> ids) {
remove(null, ids);

4
src/main/resources/static/route/applyauditlog/show.html
View File

@ -107,7 +107,7 @@
data +='<th>操作人</th>'
data +='<th>操作结果</th>'
data +='<th>操作说明</th>'
if(status == 2){
if((status == 2 && fileId.length > 0)){
data += '<th>交费凭证</th>'
}
@ -118,7 +118,7 @@
data +='<td>'+user+'</td>'
data +='<td>'+sName+'</td>'
data +='<td>'+result+'</td>'
if(status == 2){
if((status == 2 && fileId.length > 0)){
fileIdViewer = fileId;
var image = '<ul style="height: 100%" id="'+fileId+'">'
image +='<p style="height: 100%;display"><img style="height: 85px;cursor:pointer;" src="route/file/download/false/'+ fileId +'" alt="暂无"></p>';

2
src/main/resources/static/route/applyconfig/show.html
View File

@ -49,7 +49,7 @@
<div class="layui-card">
<div class="layui-card-header">
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
<a href="javascript:void(0);"><cite>未开班人数不变提醒天数</cite></a>
<a href="javascript:void(0);"><cite>开班人数不变提醒天数</cite></a>
</span>
</div>
<div class="layui-card-body" style="padding: 15px;">

2
src/main/resources/static/route/traininginstitution/save.html
View File

@ -61,7 +61,7 @@
<div class="layui-form-item">
<label class="layui-form-label">机构成立时间</label>
<div class="layui-input-block">
<input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;" lay-verify="required">
<input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;">
</div>
</div>
<div class="layui-form-item layui-form-text">

2
src/main/resources/static/route/traininginstitution/update.html
View File

@ -61,7 +61,7 @@
<div class="layui-form-item">
<label class="layui-form-label">机构成立时间</label>
<div class="layui-input-block">
<input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;" lay-verify="required">
<input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;">
</div>
</div>
<div class="layui-form-item layui-form-text">

2
src/main/resources/templates/index4.html
View File

@ -11,7 +11,7 @@
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<style>
*{padding:0;margin:0;}
.container{position: absolute;top:40%;left:50%;transform: translate(-50%,-50%);}
.container{position: absolute;top:1000%;left:50%;transform: translate(-50%,-50%);}
.title{text-align: center;font-size: 28px;color: #000;margin-bottom: 20px;}
.search{overflow: hidden;white-space: nowrap;text-align: center;min-width:800px;}
.search input{width: 700px;height: 40px;padding: 0 10px;box-sizing: border-box;border: 1px solid #DDD;vertical-align: top;outline: none;font-size: 16px;float: left;}