Skip to content

R
ruoyi
提交 4982ab42 作者: dingtalk_nnkplh
操作

学校管理增加上传，编辑封面的功能；专业管理增加上传，编辑封面的功能

上级 c98d27d5
正在显示 包含 353 行增加 和 24 行删除
ruoyi-admin/src/main/resources/templates/system/atlas/add.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<input id="atlasCover" type="hidden" name="atlasCover"> <input id="atlasCover" type="hidden" name="atlasCover">
<div class="col-sm-8"> <div class="col-sm-8">
<div class="file-loading"> <div class="file-loading">
<input id="singleFile" name="files" type="file"> <input id="singleFile" name="file" type="file">
</div> </div>
</div> </div>
</div> </div>
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
}); });
function submitHandler() { function submitHandler() {
if ($('#atlasCover').val() == null) {
$.modal.alertWarning("请先选择文件");
return false;
}
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-atlas-add').serialize()+ $.operate.save(prefix + "/add", $('#form-atlas-add').serialize()+
"&schoolId="+$("#schoolId")[0].value); "&schoolId="+$("#schoolId")[0].value);
...@@ -74,17 +78,6 @@ ...@@ -74,17 +78,6 @@
} }
}); });
// 多图上传
$("#multipleFile").fileinput({
uploadUrl: ctx + 'common/uploads',
uploadAsync: false
}).on('filebatchuploadsuccess', function (event, data, previewId, index) {
var rsp = data.response;
$("#atlasContent").val(rsp.fileNames);
}).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('')
})
// 单图上传 // 单图上传
$("#singleFile").fileinput({ $("#singleFile").fileinput({
uploadUrl: ctx + 'common/upload', uploadUrl: ctx + 'common/upload',
...@@ -96,6 +89,17 @@ ...@@ -96,6 +89,17 @@
}).on('fileremoved', function (event, id, index) { }).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('') $("input[name='" + event.currentTarget.id + "']").val('')
}) })
// 多图上传
$("#multipleFile").fileinput({
uploadUrl: ctx + 'common/uploads',
uploadAsync: false
}).on('filebatchuploadsuccess', function (event, data, previewId, index) {
var rsp = data.response;
$("#atlasContent").val(rsp.fileNames);
}).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('')
})
}); });
</script> </script>
</body> </body>
......
ruoyi-admin/src/main/resources/templates/system/major/add.html
...@@ -44,6 +44,15 @@ ...@@ -44,6 +44,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">专业封面(大小:390*280)：</label>
<input name="majorCover" type="hidden" id="majorCover"/>
<div class="col-sm-8">
<div class="file-loading">
<input id="singleMajorCover" name="file" type="file">
</div>
</div>
</div>
<div class="form-group"> <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="col-sm-8">
...@@ -181,6 +190,17 @@ ...@@ -181,6 +190,17 @@
}).on('fileremoved', function (event, id, index) { }).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('') $("input[name='" + event.currentTarget.id + "']").val('')
}) })
$("#singleMajorCover").fileinput({
uploadUrl: ctx + 'common/upload',
maxFileCount: 1,
autoReplace: true
}).on('fileuploaded', function (event, data, previewId, index) {
var rsp = data.response;
$("#majorCover").val(rsp.fileName);
}).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('')
})
}); });
var prefix = ctx + "system/major" var prefix = ctx + "system/major"
......
ruoyi-admin/src/main/resources/templates/system/major/edit.html
...@@ -50,6 +50,15 @@ ...@@ -50,6 +50,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">专业封面：</label>
<input type="hidden" class="form-control" th:field="*{majorCover}">
<div class="col-sm-8">
<div class="file-loading">
<input id="singleMajorCover" name="file" type="file">
</div>
</div>
</div>
<div class="form-group"> <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="col-sm-8">
...@@ -154,6 +163,7 @@ ...@@ -154,6 +163,7 @@
} }
initUpload(); initUpload();
initMajorCover();
//初始化方法 //初始化方法
function initUpload() { function initUpload() {
...@@ -196,6 +206,46 @@ ...@@ -196,6 +206,46 @@
initialPreviewConfig:initialPreviewConfig initialPreviewConfig:initialPreviewConfig
}); });
} }
function initMajorCover() {
var logoUrl = $("#majorCover").val();//拿到图片路径
var preList = new Array();
var initialPreviewConfig = new Array();
//设置初始化区域值
if (logoUrl != null && logoUrl != ''){
var a = {
// caption : '主图'+(i+1),
// width: '120px',
url: '/common/del',
// key: i,
extra: {url: logoUrl}
}
preList.push(logoUrl);
initialPreviewConfig.push(a);
}
$("#singleMajorCover").fileinput({
language: 'zh', //设置语言
uploadUrl: "/common/upload", //上传的地址，改成自己的
allowedFileExtensions:['bmp', 'gif', 'jpg', 'jpeg', 'png'],//接收的文件后缀
initialPreviewAsData:true,
initialPreview:preList,//预览图片
uploadAsync: true, //默认异步上传
showUpload: true, //是否显示上传按钮
showRemove : false, //显示移除按钮
showPreview : true, //是否显示预览
showCaption: false,//是否显示标题
browseClass: "btn btn-primary", //按钮样式
dropZoneEnabled: false,//是否显示拖拽区域
maxFileCount: 1, //表示允许同时上传的最大文件个数
maxFileSize:10 *1024 *1024,
messages: {maxFileSize:'文件上传的最大大小为 10MB',acceptFileTypes:'此文件是不支持的图片格式' },
enctype: 'multipart/form-data',
validateInitialCount:true,
msgFilesTooMany:5,
autoReplace:false,
initialPreviewConfig:initialPreviewConfig
});
}
$("#singleFile").on('fileuploaded', function (event, data, previewId, index) { $("#singleFile").on('fileuploaded', function (event, data, previewId, index) {
var rsp = data.response; var rsp = data.response;
...@@ -205,6 +255,14 @@ ...@@ -205,6 +255,14 @@
$('#singleFile').fileinput('enable');//enable作用：destroy并重新初始化fileinput插件后，插件会处于disable状态 $('#singleFile').fileinput('enable');//enable作用：destroy并重新初始化fileinput插件后，插件会处于disable状态
}); });
$("#singleMajorCover").on('fileuploaded', function (event, data, previewId, index) {
var rsp = data.response;
$("#majorCover").val(rsp.fileName);
$("#singleMajorCover").fileinput('destroy');//销毁fileUploadFileInput
initUpload();//重新初始化文件预览数据和文件上传附件
$('#singleMajorCover').fileinput('enable');//enable作用：destroy并重新初始化fileinput插件后，插件会处于disable状态
});
$('#singleFile').on('filepredelete', function(event, key, jqXHR, data) { //就是在删除原图片之前触发，而新选择的图片不会触发。能满足我们的要求。 $('#singleFile').on('filepredelete', function(event, key, jqXHR, data) { //就是在删除原图片之前触发，而新选择的图片不会触发。能满足我们的要求。
console.log('Key = ' + key); console.log('Key = ' + key);
var logoUrl = $("#majorIcon").val(); var logoUrl = $("#majorIcon").val();
...@@ -221,6 +279,22 @@ ...@@ -221,6 +279,22 @@
$("#majorIcon").val(urlLinkNew); $("#majorIcon").val(urlLinkNew);
}); });
$('#singleMajorCover').on('filepredelete', function(event, key, jqXHR, data) { //就是在删除原图片之前触发，而新选择的图片不会触发。能满足我们的要求。
console.log('Key = ' + key);
var logoUrl = $("#majorCover").val();
var urlLinkNew = '';
var imgArr = logoUrl.split(",");
for ( var i = 0; i < imgArr.length; i++) {
if (i == key) continue;
if (urlLinkNew !=''){
urlLinkNew = urlLinkNew + "," + imgArr[i];
}else{
urlLinkNew = imgArr[i];
}
}
$("#majorCover").val(urlLinkNew);
});
$(document).ready(function() { $(document).ready(function() {
<!--异步请求--> <!--异步请求-->
$.ajax({ $.ajax({
......
ruoyi-admin/src/main/resources/templates/system/major/editCheckStatus.html
...@@ -37,7 +37,16 @@ ...@@ -37,7 +37,16 @@
<input type="hidden" class="form-control" th:field="*{majorIcon}"> <input type="hidden" class="form-control" th:field="*{majorIcon}">
<div class="col-sm-8"> <div class="col-sm-8">
<div class="file-loading"> <div class="file-loading">
<input id="singleFile" name="file" type="file" disabled="true"> <input id="singleFile" name="file" type="file">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">专业封面：</label>
<input type="hidden" class="form-control" th:field="*{majorCover}">
<div class="col-sm-8">
<div class="file-loading">
<input id="singleMajorCover" name="file" type="file">
</div> </div>
</div> </div>
</div> </div>
...@@ -151,6 +160,7 @@ ...@@ -151,6 +160,7 @@
} }
} }
initUpload(); initUpload();
initMajorCover();
//初始化方法 //初始化方法
function initUpload() { function initUpload() {
...@@ -194,6 +204,47 @@ ...@@ -194,6 +204,47 @@
}); });
} }
function initMajorCover() {
var logoUrl = $("#majorCover").val();//拿到图片路径
var preList = new Array();
var initialPreviewConfig = new Array();
//设置初始化区域值
if (logoUrl != null && logoUrl != ''){
var a = {
// caption : '主图'+(i+1),
// width: '120px',
url: '/common/del',
// key: i,
extra: {url: logoUrl}
}
preList.push(logoUrl);
initialPreviewConfig.push(a);
}
$("#singleMajorCover").fileinput({
language: 'zh', //设置语言
uploadUrl: "/common/upload", //上传的地址，改成自己的
allowedFileExtensions:['bmp', 'gif', 'jpg', 'jpeg', 'png'],//接收的文件后缀
initialPreviewAsData:true,
initialPreview:preList,//预览图片
uploadAsync: true, //默认异步上传
showUpload: true, //是否显示上传按钮
showRemove : false, //显示移除按钮
showPreview : true, //是否显示预览
showCaption: false,//是否显示标题
browseClass: "btn btn-primary", //按钮样式
dropZoneEnabled: false,//是否显示拖拽区域
maxFileCount: 1, //表示允许同时上传的最大文件个数
maxFileSize:10 *1024 *1024,
messages: {maxFileSize:'文件上传的最大大小为 10MB',acceptFileTypes:'此文件是不支持的图片格式' },
enctype: 'multipart/form-data',
validateInitialCount:true,
msgFilesTooMany:5,
autoReplace:false,
initialPreviewConfig:initialPreviewConfig
});
}
$(document).ready(function() { $(document).ready(function() {
<!--异步请求--> <!--异步请求-->
$.ajax({ $.ajax({
......
ruoyi-admin/src/main/resources/templates/system/school/add.html
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">学校logo：</label> <label class="col-sm-3 control-label is-required">学校logo(比例:1:1)：</label>
<input name="schoolLogo" id="schoolLogo" type="hidden"> <input name="schoolLogo" id="schoolLogo" type="hidden">
<div class="col-sm-8"> <div class="col-sm-8">
<div class="file-loading"> <div class="file-loading">
...@@ -157,7 +157,16 @@ ...@@ -157,7 +157,16 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">学校背景图：</label> <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>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校背景图(大小:1920*300)：</label>
<input name="backgroundImage" id="backgroundImage" type="hidden"> <input name="backgroundImage" id="backgroundImage" type="hidden">
<div class="col-sm-8"> <div class="col-sm-8">
<div class="file-loading"> <div class="file-loading">
...@@ -220,6 +229,18 @@ ...@@ -220,6 +229,18 @@
}) })
// 单图上传 // 单图上传
$("#singleSchoolCover").fileinput({
uploadUrl: ctx + 'common/upload',
maxFileCount: 1,
autoReplace: true
}).on('fileuploaded', function (event, data, previewId, index) {
var rsp = data.response;
$("#schoolCover").val(rsp.fileName);
}).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('')
})
// 单图上传
$("#singleFile1").fileinput({ $("#singleFile1").fileinput({
uploadUrl: ctx + 'common/upload', uploadUrl: ctx + 'common/upload',
maxFileCount: 1, maxFileCount: 1,
...@@ -238,6 +259,11 @@ ...@@ -238,6 +259,11 @@
return false; return false;
} }
if ($('#schoolCover').val() == null) {
$.modal.alertWarning("请先选择文件");
return false;
}
if ($('#backgroundImage').val() == null) { if ($('#backgroundImage').val() == null) {
$.modal.alertWarning("请先选择文件"); $.modal.alertWarning("请先选择文件");
return false; return false;
......
ruoyi-admin/src/main/resources/templates/system/school/edit.html
...@@ -159,6 +159,15 @@ ...@@ -159,6 +159,15 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">学校封面：</label>
<input type="hidden" id="schoolCover" th:field="*{schoolCover}">
<div class="col-sm-8">
<div class="file-loading">
<input id="singleSchoolCover" name="file" type="file">
</div>
</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>
<input type="hidden" id="backgroundImage" th:field="*{backgroundImage}"> <input type="hidden" id="backgroundImage" th:field="*{backgroundImage}">
<div class="col-sm-8"> <div class="col-sm-8">
...@@ -324,6 +333,7 @@ ...@@ -324,6 +333,7 @@
} }
initUpload(); initUpload();
initSchoolCover();
initUpload1(); initUpload1();
//初始化方法 //初始化方法
...@@ -392,6 +402,71 @@ ...@@ -392,6 +402,71 @@
console.log($("#schoolLogo").val()) console.log($("#schoolLogo").val())
}); });
} }
function initSchoolCover() {
var logoUrl = $("#schoolCover").val();//拿到图片路径
var preList = new Array();
var initialPreviewConfig = new Array();
//设置初始化区域值
if (logoUrl != null && logoUrl != ''){
var a = {
// caption : '主图'+(i+1),
// width: '120px',
url: '/common/del',
// key: i,
extra: {url: logoUrl}
}
preList.push(logoUrl);
initialPreviewConfig.push(a);
}
$("#singleSchoolCover").fileinput({
language: 'zh', //设置语言
uploadUrl: "/common/upload", //上传的地址，改成自己的
allowedFileExtensions:['bmp', 'gif', 'jpg', 'jpeg', 'png'],//接收的文件后缀
initialPreviewAsData:true,
initialPreview:preList,//预览图片
uploadAsync: true, //默认异步上传
showUpload: true, //是否显示上传按钮
showRemove : false, //显示移除按钮
showPreview : true, //是否显示预览
showCaption: false,//是否显示标题
browseClass: "btn btn-primary", //按钮样式
dropZoneEnabled: false,//是否显示拖拽区域
maxFileCount: 1, //表示允许同时上传的最大文件个数
maxFileSize:10 *1024 *1024,
messages: {maxFileSize:'文件上传的最大大小为 10MB',acceptFileTypes:'此文件是不支持的图片格式' },
enctype: 'multipart/form-data',
validateInitialCount:true,
msgFilesTooMany:5,
autoReplace:false,
initialPreviewConfig:initialPreviewConfig
});
$("#singleSchoolCover").on('fileuploaded', function (event, data, previewId, index) {
var rsp = data.response;
$("#schoolCover").val(rsp.fileName);
$("#singleSchoolCover").fileinput('destroy');//销毁fileUploadFileInput
initUpload();//重新初始化文件预览数据和文件上传附件
$('#singleSchoolCover').fileinput('enable');//enable作用：destroy并重新初始化fileinput插件后，插件会处于disable状态
});
$('#singleSchoolCover').on('filepredelete', function(event, key, jqXHR, data) { //就是在删除原图片之前触发，而新选择的图片不会触发。能满足我们的要求。
console.log('Key = ' + key);
var logoUrl = $("#schoolCover").val();
var urlLinkNew = '';
var imgArr = logoUrl.split(",");
for ( var i = 0; i < imgArr.length; i++) {
if (i == key) continue;
if (urlLinkNew !=''){
urlLinkNew = urlLinkNew + "," + imgArr[i];
}else{
urlLinkNew = imgArr[i];
}
}
$("#schoolCover").val(urlLinkNew);
console.log($("#schoolCover").val())
});
}
function initUpload1() { function initUpload1() {
var logoUrl = $("#backgroundImage").val();//拿到图片路径 var logoUrl = $("#backgroundImage").val();//拿到图片路径
var preList = new Array(); var preList = new Array();
......
ruoyi-admin/src/main/resources/templates/system/school/editCheckStatus.html
...@@ -151,7 +151,16 @@ ...@@ -151,7 +151,16 @@
<input type="hidden" id="schoolLogo" th:field="*{schoolLogo}"> <input type="hidden" id="schoolLogo" th:field="*{schoolLogo}">
<div class="col-sm-8"> <div class="col-sm-8">
<div class="file-loading"> <div class="file-loading">
<input id="singleFile" name="file" type="file" disabled="true"> <input id="singleFile" name="file" type="file">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">学校封面：</label>
<input type="hidden" id="schoolCover" th:field="*{schoolCover}">
<div class="col-sm-8">
<div class="file-loading">
<input id="singleSchoolCover" name="file" type="file">
</div> </div>
</div> </div>
</div> </div>
...@@ -160,7 +169,7 @@ ...@@ -160,7 +169,7 @@
<input type="hidden" id="backgroundImage" th:field="*{backgroundImage}"> <input type="hidden" id="backgroundImage" th:field="*{backgroundImage}">
<div class="col-sm-8"> <div class="col-sm-8">
<div class="file-loading"> <div class="file-loading">
<input id="singleFile1" name="file" type="file" disabled="true"> <input id="singleFile1" name="file" type="file">
</div> </div>
</div> </div>
</div> </div>
...@@ -263,6 +272,7 @@ ...@@ -263,6 +272,7 @@
} }
initUpload(); initUpload();
initSchoolCover();
initUpload1(); initUpload1();
//初始化方法 //初始化方法
...@@ -307,6 +317,47 @@ ...@@ -307,6 +317,47 @@
}); });
} }
function initSchoolCover() {
var logoUrl = $("#schoolCover").val();//拿到图片路径
var preList = new Array();
var initialPreviewConfig = new Array();
//设置初始化区域值
if (logoUrl != null && logoUrl != ''){
var a = {
// caption : '主图'+(i+1),
// width: '120px',
url: '/common/del',
// key: i,
extra: {url: logoUrl}
}
preList.push(logoUrl);
initialPreviewConfig.push(a);
}
$("#singleSchoolCover").fileinput({
language: 'zh', //设置语言
uploadUrl: "/common/upload", //上传的地址，改成自己的
allowedFileExtensions:['bmp', 'gif', 'jpg', 'jpeg', 'png'],//接收的文件后缀
initialPreviewAsData:true,
initialPreview:preList,//预览图片
uploadAsync: true, //默认异步上传
showUpload: true, //是否显示上传按钮
showRemove : false, //显示移除按钮
showPreview : true, //是否显示预览
showCaption: false,//是否显示标题
browseClass: "btn btn-primary", //按钮样式
dropZoneEnabled: false,//是否显示拖拽区域
maxFileCount: 1, //表示允许同时上传的最大文件个数
maxFileSize:10 *1024 *1024,
messages: {maxFileSize:'文件上传的最大大小为 10MB',acceptFileTypes:'此文件是不支持的图片格式' },
enctype: 'multipart/form-data',
validateInitialCount:true,
msgFilesTooMany:5,
autoReplace:false,
initialPreviewConfig:initialPreviewConfig
});
}
function initUpload1() { function initUpload1() {
var logoUrl = $("#backgroundImage").val();//拿到图片路径 var logoUrl = $("#backgroundImage").val();//拿到图片路径
var preList = new Array(); var preList = new Array();
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbSchool.java
...@@ -55,6 +55,8 @@ public class TbSchool extends BaseEntity ...@@ -55,6 +55,8 @@ public class TbSchool extends BaseEntity
/** 学校logo */ /** 学校logo */
private String schoolLogo; private String schoolLogo;
private String schoolCover;
@Excel(name = "创建人") @Excel(name = "创建人")
private String creatorDesc; private String creatorDesc;
...@@ -409,6 +411,14 @@ public class TbSchool extends BaseEntity ...@@ -409,6 +411,14 @@ public class TbSchool extends BaseEntity
this.website = website; this.website = website;
} }
public void setSchoolCover(String schoolCover) {
this.schoolCover = schoolCover;
}
public String getSchoolCover() {
return schoolCover;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/TbSchoolMajor.java
...@@ -41,6 +41,8 @@ public class TbSchoolMajor extends BaseEntity ...@@ -41,6 +41,8 @@ public class TbSchoolMajor extends BaseEntity
*/ */
private String majorIcon; private String majorIcon;
private String majorCover;
/** 学位中文名称 */ /** 学位中文名称 */
@Excel(name = "学位中文名称") @Excel(name = "学位中文名称")
private String degreeCnName; private String degreeCnName;
...@@ -352,6 +354,14 @@ public class TbSchoolMajor extends BaseEntity ...@@ -352,6 +354,14 @@ public class TbSchoolMajor extends BaseEntity
this.checkStatusDesc = checkStatusDesc; this.checkStatusDesc = checkStatusDesc;
} }
public String getMajorCover() {
return majorCover;
}
public void setMajorCover(String majorCover) {
this.majorCover = majorCover;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
ruoyi-system/src/main/resources/mapper/system/TbSchoolMajorMapper.xml
...@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="majorType" column="major_type" /> <result property="majorType" column="major_type" />
<result property="qs" column="qs" /> <result property="qs" column="qs" />
<result property="majorIcon" column="major_icon" /> <result property="majorIcon" column="major_icon" />
<result property="majorCover" column="major_cover" />
<result property="degreeCnName" column="degree_cn_name" /> <result property="degreeCnName" column="degree_cn_name" />
<result property="degreeEnName" column="degree_en_name" /> <result property="degreeEnName" column="degree_en_name" />
<result property="degreeType" column="degree_type" /> <result property="degreeType" column="degree_type" />
...@@ -35,7 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -35,7 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTbSchoolMajorVo"> <sql id="selectTbSchoolMajorVo">
select id, school_id, major_cn_name, major_type, qs, major_icon, degree_cn_name, degree_en_name, degree_type, select id, school_id, major_cn_name, major_type, qs, major_icon, major_cover, degree_cn_name,
degree_en_name, degree_type,
learn_time, ielts, tuition, enrollment_time, need_works,need_education,need_material, need_interview , learn_time, ielts, tuition, enrollment_time, need_works,need_education,need_material, need_interview ,
creator, create_time, creator, create_time,
modified_by,update_time, modified_by,update_time,
...@@ -96,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -96,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTbSchoolMajorById" parameterType="Long" resultMap="TbSchoolMajorResult"> <select id="selectTbSchoolMajorById" parameterType="Long" resultMap="TbSchoolMajorResult">
select t1.id, t1.school_id, t2.school_cn_name, t1.major_cn_name, t1.major_type,t1.qs, t1.major_icon, select t1.id, t1.school_id, t2.school_cn_name, t1.major_cn_name, t1.major_type,t1.qs, t1.major_icon,
t1.major_cover,
t1.degree_cn_name, t1.degree_cn_name,
t1.degree_en_name, t1.degree_en_name,
t1.degree_type, t1.learn_time, t1.ielts, t1.tuition, t1.degree_type, t1.learn_time, t1.ielts, t1.tuition,
...@@ -117,11 +120,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -117,11 +120,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertTbSchoolMajor" parameterType="TbSchoolMajor" useGeneratedKeys="true" keyProperty="id"> <insert id="insertTbSchoolMajor" parameterType="TbSchoolMajor" useGeneratedKeys="true" keyProperty="id">
insert into tb_school_major insert into tb_school_major
(school_id,major_cn_name,major_type,major_icon,qs,degree_cn_name,degree_en_name,degree_type,learn_time, (school_id,major_cn_name,major_type,major_icon,major_cover,
qs,degree_cn_name,degree_en_name,degree_type,learn_time,
ielts,tuition,enrollment_time,need_works,need_education,need_material,need_interview, ielts,tuition,enrollment_time,need_works,need_education,need_material,need_interview,
create_time,check_status,creator) create_time,check_status,creator)
values ( values (
#{schoolId},#{majorCnName},#{majorType},#{majorIcon},#{qs},#{degreeCnName},#{degreeEnName}, #{schoolId},#{majorCnName},#{majorType},#{majorIcon},#{majorCover},
#{qs},#{degreeCnName},#{degreeEnName},
#{degreeType},#{learnTime},#{ielts},#{tuition},#{enrollmentTime},#{needWorks}, #{degreeType},#{learnTime},#{ielts},#{tuition},#{enrollmentTime},#{needWorks},
#{needEducation},#{needMaterial},#{needInterview},sysdate(),1,#{creator} #{needEducation},#{needMaterial},#{needInterview},sysdate(),1,#{creator}
) )
...@@ -134,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -134,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="majorCnName != null and majorCnName != ''">major_cn_name = #{majorCnName},</if> <if test="majorCnName != null and majorCnName != ''">major_cn_name = #{majorCnName},</if>
<if test="majorType != null and majorType != ''">major_type = #{majorType},</if> <if test="majorType != null and majorType != ''">major_type = #{majorType},</if>
<if test="majorIcon != null and majorIcon != ''">major_icon = #{majorIcon},</if> <if test="majorIcon != null and majorIcon != ''">major_icon = #{majorIcon},</if>
<if test="majorCover != null and majorCover != ''">major_cover = #{majorCover},</if>
<if test="qs != null and qs != ''">qs = #{qs},</if> <if test="qs != null and qs != ''">qs = #{qs},</if>
<if test="degreeCnName != null and degreeCnName != ''">degree_cn_name = #{degreeCnName},</if> <if test="degreeCnName != null and degreeCnName != ''">degree_cn_name = #{degreeCnName},</if>
<if test="degreeEnName != null and degreeEnName != ''">degree_en_name = #{degreeEnName},</if> <if test="degreeEnName != null and degreeEnName != ''">degree_en_name = #{degreeEnName},</if>
......
ruoyi-system/src/main/resources/mapper/system/TbSchoolMapper.xml
...@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="schoolEnCity" column="school_en_city" /> <result property="schoolEnCity" column="school_en_city" />
<result property="schoolType" column="school_type" /> <result property="schoolType" column="school_type" />
<result property="schoolLogo" column="school_logo" /> <result property="schoolLogo" column="school_logo" />
<result property="schoolCover" column="school_cover" />
<result property="schoolCampus" column="school_campus" /> <result property="schoolCampus" column="school_campus" />
<result property="creator" column="creator" /> <result property="creator" column="creator" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
...@@ -44,8 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -44,8 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectTbSchoolVo"> <sql id="selectTbSchoolVo">
select id, school_cn_name, school_en_name, school_cn_country, school_cn_city, school_en_country, select id, school_cn_name, school_en_name, school_cn_country, school_cn_city, school_en_country,
school_en_city, school_type, school_logo,school_campus,creator, create_time,modified_by,update_time, school_en_city, school_type, school_logo, school_cover, school_campus,creator, create_time,modified_by,
checker,check_time,check_status,check_result,background_image,qs_world, update_time, checker,check_time,check_status,check_result,background_image,qs_world,
school_introduction,qs_area,school_area,live_type,airport_pickup,employment_rate,qs_employability, school_introduction,qs_area,school_area,live_type,airport_pickup,employment_rate,qs_employability,
teaching_language,internship,gov_auth,lng,lat,address,phone,website teaching_language,internship,gov_auth,lng,lat,address,phone,website
from tb_school from tb_school
...@@ -85,13 +86,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -85,13 +86,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertTbSchool" parameterType="TbSchool" useGeneratedKeys="true" keyProperty="id"> <insert id="insertTbSchool" parameterType="TbSchool" useGeneratedKeys="true" keyProperty="id">
insert into tb_school ( insert into tb_school (
school_cn_name,school_en_name,school_cn_country,school_cn_city,school_en_country, school_cn_name,school_en_name,school_cn_country,school_cn_city,school_en_country,
school_en_city,school_logo,school_type,school_campus,creator,qs_world,background_image, school_en_city,school_logo,school_cover,school_type,school_campus,creator,qs_world,background_image,
school_introduction,qs_area,school_area,live_type,airport_pickup, create_time, check_status, school_introduction,qs_area,school_area,live_type,airport_pickup, create_time, check_status,
employment_rate,qs_employability,teaching_language,internship,gov_auth,lng,lat,address,phone,website employment_rate,qs_employability,teaching_language,internship,gov_auth,lng,lat,address,phone,website
) )
values ( values (
#{schoolCnName},#{schoolEnName},#{schoolCnCountry},#{schoolCnCity},#{schoolEnCountry}, #{schoolCnName},#{schoolEnName},#{schoolCnCountry},#{schoolCnCity},#{schoolEnCountry},
#{schoolEnCity},#{schoolLogo},#{schoolType},#{schoolCampus},#{creator},#{qsWorld}, #{schoolEnCity},#{schoolLogo},#{schoolCover},#{schoolType},#{schoolCampus},#{creator},#{qsWorld},
#{backgroundImage},#{schoolIntroduction},#{qsArea},#{schoolArea},#{liveType},#{airportPickup}, #{backgroundImage},#{schoolIntroduction},#{qsArea},#{schoolArea},#{liveType},#{airportPickup},
sysdate(),1,#{employmentRate},#{qsEmployability},#{teachingLanguage},#{internship},#{govAuth}, sysdate(),1,#{employmentRate},#{qsEmployability},#{teachingLanguage},#{internship},#{govAuth},
#{lng},#{lat},#{address},#{phone},#{website} #{lng},#{lat},#{address},#{phone},#{website}
...@@ -108,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -108,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="schoolEnCountry != null and schoolEnCountry != ''">school_en_country = #{schoolEnCountry},</if> <if test="schoolEnCountry != null and schoolEnCountry != ''">school_en_country = #{schoolEnCountry},</if>
<if test="schoolEnCity != null and schoolEnCity != ''">school_en_city = #{schoolEnCity},</if> <if test="schoolEnCity != null and schoolEnCity != ''">school_en_city = #{schoolEnCity},</if>
<if test="schoolLogo != null and schoolLogo != ''">school_logo = #{schoolLogo},</if> <if test="schoolLogo != null and schoolLogo != ''">school_logo = #{schoolLogo},</if>
<if test="schoolCover != null and schoolCover != ''">school_cover = #{schoolCover},</if>
<if test="schoolType != null and schoolType != ''">school_type=#{schoolType},</if> <if test="schoolType != null and schoolType != ''">school_type=#{schoolType},</if>
<if test="schoolCampus != null and schoolCampus != ''">school_campus = #{schoolCampus},</if> <if test="schoolCampus != null and schoolCampus != ''">school_campus = #{schoolCampus},</if>
<if test="modifiedBy != null and modifiedBy != ''">modified_by = #{modifiedBy},</if> <if test="modifiedBy != null and modifiedBy != ''">modified_by = #{modifiedBy},</if>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论