Skip to content

R
ruoyi
提交 3e884f5e 作者: dingtalk_nnkplh
操作

开学时间接口修改，学校上传图片修改

上级 38679fe0
正在显示 包含 376 行增加 和 174 行删除
ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/TbSchoolController.java
......@@ -279,7 +279,6 @@ public class TbSchoolController extends BaseController
@GetMapping("/uploadFileName")
public AjaxResult uploadFileName(@RequestParam("schoolCover") String schoolCover){
AjaxResult ajax = AjaxResult.success();
System.out.println(">>>>>>>>>>>>>>>>>>>"+schoolCover);
TbSchool school=new TbSchool();
school.setSchoolCover(schoolCover);
ajax.put("school", school);
......
ruoyi-admin/src/main/resources/templates/system/school/add.html
......@@ -5,11 +5,12 @@
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: bootstrap-select-css" />
<th:block th:include="include :: bootstrap-fileinput-css" />
<th:block th:include="include :: cropper-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-school-add">
<div class="form-group">
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校中文名称：</label>
<div class="col-sm-8">
<input name="schoolCnName" id="schoolCnName" class="form-control" type="text" required>
......@@ -33,18 +34,6 @@
<input name="schoolCnCity" id="schoolCnCity" class="form-control" type="text" required>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">学校所属国家英文名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="schoolEnCountry" id="schoolEnCountry" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label is-required">学校所属城市英文名称：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="schoolEnCity" id="schoolEnCity" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校详细地址(英文)：</label>
<div class="col-sm-8">
......@@ -160,9 +149,8 @@
<label class="col-sm-3 control-label is-required">学校封面(大小:390*280)：</label>
<input name="schoolCover" id="schoolCover" type="hidden">
<div class="col-sm-8">
<div class="file-loading">
<input id="singleSchoolCover" name="file" type="file">
</div>
<img id="abc" th:src="(${#strings.isEmpty(school.schoolCover)}) ? @{/img/profile.jpg} : @{${school.schoolCover}}" th:onerror="'this.src=\'' + @{'/img/profile.jpg'} + '\''">
<p><a href="javascript:uploadImage()">上传图像</a></p>
</div>
</div>
<div class="form-group">
......@@ -198,12 +186,45 @@
<th:block th:include="include :: select2-js" />
<th:block th:include="include :: bootstrap-select-js" />
<th:block th:include="include :: bootstrap-fileinput-js" />
<th:block th:include="include :: cropper-js" />
<script th:inline="javascript">
var prefix = ctx + "system/school"
$("#form-school-add").validate({
focusCleanup: true
});
function test(a){
// $("#abc").src=a;
var image = document.getElementById('abc');
image.src=a;
$("#schoolCover").val(a);
}
function uploadImage() {
var url = prefix + '/uploadImages';
top.layer.open({
type: 2,
area: [$(window).width() + 'px', $(window).height() + 'px'],
fix: false,
//不固定
maxmin: true,
shade: 0.3,
title: "上传封面",
content: url,
btn: ['确定', '关闭'],
// 弹层外区域关闭
shadeClose: true,
yes: function(index, layero) {
// alert("index="+index);
var iframeWin = layero.find('iframe')[0];
iframeWin.contentWindow.submitHandler(index, layero,test);
},
cancel: function(index) {
return true;
}
});
}
$(document).ready(function() {
$.ajax({
url: ctx+"system/dict/data/business_school_type",
......@@ -275,42 +296,8 @@
"&airportPickup="+$("#airportPickup").val()+
"&schoolType="+$("#schoolType").val());
}
// var formData = new FormData();
// formData.append('schoolCnName', $("#schoolCnName")[0].value);
// formData.append('schoolEnName', $("#schoolEnName")[0].value);
// formData.append('schoolCnCountry', $("#schoolCnCountry")[0].value);
// formData.append('schoolCnCity', $("#schoolCnCity")[0].value);
// formData.append('schoolEnCountry', $("#schoolEnCountry")[0].value);
// formData.append('schoolEnCity', $("#schoolEnCity")[0].value);
// formData.append('schoolType',$("#schoolType")[0].value);
// formData.append('schoolLogo', $('#schoolLogo')[0].files[0]);
// formData.append('backgroundImage', $('#backgroundImage')[0].files[0]);
// formData.append('schoolCampus', $('#schoolCampus')[0].value);
// formData.append('qsWorld', $('#qsWorld')[0].value);
// formData.append('qsArea', $('#qsArea')[0].value);
// formData.append('liveType',$("#liveType").val());
// formData.append('airportPickup',$("#airportPickup")[0].value);
// formData.append('schoolIntroduction',$("#schoolIntroduction")[0].value);
// formData.append('schoolArea',$("#schoolArea")[0].value);
// formData.append('employmentRate',$("#employmentRate")[0].value);
// formData.append('qsEmployability',$("#qsEmployability")[0].value);
// formData.append('teachingLanguage',$("#teachingLanguage")[0].value);
// formData.append('internship',$("#internship")[0].value);
// formData.append('govAuth',$("#govAuth")[0].value);
// $.ajax({
// url: prefix + "/add",
// type: 'post',
// cache: false,
// data: formData,
// processData: false,
// contentType: false,
// dataType: "json",
// success: function(result) {
// $.operate.successCallback(result);
// }
// });
}
</script>
</body>
</html>
\ No newline at end of file
ruoyi-admin/src/main/resources/templates/system/school/edit.html
......@@ -116,7 +116,6 @@
<input id="qsArea" th:field="*{qsArea}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">毕业后6个月就业率：</label>
<div class="col-sm-8">
......@@ -160,11 +159,13 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校封面：</label>
<input type="hidden" id="schoolCover" th:field="*{schoolCover}">
<input type="hidden" id="schoolCover" name="schoolCover">
<div class="col-sm-8">
<div class="file-loading">
<input id="singleSchoolCover" name="file" type="file">
</div>
<img id="abc" th:src="*{schoolCover}">
<p><a href="javascript:uploadImage()">修改封面</a></p>
<!-- <div class="file-loading">-->
<!-- <input id="singleSchoolCover" name="file" type="file">-->
<!-- </div>-->
</div>
</div>
<div class="form-group">
......@@ -203,6 +204,37 @@
$("#form-school-edit").validate({
focusCleanup: true
});
function test(a){
var image = document.getElementById('abc');
image.src=a;
$("#schoolCover").val(a);
}
function uploadImage() {
var url = prefix + '/uploadImages';
top.layer.open({
type: 2,
area: [$(window).width() + 'px', $(window).height() + 'px'],
fix: false,
//不固定
maxmin: true,
shade: 0.3,
title: "修改封面",
content: url,
btn: ['确定', '关闭'],
// 弹层外区域关闭
shadeClose: true,
yes: function(index, layero) {
var iframeWin = layero.find('iframe')[0];
iframeWin.contentWindow.submitHandler(index, layero,test);
},
cancel: function(index) {
return true;
}
});
}
$(document).ready(function() {
$.ajax({
url: ctx+"system/dict/data/business_school_type",
......@@ -333,7 +365,7 @@
}
initUpload();
initSchoolCover();
// initSchoolCover();
initUpload1();
//初始化方法
......
ruoyi-admin/src/main/resources/templates/system/school/uploadSchoolCover.html 0 → 100644
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<!-- <meta charset="utf-8">-->
<!-- <meta http-equiv="x-ua-compatible" content="ie=edge">-->
<!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">-->
<!-- <title>Cropper.js</title>-->
<link rel="stylesheet" href="https://unpkg.com/bootstrap@4/dist/css/bootstrap.min.css" crossorigin="anonymous">
<th:block th:include="include :: cropper-css" />
<style>
.label {
cursor: pointer;
}
.img-container img {
max-width: 100%;
}
</style>
</head>
<body>
<div class="container">
<label class="label" data-toggle="tooltip" title="上传图像">
<img id="avatar" th:src="(${#strings.isEmpty(school.schoolCover)}) ? @{/img/profile.jpg} : @{${school.schoolCover}}" th:onerror="'this.src=\'' + @{'/img/profile.jpg'} + '\''">
<input type="file" class="sr-only" id="input" name="image" accept="image/*">
</label>
<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="modalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body">
<div class="img-container">
<img id="image" th:src="@{/img/profile.jpg}">
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary" id="crop">裁剪</button>
</div>
</div>
</div>
</div>
<input type="hidden" name="schoolCover" id="schoolCover">
</div>
<script src="https://unpkg.com/jquery@3/dist/jquery.min.js" crossorigin="anonymous"></script>
<script src="https://unpkg.com/bootstrap@4/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
<th:block th:include="include :: cropper-js" />
<script th:inline="javascript">
window.addEventListener('DOMContentLoaded', function () {
var minCroppedWidth = 380;
var minCroppedHeight = 290;
var maxCroppedWidth = 380;
var maxCroppedHeight = 290;
var avatar = document.getElementById('avatar');
var image = document.getElementById('image');
var input = document.getElementById('input');
var $modal = $('#modal');
var cropper;
input.addEventListener('change', function (e) {
var files = e.target.files;
var done = function (url) {
input.value = '';
image.src = url;
$modal.modal('show');
};
var reader;
var file;
if (files && files.length > 0) {
file = files[0];
if (URL) {
done(URL.createObjectURL(file));
} else if (FileReader) {
reader = new FileReader();
reader.onload = function (e) {
done(reader.result);
};
reader.readAsDataURL(file);
}
}
});
$modal.on('shown.bs.modal', function () {
cropper = new Cropper(image, {
viewMode: 3,
zoomable: false,
data: {
width: (minCroppedWidth + maxCroppedWidth) / 2,
height: (minCroppedHeight + maxCroppedHeight) / 2,
},
crop: function (event) {
var width = event.detail.width;
var height = event.detail.height;
if (
width < minCroppedWidth
|| height < minCroppedHeight
|| width > maxCroppedWidth
|| height > maxCroppedHeight
) {
cropper.setData({
width: Math.max(minCroppedWidth, Math.min(maxCroppedWidth, width)),
height: Math.max(minCroppedHeight, Math.min(maxCroppedHeight, height)),
});
}
},
});
}).on('hidden.bs.modal', function () {
cropper.destroy();
cropper = null;
});
document.getElementById('crop').addEventListener('click', function () {
// var initialAvatarURL;
var canvas;
$modal.modal('hide');
if (cropper) {
canvas = cropper.getCroppedCanvas();
// initialAvatarURL = avatar.src;
avatar.src = canvas.toDataURL();
canvas.toBlob(function (blob) {
var formdata = new FormData();
formdata.append("file", blob);
$.ajax({
url: "http://localhost:8080/common/upload",
data: formdata,
type: "post",
processData: false,
contentType: false,
dataType: "json",
success: function(data) {
$("#schoolCover").val(data.fileName);
}
})
});
}
});
});
function submitHandler(index,layero,fun) {
fun($("#schoolCover").val());
top.layer.close(top.layer.index);
}
</script>
</body>
</html>
\ No newline at end of file
ruoyi-admin/src/main/resources/templates/system/time/add.html
......@@ -32,10 +32,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">入学时间：</label>
<label class="col-sm-3 control-label is-required">开学时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="enrollmentTime" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
<input name="enrollmentTime" class="form-control" placeholder="yyyy-MM" type="text" required>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
......@@ -77,8 +77,10 @@
}
$("input[name='enrollmentTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
format: "yyyy-mm",
startView: "year",
maxView: "year",
minView: "year",
autoclose: true
});
......
ruoyi-admin/src/main/resources/templates/system/time/edit.html
......@@ -30,10 +30,11 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">入学时间：</label>
<label class="col-sm-3 control-label is-required">开学时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="enrollmentTime" th:value="${#dates.format(tbEnrollmentTime.enrollmentTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
<!-- <input name="enrollmentTime" th:value="${#dates.format(tbEnrollmentTime.enrollmentTime, 'yyyy-MM')}" class="form-control" placeholder="yyyy-MM" type="text" required>-->
<input id="enrollmentTime" th:field="*{enrollmentTime}" class="form-control" placeholder="yyyy-MM" type="text" required>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
......@@ -73,8 +74,10 @@
}
$("input[name='enrollmentTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
format: "yyyy-mm",
startView: "year",
maxView: "year",
minView: "year",
autoclose: true
});
......
ruoyi-admin/src/main/resources/templates/system/time/editCheckStatus.html
......@@ -30,10 +30,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">入学时间：</label>
<label class="col-sm-3 control-label is-required">开学时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="enrollmentTime" th:value="${#dates.format(tbEnrollmentTime.enrollmentTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled="true">
<input name="enrollmentTime" th:value="${#dates.format(tbEnrollmentTime.enrollmentTime, 'yyyy-MM')}" class="form-control" placeholder="yyyy-MM" type="text" disabled="true">
</div>
</div>
</div>
......@@ -107,8 +107,8 @@
});
$("input[name='enrollmentTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
format: "yyyy-mm",
minView: "year",
autoclose: true
});
......
ruoyi-admin/src/main/resources/templates/system/time/notPassTimeList.html
......@@ -16,30 +16,30 @@
<option></option>
</select>
</li>
<li>
<label>校区：</label>
<select id="campusId" class="form-control select2-multiple">
<option></option>
</select>
</li>
<!-- <li>-->
<!-- <label>校区：</label>-->
<!-- <select id="campusId" class="form-control select2-multiple">-->
<!-- <option></option>-->
<!-- </select>-->
<!-- </li>-->
<li>
<label>专业：</label>
<select id="majorId" class="form-control select2-multiple">
<option></option>
</select>
</li>
<li>
<label>入学时间：</label>
<input type="text" class="time-input" placeholder="请选择入学时间" name="enrollmentTime" id="enrollmentTime"/>
</li>
<li>
<label>申请开始时间：</label>
<input type="text" class="time-input" placeholder="请选择申请开始时间" name="applyStartDate" id="applyStartDate"/>
</li>
<li>
<label>申请结束时间：</label>
<input type="text" class="time-input" placeholder="请选择申请结束时间" name="applyEndDate"/>
</li>
<!-- <li>-->
<!-- <label>开学时间：</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择入学时间" name="enrollmentTime" id="enrollmentTime"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>申请开始时间：</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择申请开始时间" name="applyStartDate" id="applyStartDate"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>申请结束时间：</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择申请结束时间" name="applyEndDate"/>-->
<!-- </li>-->
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
......@@ -107,7 +107,7 @@
},
{
field: 'enrollmentTime',
title: '入学时间'
title: '开学时间'
},
{
field: 'applyStartDate',
......@@ -175,28 +175,7 @@
var sid=$('#schoolId')[0].value;
$.ajax({
<!--请求路径，与后端对应-->
url: prefix + "/selectSchool/"+sid,
<!--请求类型-->
type: "get",
<!--期待的返回数据类型-->
dataType: "json",
<!--前端接收数据成功是执行的该函数-->
success: function (data) {
$("#campusId").empty();
$("#majorId").empty();
$("#campusId").append("<option></option>");
<!--使用循环解析后端传来的数据，并用使用js动态拼接html语言-->
for (var i = 0; i < data.length; i++)
$("#campusId").append("<option value='" + data[i].id + "'>" + data[i].schoolCampus + "</option>");
}
});
});
$('#campusId').change(function () {
var cid=$('#campusId')[0].value;
$.ajax({
<!--请求路径，与后端对应-->
url: prefix + "/selectMajor/"+cid,
url: prefix + "/selectMajor/"+sid,
<!--请求类型-->
type: "get",
<!--期待的返回数据类型-->
......@@ -210,7 +189,44 @@
$("#majorId").append("<option value='" + data[i].id + "'>" + data[i].majorCnName + "</option>");
}
});
// $.ajax({
// <!--请求路径，与后端对应-->
// url: prefix + "/selectSchool/"+sid,
// <!--请求类型-->
// type: "get",
// <!--期待的返回数据类型-->
// dataType: "json",
// <!--前端接收数据成功是执行的该函数-->
// success: function (data) {
// $("#campusId").empty();
// $("#majorId").empty();
// $("#campusId").append("<option></option>");
// <!--使用循环解析后端传来的数据，并用使用js动态拼接html语言-->
// for (var i = 0; i < data.length; i++)
// $("#campusId").append("<option value='" + data[i].id + "'>" + data[i].schoolCampus + "</option>");
// }
// });
});
// $('#campusId').change(function () {
// var cid=$('#campusId')[0].value;
// $.ajax({
// <!--请求路径，与后端对应-->
// url: prefix + "/selectMajor/"+cid,
// <!--请求类型-->
// type: "get",
// <!--期待的返回数据类型-->
// dataType: "json",
// <!--前端接收数据成功是执行的该函数-->
// success: function (data) {
// $("#majorId").empty();
// $("#majorId").append("<option></option>");
// <!--使用循环解析后端传来的数据，并用使用js动态拼接html语言-->
// for (var i = 0; i < data.length; i++)
// $("#majorId").append("<option value='" + data[i].id + "'>" + data[i].majorCnName + "</option>");
// }
// });
// });
});
function myqueryParams(params) {
......
ruoyi-admin/src/main/resources/templates/system/time/time.html
......@@ -16,30 +16,30 @@
<option>请选择学校</option>
</select>
</li>
<li>
<label>校区：</label>
<select id="campusId" class="form-control select2-multiple">
<option>请选择校区</option>
</select>
</li>
<!-- <li>-->
<!-- <label>校区：</label>-->
<!-- <select id="campusId" class="form-control select2-multiple">-->
<!-- <option>请选择校区</option>-->
<!-- </select>-->
<!-- </li>-->
<li>
<label>专业：</label>
<select id="majorId" class="form-control select2-multiple">
<option>请选择专业</option>
</select>
</li>
<li>
<label>入学时间：</label>
<input type="text" class="time-input" placeholder="请选择入学时间" name="enrollmentTime"/>
</li>
<li>
<label>申请开始时间：</label>
<input type="text" class="time-input" placeholder="请选择申请开始时间" name="applyStartDate"/>
</li>
<li>
<label>申请结束时间：</label>
<input type="text" class="time-input" placeholder="请选择申请结束时间" name="applyEndDate"/>
</li>
<!-- <li>-->
<!-- <label>开学时间：</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择入学时间" name="enrollmentTime"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>申请开始时间：</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择申请开始时间" name="applyStartDate"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>申请结束时间：</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择申请结束时间" name="applyEndDate"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>创建人：</label>-->
<!-- <input type="text" name="creator"/>-->
......@@ -136,7 +136,7 @@
},
{
field: 'enrollmentTime',
title: '入学时间'
title: '开学时间'
},
{
field: 'applyStartDate',
......@@ -202,28 +202,7 @@
});
$('#schoolId').change(function () {
var sid=$('#schoolId')[0].value;
$.ajax({
<!--请求路径，与后端对应-->
url: prefix + "/selectSchool/"+sid,
<!--请求类型-->
type: "get",
<!--期待的返回数据类型-->
dataType: "json",
<!--前端接收数据成功是执行的该函数-->
success: function (data) {
$("#majorId").empty();
$("#campusId").empty();
$("#campusId").append("<option>请选择校区</option>");
<!--使用循环解析后端传来的数据，并用使用js动态拼接html语言-->
for (var i = 0; i < data.length; i++)
$("#campusId").append("<option value='" + data[i].id + "'>" + data[i].schoolCampus + "</option>");
}
});
});
$('#campusId').change(function () {
var cid=$('#campusId')[0].value;
var cid=$('#schoolId')[0].value;
$.ajax({
<!--请求路径，与后端对应-->
url: prefix + "/selectMajor/"+cid,
......@@ -240,7 +219,45 @@
$("#majorId").append("<option value='" + data[i].id + "'>" + data[i].majorCnName + "</option>");
}
});
// var sid=$('#schoolId')[0].value;
// $.ajax({
// <!--请求路径，与后端对应-->
// url: prefix + "/selectSchool/"+sid,
// <!--请求类型-->
// type: "get",
// <!--期待的返回数据类型-->
// dataType: "json",
// <!--前端接收数据成功是执行的该函数-->
// success: function (data) {
// $("#majorId").empty();
// $("#campusId").empty();
// $("#campusId").append("<option>请选择校区</option>");
// <!--使用循环解析后端传来的数据，并用使用js动态拼接html语言-->
// for (var i = 0; i < data.length; i++)
// $("#campusId").append("<option value='" + data[i].id + "'>" + data[i].schoolCampus + "</option>");
// }
// });
});
// $('#campusId').change(function () {
// var cid=$('#campusId')[0].value;
// $.ajax({
// <!--请求路径，与后端对应-->
// url: prefix + "/selectMajor/"+cid,
// <!--请求类型-->
// type: "get",
// <!--期待的返回数据类型-->
// dataType: "json",
// <!--前端接收数据成功是执行的该函数-->
// success: function (data) {
// $("#majorId").empty();
// <!--使用循环解析后端传来的数据，并用使用js动态拼接html语言-->
// $("#majorId").append("<option>请选择专业</option>");
// for (var i = 0; i < data.length; i++)
// $("#majorId").append("<option value='" + data[i].id + "'>" + data[i].majorCnName + "</option>");
// }
// });
// });
});
function queryParams(params) {
......@@ -249,11 +266,11 @@
if(ii != '请选择学校'){
search.schoolId= ii;
}
var i=$("#campusId").val();
if(i != '请选择校区'){
search.campusId= i;
}
var ij=$("#majorId").val();
// var i=$("#campusId").val();
// if(i != '请选择校区'){
// search.campusId= i;
// }
var ij=$("#majorId")[0].value;
if(ij != '请选择专业'){
search.majorId= ij;
}
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbEnrollmentTime.java
......@@ -41,10 +41,12 @@ public class TbEnrollmentTime extends BaseEntity
private String majorName;
/** 入学时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "入学时间", width = 30, dateFormat = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date enrollmentTime;
// @JsonFormat(pattern = "yyyy-MM-dd")
// @Excel(name = "入学时间", width = 30, dateFormat = "yyyy-MM-dd")
// @DateTimeFormat(pattern = "yyyy-MM-dd")
// private Date enrollmentTime;
private String enrollmentTime;
/** 申请开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
......@@ -98,12 +100,12 @@ public class TbEnrollmentTime extends BaseEntity
{
return majorId;
}
public void setEnrollmentTime(Date enrollmentTime)
public void setEnrollmentTime(String enrollmentTime)
{
this.enrollmentTime = enrollmentTime;
}
public Date getEnrollmentTime()
public String getEnrollmentTime()
{
return enrollmentTime;
}
......
ruoyi-system/src/main/resources/mapper/system/TbEnrollmentTimeMapper.xml
......@@ -38,12 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="schoolId != null "> and t1.school_id = #{schoolId}</if>
<if test="majorId != null "> and t1.major_id = #{majorId}</if>
<if test="enrollmentTime != null "> and t1.enrollment_time = #{enrollmentTime}</if>
<if test="applyStartDate != null "> and t1.apply_start_date &gt;= #{applyStartDate}</if>
<if test="applyEndDate != null "> and t1.apply_end_date &lt;= #{applyEndDate}</if>
<if test="creator != null "> and t1.creator = #{creator}</if>
<if test="modifiedBy != null "> and t1.modified_by = #{modifiedBy}</if>
<if test="checkStatus != null "> and t1.check_status = #{checkStatus}</if>
<!-- <if test="enrollmentTime != null "> and t1.enrollment_time = #{enrollmentTime}</if>-->
<!-- <if test="applyStartDate != null "> and t1.apply_start_date &gt;= #{applyStartDate}</if>-->
<!-- <if test="applyEndDate != null "> and t1.apply_end_date &lt;= #{applyEndDate}</if>-->
<!-- <if test="creator != null "> and t1.creator = #{creator}</if>-->
<!-- <if test="modifiedBy != null "> and t1.modified_by = #{modifiedBy}</if>-->
<!-- <if test="checkStatus != null "> and t1.check_status = #{checkStatus}</if>-->
</where>
</select>
......@@ -63,11 +63,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="schoolId != null "> and t1.school_id = #{schoolId}</if>
<if test="majorId != null "> and t1.major_id = #{majorId}</if>
<if test="enrollmentTime != null "> and t1.enrollment_time = #{enrollmentTime}</if>
<if test="applyStartDate != null "> and t1.apply_start_date &gt;= #{applyStartDate}</if>
<if test="applyEndDate != null "> and t1.apply_end_date &lt;= #{applyEndDate}</if>
<if test="creator != null "> and t1.creator = #{creator}</if>
<if test="modifiedBy != null "> and t1.modified_by = #{modifiedBy}</if>
<!-- <if test="enrollmentTime != null "> and t1.enrollment_time = #{enrollmentTime}</if>-->
<!-- <if test="applyStartDate != null "> and t1.apply_start_date &gt;= #{applyStartDate}</if>-->
<!-- <if test="applyEndDate != null "> and t1.apply_end_date &lt;= #{applyEndDate}</if>-->
<!-- <if test="creator != null "> and t1.creator = #{creator}</if>-->
<!-- <if test="modifiedBy != null "> and t1.modified_by = #{modifiedBy}</if>-->
and t1.check_status != 2
</where>
</select>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论