Skip to content

D
dd_school
Commit 46e7b51b by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents 60af7f88 11f8add3
Showing with 1492 additions and 533 deletions
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
...@@ -113,14 +113,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter ...@@ -113,14 +113,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers( "/webSocket/**").anonymous() .antMatchers( "/webSocket/**").anonymous()
.antMatchers("/login", "/register", "/captchaImage").anonymous() .antMatchers("/login", "/register", "/captchaImage").anonymous()
.antMatchers("/wx/user/login","/wx/user/getRoleType/**").permitAll() .antMatchers("/wx/user/login","/wx/user/getRoleType/**").permitAll()
.antMatchers("/wx/teacherLeave/**").permitAll()
.antMatchers("/teacherFiles/notice/**").permitAll()
.antMatchers("/wx/level/expriment/**").permitAll()
.antMatchers("/dd/user/login").permitAll() .antMatchers("/dd/user/login").permitAll()
.antMatchers( "/common/**").permitAll() .antMatchers( "/common/**").permitAll()
.antMatchers( "/dd/school/**").permitAll() .antMatchers( "/dd/school/**").permitAll()
......
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
...@@ -93,9 +93,9 @@ export function getNoticeInfo(query) { ...@@ -93,9 +93,9 @@ export function getNoticeInfo(query) {
} }
//老师查看列表 //老师查看列表
export function getTeacherTnfo(userId,query) { export function getTeacherTnfo(query) {
return request({ return request({
url: `/teacherFiles/files/getTeachList/${userId}`, url: `/teacherFiles/files/getTeachList`,
// url: `/teacherFiles/files/getTeachList/${userId}`, // url: `/teacherFiles/files/getTeachList/${userId}`,
method: 'get', method: 'get',
params:query params:query
...@@ -117,6 +117,14 @@ export function getFileTnfo(id) { ...@@ -117,6 +117,14 @@ export function getFileTnfo(id) {
method: "get", method: "get",
}); });
} }
// //查看档案详情
// export function getFileTnfo(query) {
// return request({
// url: "/teacherFiles/files",
// method: "get",
// params: query,
// });
// }
// 同步档案 // 同步档案
export function syncNotice(id) { export function syncNotice(id) {
return request({ return request({
...@@ -181,4 +189,12 @@ export function addTeachaer(ids) { ...@@ -181,4 +189,12 @@ export function addTeachaer(ids) {
url: '/teacherFiles/files/teacherAdd/' +ids, url: '/teacherFiles/files/teacherAdd/' +ids,
method: "get", method: "get",
}); });
} }
\ No newline at end of file
// 导出
export function exportList(id) {
return request({
url: '/teacherFiles/notice/export/' + id,
method: 'get',
})
}
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/experimentalRecords/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
label-width="78px"
>
<el-form-item label="教师" prop="applyName"> <el-form-item label="教师" prop="applyName">
<el-input v-model="queryParams.applyName" placeholder="请输入教师" clearable /> <el-input
v-model="queryParams.applyName"
placeholder="请输入教师"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item label="实验时间" prop="time"> <el-form-item label="实验时间" prop="time">
<el-date-picker v-model="queryParams.startTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"> <el-date-picker
v-model="queryParams.startTime"
type="date"
placeholder="选择"
value-format="yyyy-MM-dd"
>
</el-date-picker> </el-date-picker>
<el-date-picker v-model="queryParams.endTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"> <el-date-picker
v-model="queryParams.endTime"
type="date"
placeholder="选择"
value-format="yyyy-MM-dd"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="实验分类"> <el-form-item label="实验分类">
<el-select v-model="queryParams.experimentClassify" placeholder="请选择" clearable> <el-select
<el-option v-for="dict in dict.type.experiment_classify" :key="dict.value" :label="dict.label" v-model="queryParams.experimentClassify"
:value="dict.value" /> placeholder="请选择"
clearable
>
<el-option
v-for="dict in dict.type.experiment_classify"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="实验名称"> <el-form-item label="实验名称">
<el-input v-model="queryParams.experimentName" placeholder="请输入"></el-input> <el-input
v-model="queryParams.experimentName"
placeholder="请输入"
></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="getList"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table border v-loading="loading" :data="tableData" stripe> <el-table border v-loading="loading" :data="tableData" stripe>
<el-table-column fixed="left" label="序号" type="index" width="55" align="center" /> <el-table-column
fixed="left"
label="序号"
type="index"
width="55"
align="center"
/>
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.lab_sub, row.sub) }}</div> <div>{{ selectDictLabel(dict.type.lab_sub, row.sub) }}</div>
...@@ -36,38 +81,58 @@ ...@@ -36,38 +81,58 @@
<el-table-column label="班级" align="center" prop="className" /> <el-table-column label="班级" align="center" prop="className" />
<el-table-column label="实验时间" align="center" prop="experimentTime" /> <el-table-column label="实验时间" align="center" prop="experimentTime" />
<el-table-column label="实验名称" align="center" prop="experimentName" /> <el-table-column label="实验名称" align="center" prop="experimentName" />
<el-table-column label="实验分类" align="center" prop="experimentClassify"> <el-table-column
label="实验分类"
align="center"
prop="experimentClassify"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.experiment_classify, row.experimentClassify) }}</div> <div>
{{
selectDictLabel(
dict.type.experiment_classify,
row.experimentClassify
)
}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实验室" align="center" prop="labName" /> <el-table-column label="实验室" align="center" prop="labName" />
<el-table-column label="实验用品" align="center" prop="experimentUseGoods" /> <el-table-column
label="实验用品"
align="center"
prop="experimentUseGoods"
/>
<el-table-column label="章节内容" align="center" prop="chapterContent" /> <el-table-column label="章节内容" align="center" prop="chapterContent" />
<el-table-column label="教师" align="center" prop="applyName" /> <el-table-column label="教师" align="center" prop="applyName" />
<el-table-column label="附件" align="center" prop="schoolAccessoryList"> <el-table-column label="附件" align="center" prop="schoolAccessoryList">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="(accessory, index) in scope.row.accessoryList" :key="index"> <div
<a :href="baseUrl + accessory.accessoryUrl" target="_blank">{{ accessory.accessoryName }}</a> v-for="(accessory, index) in scope.row.accessoryList"
:key="index"
>
<a :href="baseUrl + accessory.accessoryUrl" target="_blank">{{
accessory.accessoryName
}}</a>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination ref="pageBlock" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination
:limit.sync="queryParams.pageSize" @pagination="getList" /> ref="pageBlock"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div> </div>
</template> </template>
<script> <script>
import { import { getList } from "@/api/smartSchool/laboratoryManagement/experimentalRecords";
getList,
} from '@/api/smartSchool/laboratoryManagement/experimentalRecords'
export default { export default {
dicts: ['experiment_classify', 'lab_sub'], dicts: ["experiment_classify", "lab_sub"],
data() { data() {
return { return {
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: process.env.VUE_APP_BASE_API,
...@@ -82,7 +147,7 @@ export default { ...@@ -82,7 +147,7 @@ export default {
loading: false, loading: false,
total: 0, total: 0,
tableData: [], tableData: [],
} };
}, },
mounted() { mounted() {
this.getList(); this.getList();
...@@ -90,34 +155,31 @@ export default { ...@@ -90,34 +155,31 @@ export default {
methods: { methods: {
//获取列表数据 //获取列表数据
getList() { getList() {
getList(this.queryParams).then(response => { getList(this.queryParams).then((response) => {
this.tableData = response.rows; this.tableData = response.rows;
console.log(this.tableData); console.log(this.tableData);
this.tableData = response.rows.map(item => { this.tableData = response.rows.map((item) => {
item.accessoryList = item.schoolAccessoryList; // 将附件信息赋值给accessoryList属性 item.accessoryList = item.schoolAccessoryList; // 将附件信息赋值给accessoryList属性
return item; return item;
}); });
this.total = response.total this.total = response.total;
this.loading = false this.loading = false;
}) });
}, },
//重置 //重置
resetQuery() { resetQuery() {
this.queryParams = { (this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
applyName: "", applyName: "",
startTime: "", startTime: "",
endTime: "", endTime: "",
experimentClassify: "", experimentClassify: "",
}, }),
this.getList(); this.getList();
}, },
}, },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
ruoyi-ui/src/views/smartSchool/massOrganization/clubActivityRecord/index.vue
...@@ -67,14 +67,19 @@ ...@@ -67,14 +67,19 @@
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="附件" align="center" prop="file"> <el-table-column label="附件" align="center" prop="file">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-carousel trigger="click" height="150px" :interval="4000">
v-for="(item, index) in scope.row.file.split(',')" <el-carousel-item
:key="index.id" v-for="(item, index) in scope.row.file.split(',')"
style="width: 100px; height: 100px" :key="index"
:src="item" >
:preview-src-list="[pev + item]" <el-image
> :src="pev + item"
</el-image> style="width: 150px; height: 130px"
:preview-src-list="[pev + item]"
>
</el-image>
</el-carousel-item>
</el-carousel>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -222,12 +227,11 @@ ...@@ -222,12 +227,11 @@
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :before-upload="beforeAvatarUpload"
> >
<!-- <img v-if="form.file" :src="form.file" class="avatar" /> --> <div v-if="form.file.length > 0">
<div v-if="form.file">
<img <img
v-for="(item, img) in form.file" v-for="(item, index) in form.file"
:key="img.id" :key="index"
:src="item" :src="pev + item"
class="avatar" class="avatar"
/> />
</div> </div>
...@@ -265,9 +269,8 @@ export default { ...@@ -265,9 +269,8 @@ export default {
data() { data() {
return { return {
//图片上传列表 //图片上传列表
uploadList: {}, uploadList: [],
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
pev: process.env.VUE_APP_BASE_API, pev: process.env.VUE_APP_BASE_API,
// 输入框字数限制 // 输入框字数限制
TEXT_SIZE, TEXT_SIZE,
...@@ -324,8 +327,8 @@ export default { ...@@ -324,8 +327,8 @@ export default {
fzr: "", fzr: "",
id: "", id: "",
orgName: this.$route.query.name, orgName: this.$route.query.name,
file: "",
remark: "", remark: "",
file: [],
}, },
// 表单校验 // 表单校验
rules: { rules: {
...@@ -401,7 +404,7 @@ export default { ...@@ -401,7 +404,7 @@ export default {
}; };
getClubInfo(params).then((response) => { getClubInfo(params).then((response) => {
this.picList = response.rows; this.picList = response.rows;
this.picList.file = response.rows.file; // this.picList.file = response.rows.file;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -430,6 +433,7 @@ export default { ...@@ -430,6 +433,7 @@ export default {
picUrl: null, picUrl: null,
seqencing: null, seqencing: null,
isShow: 0, isShow: 0,
file: [],
}; };
this.imageUrl = ""; this.imageUrl = "";
this.resetForm("form"); this.resetForm("form");
...@@ -455,6 +459,7 @@ export default { ...@@ -455,6 +459,7 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.uploadList = []; this.uploadList = [];
this.check = false;
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "新增社团活动记录"; this.title = "新增社团活动记录";
...@@ -467,10 +472,6 @@ export default { ...@@ -467,10 +472,6 @@ export default {
this.uploadList = []; this.uploadList = [];
this.form.file = []; this.form.file = [];
this.form.orgName = this.$route.query.name; this.form.orgName = this.$route.query.name;
console.log(
this.form.orgName,
"this.form.orgName = this.$route.query.name;"
);
listClubInfo(ids).then((response) => { listClubInfo(ids).then((response) => {
this.form = response.data; this.form = response.data;
this.form.file = response.data.file.split(","); this.form.file = response.data.file.split(",");
...@@ -495,17 +496,17 @@ export default { ...@@ -495,17 +496,17 @@ export default {
}, },
// 上传成功回调 // 上传成功回调
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log("response上传成功回调", res);
console.log("file上传成功回调", file);
if (res.code == 200) { if (res.code == 200) {
this.uploadList.push(this.pev + res.fileName); this.uploadList.push(res.fileName);
this.form.file = this.uploadList; this.form.file = this.uploadList;
console.log("this.form.file5555", this.form.file);
} }
console.log(this.pev, "this.uploadList111111"); console.log(this.uploadList, "this.uploadList11111111");
console.log(res.fileName, "res.fileName"); console.log(this.form.file, "this.form.file2222222222");
console.log(this.form.file, "this.form.file"); console.log(this.pev, "this.pev33333333");
console.log(res.fileName, "res.fileName444444");
// this.imageUrl = res.data.url;
// console.log(file);
// this.commonUpload(file);
}, },
// 上传前格式和图片大小限制 // 上传前格式和图片大小限制
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
...@@ -527,25 +528,6 @@ export default { ...@@ -527,25 +528,6 @@ export default {
handleRemove(file, fileList) { handleRemove(file, fileList) {
this.imageUrl = ""; this.imageUrl = "";
}, },
// 上传图片
// uploadImage(file) {
// const fileData = file.file;
// const formData = new FormData();
// formData.append("file", fileData);
// this.uploadLoading = true;
// commonUpload(formData)
// .then((response) => {
// this.uploadLoading = false;
// this.$modal.msgSuccess("上传成功");
// this.imageUrl = this.pev + response.url;
// // this.form.picUrl = process.env.VUE_APP_BASE_API + response.url
// this.form.file = this.pev + response.url;
// console.log(this.form.picUrl, "this.form.picUrl");
// })
// .catch((error) => {
// this.uploadLoading = false;
// });
// },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
...@@ -556,7 +538,6 @@ export default { ...@@ -556,7 +538,6 @@ export default {
const params = { const params = {
id: this.form.id, id: this.form.id,
theme: this.form.theme, theme: this.form.theme,
// file: this.form.file,
file: this.uploadList.toString(), file: this.uploadList.toString(),
}; };
console.log(params, "params"); console.log(params, "params");
...@@ -576,7 +557,6 @@ export default { ...@@ -576,7 +557,6 @@ export default {
endTime: this.form.endTime, endTime: this.form.endTime,
fzr: this.form.fzr, fzr: this.form.fzr,
orgName: this.form.orgName, orgName: this.form.orgName,
// file: this.form.file,
file: this.uploadList.toString(), file: this.uploadList.toString(),
remark: this.form.remark, remark: this.form.remark,
...@@ -617,31 +597,6 @@ export default { ...@@ -617,31 +597,6 @@ export default {
}); });
} }
}, },
/** 是否发布 */
handleIsShow(row) {
console.log(row);
const data = {
id: row.id,
};
this.$modal
.confirm()
.then(() => {
this.$modal.loading("正在编辑状态，请稍等...");
isCommunityFb(data)
.then((response) => {
this.$modal.closeLoading();
this.$modal.msgSuccess("编辑成功");
})
.catch((error) => {
this.$modal.closeLoading();
});
})
.catch(() => {
// 取消操作时的逻辑
});
},
}, },
}; };
</script> </script>
......
ruoyi-ui/src/views/smartSchool/massOrganization/communityStyle/index.vue
...@@ -63,14 +63,19 @@ ...@@ -63,14 +63,19 @@
<el-table-column label="活动主题" align="center" prop="theme" /> <el-table-column label="活动主题" align="center" prop="theme" />
<el-table-column label="附件" align="center" prop="file"> <el-table-column label="附件" align="center" prop="file">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-carousel trigger="click" height="150px" :interval="4000">
v-for="(item, index) in scope.row.file.split(',')" <el-carousel-item
:key="index" v-for="(item, index) in scope.row.file.split(',')"
style="width: 100px; height: 100px" :key="index"
:src="pev + item" >
:preview-src-list="[pev + item]" <el-image
> :src="pev + item"
</el-image> style="width: 150px; height: 130px"
:preview-src-list="[pev + item]"
>
</el-image>
</el-carousel-item>
</el-carousel>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否发布" align="center" prop="isfb"> <el-table-column label="是否发布" align="center" prop="isfb">
...@@ -157,12 +162,9 @@ ...@@ -157,12 +162,9 @@
<img <img
v-for="(item, index) in form.file" v-for="(item, index) in form.file"
:key="index" :key="index"
:src="pev + form.file" :src="pev + item"
class="avatar" class="avatar"
/> />
{{ form.file }}
<br />
{{ pev + form.file }}
</div> </div>
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
...@@ -215,19 +217,6 @@ export default { ...@@ -215,19 +217,6 @@ export default {
// 输入框字数限制 // 输入框字数限制
TEXT_SIZE, TEXT_SIZE,
srcList: [], srcList: [],
//是否上传的院徽
isUploadPic: false,
//照片是否删除
options: [
{
value: 0,
label: "否",
},
{
value: 1,
label: "是",
},
],
//获取子组件传来的信息 //获取子组件传来的信息
pic: [], pic: [],
// 图片路径 // 图片路径
...@@ -275,31 +264,6 @@ export default { ...@@ -275,31 +264,6 @@ export default {
}, },
], ],
seqencing: [{ required: true, message: "请输入排序", trigger: "blur" }], seqencing: [{ required: true, message: "请输入排序", trigger: "blur" }],
remark: [
{
max: TEXT_SIZE,
message: "备注信息在0到200字之间",
trigger: "blur",
},
],
},
//设置table列隐藏与显示
columns: [
{ key: 0, label: `园区照片`, visible: true },
{ key: 1, label: `相片名称`, visible: true },
// {key: 2, label: `相片路径`, visible: true},
{ key: 2, label: `排序`, visible: true },
{ key: 3, label: `备注`, visible: true },
{ key: 4, label: `创建者`, visible: true },
{ key: 5, label: `创建时间`, visible: true },
{ key: 6, label: `操作`, visible: true },
],
// 作为临时图片展示
tempImage: "",
// 导出选项
exportOptions: {
title: "选择导出类别",
open: false,
}, },
//查看状态 //查看状态
check: false, check: false,
...@@ -309,20 +273,7 @@ export default { ...@@ -309,20 +273,7 @@ export default {
created() { created() {
this.getList(); this.getList();
}, },
watch: {
pic: {
handler(newValue, oldValue) {
console.log("watch----oldValue", oldValue);
console.log("watch----newValue", newValue);
this.isUploadPic = newValue[3];
},
},
},
methods: { methods: {
//是否删除 选中值发生变化时id处理函数
selectChangeHandler(value) {
this.form.isShow = value;
},
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -331,20 +282,12 @@ export default { ...@@ -331,20 +282,12 @@ export default {
cid: this.$route.query.id, cid: this.$route.query.id,
theme: this.queryParams.theme, theme: this.queryParams.theme,
}; };
// console.log(params);
getCommunityInfo(params).then((response) => { getCommunityInfo(params).then((response) => {
console.log("response", response);
this.picList = response.rows; this.picList = response.rows;
// this.picList.file = response.rows.file.split(',');
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
//获取图片信息
getSchoolInfoPic(val) {
this.pic = val;
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -405,8 +348,6 @@ export default { ...@@ -405,8 +348,6 @@ export default {
this.form = response.data; this.form = response.data;
this.form.file = response.data.file.split(","); this.form.file = response.data.file.split(",");
this.imageUrl = this.pev + this.form.picUrl; this.imageUrl = this.pev + this.form.picUrl;
console.log(this.form.file, "this.form.file222222222");
// console.log(this.imageUrl, "this.imageUrl");
this.open = true; this.open = true;
this.title = "修改园区照片"; this.title = "修改园区照片";
}); });
...@@ -427,21 +368,10 @@ export default { ...@@ -427,21 +368,10 @@ export default {
}, },
// 上传成功回调 // 上传成功回调
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log("response上传成功回调", res);
console.log("file上传成功回调", file);
if (res.code == 200) { if (res.code == 200) {
this.uploadList.push(res.fileName); this.uploadList.push(res.fileName);
this.form.file = this.uploadList; this.form.file = this.uploadList;
console.log("this.form.file", this.form.file);
} }
console.log(this.uploadList, "this.uploadList");
console.log(this.form.file, "this.form.file");
console.log(this.pev, "this.pev");
console.log(res.fileName, "res.fileName");
// this.imageUrl = res.data.url;
// console.log(file);
// this.commonUpload(file);
}, },
// 上传前格式和图片大小限制 // 上传前格式和图片大小限制
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
...@@ -463,26 +393,6 @@ export default { ...@@ -463,26 +393,6 @@ export default {
handleRemove(file, fileList) { handleRemove(file, fileList) {
this.imageUrl = ""; this.imageUrl = "";
}, },
// 上传图片
// uploadImage(file) {
// const fileData = file.file;
// const formData = new FormData();
// formData.append("file", fileData);
// this.uploadLoading = true;
// commonUpload(formData)
// .then((response) => {
// this.uploadLoading = false;
// this.$modal.msgSuccess("上传成功");
// this.imageUrl = this.pev + response.url;
// // this.form.picUrl = process.env.VUE_APP_BASE_API + response.url
// this.form.file = this.pev + response.url;
// this.form.picUrl = response.url;
// })
// .catch((error) => {
// this.uploadLoading = false;
// });
// },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
...@@ -494,7 +404,6 @@ export default { ...@@ -494,7 +404,6 @@ export default {
theme: this.form.theme, theme: this.form.theme,
file: this.uploadList.toString(), file: this.uploadList.toString(),
}; };
console.log(params, "修改params");
editCommunityInfo(params) editCommunityInfo(params)
.then((response) => { .then((response) => {
this.getList(); this.getList();
...@@ -509,7 +418,6 @@ export default { ...@@ -509,7 +418,6 @@ export default {
theme: this.form.theme, theme: this.form.theme,
file: this.uploadList.toString(), file: this.uploadList.toString(),
}; };
console.log(params, "新增params");
addCommunityInfo(params) addCommunityInfo(params)
.then((response) => { .then((response) => {
this.getList(); this.getList();
...@@ -549,28 +457,6 @@ export default { ...@@ -549,28 +457,6 @@ export default {
/** 是否发布 */ /** 是否发布 */
handleIsShow(row) { handleIsShow(row) {
// console.log(row);
// const data = {
// id: row.id,
// };
// this.$modal
// .confirm("是否发布此信息?")
// .then(() => {
// this.$modal.loading("正在修改状态，请稍等...");
// isCommunityFb(data)
// .then((response) => {
// this.$modal.closeLoading();
// this.$message.success("修改成功");
// this.getList();
// })
// .catch((error) => {
// this.$modal.closeLoading();
// });
// })
// .catch(() => {
// // 取消操作时的逻辑
// });
const data = { const data = {
id: row.id, id: row.id,
}; };
...@@ -582,7 +468,7 @@ export default { ...@@ -582,7 +468,7 @@ export default {
.then((response) => { .then((response) => {
this.$modal.closeLoading(); this.$modal.closeLoading();
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
// this.getList(); this.getList();
}) })
.catch((error) => { .catch((error) => {
this.$modal.closeLoading(); this.$modal.closeLoading();
......
ruoyi-ui/src/views/smartSchool/massOrganization/memberManagement/index.vue
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" /> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="身份证号" align="center" prop="cardid" /> <!-- <el-table-column label="身份证号" align="center" prop="cardid" /> -->
<el-table-column label="年级" align="center" prop="grade" /> <el-table-column label="年级" align="center" prop="grade" />
<el-table-column label="班级" align="center" prop="classes" /> <el-table-column label="班级" align="center" prop="classes" />
<el-table-column label="社团部门" align="center" prop="orgName" /> <el-table-column label="社团部门" align="center" prop="orgName" />
...@@ -140,9 +140,9 @@ ...@@ -140,9 +140,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="身份证号:" prop="cardid"> <!-- <el-form-item label="身份证号:" prop="cardid">
<el-input v-model="form.cardid" placeholder="请输入身份证号" /> <el-input v-model="form.cardid" placeholder="请输入身份证号" />
</el-form-item> </el-form-item> -->
<el-form-item label="年级:" prop="grade"> <el-form-item label="年级:" prop="grade">
<el-input v-model="form.grade" placeholder="请输入年级" /> <el-input v-model="form.grade" placeholder="请输入年级" />
</el-form-item> </el-form-item>
...@@ -231,7 +231,7 @@ export default { ...@@ -231,7 +231,7 @@ export default {
id: "", id: "",
name: "", name: "",
sex: "", sex: "",
cardid: "", // cardid: "",
grade: "", grade: "",
classes: "", classes: "",
orgName: "", orgName: "",
...@@ -269,7 +269,7 @@ export default { ...@@ -269,7 +269,7 @@ export default {
console.log(item, "item"); console.log(item, "item");
this.$set(this.form, "name", item.studentName); this.$set(this.form, "name", item.studentName);
this.$set(this.form, "sex", item.sex); this.$set(this.form, "sex", item.sex);
this.$set(this.form, "cardid", item.idCard); // this.$set(this.form, "cardid", item.idCard);
this.$set(this.form, "grade", item.gradeName); this.$set(this.form, "grade", item.gradeName);
this.$set(this.form, "classes", item.className); this.$set(this.form, "classes", item.className);
this.$set(this.form, "phone", item.stuTelephone); this.$set(this.form, "phone", item.stuTelephone);
...@@ -344,10 +344,10 @@ export default { ...@@ -344,10 +344,10 @@ export default {
if (this.form.id != null) { if (this.form.id != null) {
// 修改 // 修改
const paramsedit = { const paramsedit = {
id: this.form.ids, id: this.form.id,
name: this.form.name, name: this.form.name,
sex: this.form.sex, sex: this.form.sex,
cardid: this.form.cardid, // cardid: this.form.cardid,
grade: this.form.grade, grade: this.form.grade,
classes: this.form.classes, classes: this.form.classes,
orgPosition: this.form.orgPosition, orgPosition: this.form.orgPosition,
...@@ -371,7 +371,7 @@ export default { ...@@ -371,7 +371,7 @@ export default {
orgName: this.form.orgName, orgName: this.form.orgName,
name: this.form.name, name: this.form.name,
sex: this.form.sex, sex: this.form.sex,
cardid: this.form.cardid, // cardid: this.form.cardid,
grade: this.form.grade, grade: this.form.grade,
classes: this.form.classes, classes: this.form.classes,
orgPosition: this.form.orgPosition, orgPosition: this.form.orgPosition,
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
...@@ -282,6 +282,7 @@ ...@@ -282,6 +282,7 @@
<script> <script>
import { import {
exportList, //导出
addTeacherNotice, //添加任务 addTeacherNotice, //添加任务
listTeacherNotice, // 任务列表 listTeacherNotice, // 任务列表
infoTeaNotice, //任务详情 infoTeaNotice, //任务详情
...@@ -302,6 +303,8 @@ import { ...@@ -302,6 +303,8 @@ import {
fileSubRejected, //教师档案提交驳回 fileSubRejected, //教师档案提交驳回
} from "@/api/smartSchool/teacherFiles/teacherElectronicFile"; } from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
import { format } from "@/utils/activiti/myUtil.js"; import { format } from "@/utils/activiti/myUtil.js";
import { getToken } from "@/utils/auth";
import axios from "axios";
export default { export default {
name: "teacherElectronicRecord", name: "teacherElectronicRecord",
data() { data() {
...@@ -487,6 +490,7 @@ export default { ...@@ -487,6 +490,7 @@ export default {
// 数据维护按钮 // 数据维护按钮
dataMaintenance(row) { dataMaintenance(row) {
console.log(row, "数据维护按钮row"); console.log(row, "数据维护按钮row");
const noticeName = row.noticeName;
const noticeId = row.id; const noticeId = row.id;
const pageNum = this.queryForm.pageNum; const pageNum = this.queryForm.pageNum;
const pageSize = this.queryForm.pageSize; const pageSize = this.queryForm.pageSize;
...@@ -495,6 +499,7 @@ export default { ...@@ -495,6 +499,7 @@ export default {
this.$router.push({ this.$router.push({
path: "/teachAffairAdministration/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance", path: "/teachAffairAdministration/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance",
query: { query: {
noticeName,
noticeId, noticeId,
pageNum, pageNum,
pageSize, pageSize,
...@@ -509,6 +514,7 @@ export default { ...@@ -509,6 +514,7 @@ export default {
// 数据查看 // 数据查看
dataInspection(row) { dataInspection(row) {
const noticeId = row.id; const noticeId = row.id;
const noticeName = row.noticeName;
const pageNum = this.queryForm.pageNum; const pageNum = this.queryForm.pageNum;
const pageSize = this.queryForm.pageSize; const pageSize = this.queryForm.pageSize;
const status = row.noticeState; const status = row.noticeState;
...@@ -517,6 +523,7 @@ export default { ...@@ -517,6 +523,7 @@ export default {
this.$router.push({ this.$router.push({
path: "/teachAffairAdministration/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance", path: "/teachAffairAdministration/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance",
query: { query: {
noticeName,
noticeId, noticeId,
pageNum, pageNum,
pageSize, pageSize,
...@@ -526,10 +533,33 @@ export default { ...@@ -526,10 +533,33 @@ export default {
}, },
// 导出按钮 // 导出按钮
handleExport(row) { handleExport(row) {
// this.download(`/artExam/exportAddress/${this.examId}`, { const id = row.id;
// ...this.queryParams const loading = this.$loading({ target: ".loading-area" });
// }, `教师电子档案${Date.now()}.xlsx`) axios
.get(process.env.VUE_APP_BASE_API + "/teacherFiles/notice/export", {
params: { id: id }, // 将ids放入params选项中进行传递
responseType: "blob",
headers: { Authorization: "Bearer " + getToken() },
})
.then((res) => {
// 打印接口数据
console.log(res);
// 请求结束关闭loading
loading.close();
// 创建a标签
const elink = document.createElement("a");
//构建Blob对象
const blob = new Blob([res.data], {
type: "application/vnd.ms-excel",
});
// 模拟下载
const objectUrl = URL.createObjectURL(blob);
elink.setAttribute("href", objectUrl);
elink.setAttribute("download", "教师电子档案" + ".xls");
elink.click();
});
}, },
// 撤回按钮 // 撤回按钮
handleRevocation(row) { handleRevocation(row) {
this.$modal this.$modal
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolRewardsPunishments/SchoolScAwardsController.java 0 → 100644
package yangtz.cs.liu.campus.controller.schoolRewardsPunishments;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScAwards;
import yangtz.cs.liu.campus.service.schoolRewardsPunishments.ISchoolScAwardsService;
import yangtz.cs.liu.campus.vo.schoolRewardsPunishments.SchoolScAwardsVo;
/**
* 学校获奖Controller
*
* @author ruoyi
* @date 2023-11-06
*/
@RestController
@RequestMapping("/school/awards")
public class SchoolScAwardsController extends BaseController
{
@Autowired
private ISchoolScAwardsService schoolScAwardsService;
/**
* 查询学校获奖列表
*/
@GetMapping("/list")
public TableDataInfo list(SchoolScAwardsVo schoolScAwardsVo)
{
SysUser user = SecurityUtils.getLoginUser().getUser();
//用户角色集合
List<SysRole> roles = user.getRoles();
//管理员查询全部
if (user.isAdmin()) {
startPage();
List<SchoolScAwardsVo> list = schoolScAwardsService.selectSchoolScAwardsList(schoolScAwardsVo);
return getDataTable(list);
} else if (roles.size() > 0){
for (SysRole role : roles) {
if (role.getRoleKey().equals("award_admin")){
startPage();
List<SchoolScAwardsVo> list = schoolScAwardsService.selectSchoolScAwardsList(schoolScAwardsVo);
return getDataTable(list);
}
}
}
//用户查看个人列表
schoolScAwardsVo.setApplyId(user.getUserId());
startPage();
List<SchoolScAwardsVo> list = schoolScAwardsService.selectSchoolScAwardsList(schoolScAwardsVo);
return getDataTable(list);
}
/**
* 导出学校获奖列表
*/
@Log(title = "学校获奖", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolScAwardsVo schoolScAwardsVo)
{
List<SchoolScAwardsVo> list = schoolScAwardsService.selectSchoolScAwardsList(schoolScAwardsVo);
ExcelUtil<SchoolScAwardsVo> util = new ExcelUtil<SchoolScAwardsVo>(SchoolScAwardsVo.class);
util.exportExcel(response, list, "学校获奖数据");
}
/**
* 获取学校获奖详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(schoolScAwardsService.selectSchoolScAwardsById(id));
}
/**
* 新增学校获奖
*/
@Log(title = "学校获奖", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SchoolScAwardsVo schoolScAwardsVo)
{
return toAjax(schoolScAwardsService.insertSchoolScAwards(schoolScAwardsVo));
}
/**
* 修改学校获奖
*/
@Log(title = "学校获奖", businessType = BusinessType.UPDATE)
@PutMapping("/edit")
public AjaxResult edit(@RequestBody SchoolScAwardsVo schoolScAwardsVo)
{
return toAjax(schoolScAwardsService.updateSchoolScAwards(schoolScAwardsVo));
}
/**
* 删除学校获奖
*/
@Log(title = "学校获奖", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolScAwardsService.deleteSchoolScAwardsByIds(ids));
}
/**
* 提交
*/
@PutMapping("/submit")
public AjaxResult submit(@RequestBody SchoolScAwards schoolScAwards)
{
return toAjax(schoolScAwardsService.submit(schoolScAwards));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolRewardsPunishments/SchoolScDisciplineController.java 0 → 100644
package yangtz.cs.liu.campus.controller.schoolRewardsPunishments;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScDiscipline;
import yangtz.cs.liu.campus.service.schoolRewardsPunishments.ISchoolScDisciplineService;
/**
* 学生违纪Controller
*
* @author ruoyi
* @date 2023-11-06
*/
@RestController
@RequestMapping("/school/discipline")
public class SchoolScDisciplineController extends BaseController
{
@Autowired
private ISchoolScDisciplineService schoolScDisciplineService;
/**
* 查询学生违纪列表
*/
@GetMapping("/list")
public TableDataInfo list(SchoolScDiscipline schoolScDiscipline)
{
startPage();
List<SchoolScDiscipline> list = schoolScDisciplineService.selectSchoolScDisciplineList(schoolScDiscipline);
return getDataTable(list);
}
/**
* 导出学生违纪列表
*/
@Log(title = "学生违纪", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolScDiscipline schoolScDiscipline)
{
List<SchoolScDiscipline> list = schoolScDisciplineService.selectSchoolScDisciplineList(schoolScDiscipline);
ExcelUtil<SchoolScDiscipline> util = new ExcelUtil<SchoolScDiscipline>(SchoolScDiscipline.class);
util.exportExcel(response, list, "学生违纪数据");
}
/**
* 获取学生违纪详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(schoolScDisciplineService.selectSchoolScDisciplineById(id));
}
/**
* 新增学生违纪
*/
@Log(title = "学生违纪", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolScDiscipline schoolScDiscipline)
{
return toAjax(schoolScDisciplineService.insertSchoolScDiscipline(schoolScDiscipline));
}
/**
* 修改学生违纪
*/
@Log(title = "学生违纪", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolScDiscipline schoolScDiscipline)
{
return toAjax(schoolScDisciplineService.updateSchoolScDiscipline(schoolScDiscipline));
}
/**
* 删除学生违纪
*/
@Log(title = "学生违纪", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolScDisciplineService.deleteSchoolScDisciplineByIds(ids));
}
/**
* 获取最新三个年级
*/
@GetMapping("/getGrade")
public AjaxResult getGrade(){
return AjaxResult.success(schoolScDisciplineService.getGrade());
}
/**
* 根据年级获取班级
*/
@GetMapping("/getClassList/{gradeId}")
public AjaxResult getClassList(@PathVariable("gradeId") Long gradeId){
return AjaxResult.success(schoolScDisciplineService.getClassList(gradeId));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesController.java
package yangtz.cs.liu.campus.controller.teacherFiles; package yangtz.cs.liu.campus.controller.teacherFiles;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -15,7 +16,9 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice; ...@@ -15,7 +16,9 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService; import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 教师档案Controller * 教师档案Controller
...@@ -91,14 +94,15 @@ public class TeacherFilesController extends BaseController ...@@ -91,14 +94,15 @@ public class TeacherFilesController extends BaseController
/** /**
* *
* @param userId * @param
* @param * @param
* @return * @return
*/ */
@GetMapping("getTeachList/{userId}") @GetMapping("/getTeachList")
public TableDataInfo teachList(@PathVariable("userId") Long userId,TeacherFilesNotice teacherFilesNotice){ public TableDataInfo teachList(TeacherFiles teacherFiles){
startPage(); startPage();
List<TeacherFilesNotice> teacherFilesNotices = teacherFilesService.selctTeacherByUserId(userId,teacherFilesNotice); Map map = new HashMap();
List<TeacherFilesNotice> teacherFilesNotices = teacherFilesService.selctTeacherByUserId(teacherFiles);
return getDataTable(teacherFilesNotices); return getDataTable(teacherFilesNotices);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesNoticeController.java
...@@ -11,8 +11,11 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -11,8 +11,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal;
import yangtz.cs.liu.campus.service.impl.teacherFiles.TeacherFilesExcelUtil;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService; import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService;
import javax.annotation.security.DenyAll;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
...@@ -29,10 +32,13 @@ public class TeacherFilesNoticeController extends BaseController ...@@ -29,10 +32,13 @@ public class TeacherFilesNoticeController extends BaseController
@Autowired @Autowired
private ITeacherFilesNoticeService teacherFilesNoticeService; private ITeacherFilesNoticeService teacherFilesNoticeService;
@Autowired
private TeacherFilesExcelUtil teacherFilesExcelUtil;
/** /**
* 查询教师档案通知列表 * 查询教师档案通知列表
*/ */
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:list')") // @PreAuthorize("@ss.hasPermi('teacherFiles:notice:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TeacherFilesNotice teacherFilesNotice) public TableDataInfo list(TeacherFilesNotice teacherFilesNotice)
{ {
...@@ -45,14 +51,11 @@ public class TeacherFilesNoticeController extends BaseController ...@@ -45,14 +51,11 @@ public class TeacherFilesNoticeController extends BaseController
/** /**
* 导出教师档案通知列表 * 导出教师档案通知列表
*/ */
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:export')") @GetMapping("/export")
@Log(title = "教室档案通知", businessType = BusinessType.EXPORT) @PermitAll
@PostMapping("/export")
public void export(HttpServletResponse response, TeacherFilesNotice teacherFilesNotice) public void export(HttpServletResponse response, TeacherFilesNotice teacherFilesNotice)
{ {
List<TeacherFilesNoticeTotal> list = teacherFilesNoticeService.selectTeacherFilesNoticeList(teacherFilesNotice); teacherFilesExcelUtil.getExcel(teacherFilesNotice.getId(),response);
ExcelUtil<TeacherFilesNoticeTotal> util = new ExcelUtil<TeacherFilesNoticeTotal>(TeacherFilesNoticeTotal.class);
util.exportExcel(response, list, "教室档案通知数据");
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolRewardsPunishments/SchoolScAwards.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolRewardsPunishments;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 学校获奖对象 school_sc_awards
*
* @author ruoyi
* @date 2023-11-06
*/
@Data
public class SchoolScAwards extends OurBaseEntity
{
/** 比赛名称 */
@Excel(name = "比赛名称")
private String competitionName;
/** 主办单位 */
@Excel(name = "主办单位")
private String organizer;
/** 获奖名称 */
@Excel(name = "获奖名称")
private String awardsName;
/** 主管部门id */
@Excel(name = "主管部门id")
private Long competentDeptId;
/** 主管部门 */
@Excel(name = "主管部门")
private String competentDept;
/** 获奖级别(字典) */
@Excel(name = "获奖级别(字典)")
private String awardsLevel;
/** 部门主任id */
@Excel(name = "部门主任id")
private Long deptDirectorId;
/** 部门主任 */
@Excel(name = "部门主任")
private String deptDirector;
/** 获奖时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "获奖时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date awardsTime;
/** 获奖类型(字典) */
@Excel(name = "获奖类型(字典)")
private String awardsType;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 审核状态(0未提交，1审核中，2通过，3驳回) */
@Excel(name = "审核状态(0未提交，1审核中，2通过，3驳回)")
private String auditState;
/** 申请人id */
private Long applyId;
/** 申请人 */
private String applyName;
/** 申请时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolRewardsPunishments/SchoolScDiscipline.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolRewardsPunishments;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 学生违纪对象 school_sc_discipline
*
* @author ruoyi
* @date 2023-11-06
*/
@Data
public class SchoolScDiscipline extends OurBaseEntity
{
/** 学年 */
@Excel(name = "学年")
private String schoolYear;
/** 学期 */
@Excel(name = "学期")
private String semester;
/** 届别 */
@Excel(name = "届别")
private String gradeYear;
/** 年级id */
@Excel(name = "年级id")
private Long gradeId;
/** 年级 */
@Excel(name = "年级")
private String gradeName;
/** 班级id */
@Excel(name = "班级id")
private Long classId;
/** 班级 */
@Excel(name = "班级")
private String className;
/** 班级类型 */
@Excel(name = "班级类型")
private String classType;
/** 姓名 */
@Excel(name = "姓名")
private String name;
/** 性别 */
@Excel(name = "性别")
private String sex;
/** 身份证号 */
@Excel(name = "身份证号")
private String idCard;
/** 班主任 */
@Excel(name = "班主任")
private String classTeacher;
/** 级部主任 */
@Excel(name = "级部主任")
private String gradeDirector;
/** 违纪类别（字典） */
@Excel(name = "违纪类别", readConverterExp = "字=典")
private String violateType;
/** 违纪次数（字典） */
@Excel(name = "违纪次数", readConverterExp = "字=典")
private String violateNum;
/** 处分结果（字典） */
@Excel(name = "处分结果", readConverterExp = "字=典")
private String punishResult;
/** 处分时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "处分时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date punishTime;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 审核状态(0未提交，1审核中，2通过，3驳回) */
@Excel(name = "审核状态(0未提交，1审核中，2通过，3驳回)")
private String auditState;
/** 申请人id */
private Long applyId;
/** 申请人 */
private String applyName;
/** 申请时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFiles.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.domain.teacherFiles; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.domain.teacherFiles;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
...@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; ...@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author ruoyi * @author ruoyi
* @date 2023-09-05 * @date 2023-09-05
*/ */
@Data
public class TeacherFiles extends BaseEntity public class TeacherFiles extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -104,238 +106,9 @@ public class TeacherFiles extends BaseEntity ...@@ -104,238 +106,9 @@ public class TeacherFiles extends BaseEntity
private Long gradeTeacherId; private Long gradeTeacherId;
public Long getGradeTeacherId() { private String userId;
return gradeTeacherId;
}
public void setGradeTeacherId(Long gradeTeacherId) { private String noticeName;
this.gradeTeacherId = gradeTeacherId;
}
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setNoticeId(String noticeId)
{
this.noticeId = noticeId;
}
public String getNoticeId()
{
return noticeId;
}
public void setFilesSemester(String filesSemester)
{
this.filesSemester = filesSemester;
}
public String getFilesSemester()
{
return filesSemester;
}
public void setTeacherId(Long teacherId)
{
this.teacherId = teacherId;
}
public Long getTeacherId()
{
return teacherId;
}
public void setTeacherName(String teacherName)
{
this.teacherName = teacherName;
}
public String getTeacherName()
{
return teacherName;
}
public void setGradeId(Long gradeId)
{
this.gradeId = gradeId;
}
public Long getGradeId()
{
return gradeId;
}
public void setGradeName(String gradeName)
{
this.gradeName = gradeName;
}
public String getGradeName()
{
return gradeName;
}
public void setIdCard(String idCard)
{
this.idCard = idCard;
}
public String getIdCard()
{
return idCard;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getSex()
{
return sex;
}
public void setAge(Integer age)
{
this.age = age;
}
public Integer getAge()
{
return age;
}
public void setTitle(String title)
{
this.title = title;
}
public String getTitle()
{
return title;
}
public void setEducation(String education)
{
this.education = education;
}
public String getEducation()
{
return education;
}
public void setAppearance(String appearance)
{
this.appearance = appearance;
}
public String getAppearance()
{
return appearance;
}
public void setCourseName(String courseName)
{
this.courseName = courseName;
}
public String getCourseName()
{
return courseName;
}
public void setClassName(String className)
{
this.className = className;
}
public String getClassName()
{
return className;
}
public void setBzrClassName(String bzrClassName)
{
this.bzrClassName = bzrClassName;
}
public String getBzrClassName()
{
return bzrClassName;
}
public void setFbzrClassName(String fbzrClassName)
{
this.fbzrClassName = fbzrClassName;
}
public String getFbzrClassName()
{
return fbzrClassName;
}
public void setIsTeachingGroupLeader(String isTeachingGroupLeader)
{
this.isTeachingGroupLeader = isTeachingGroupLeader;
}
public String getIsTeachingGroupLeader()
{
return isTeachingGroupLeader;
}
public void setIsResearchGroupLeader(String isResearchGroupLeader)
{
this.isResearchGroupLeader = isResearchGroupLeader;
}
public String getIsResearchGroupLeader()
{
return isResearchGroupLeader;
}
public void setClassHour(Integer classHour)
{
this.classHour = classHour;
}
public Integer getClassHour()
{
return classHour;
}
public void setClassTeacherDetails(String classTeacherDetails)
{
this.classTeacherDetails = classTeacherDetails;
}
public String getClassTeacherDetails()
{
return classTeacherDetails;
}
public void setState(String state)
{
this.state = state;
}
public String getState()
{
return state;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("noticeId", getNoticeId())
.append("filesSemester", getFilesSemester())
.append("teacherId", getTeacherId())
.append("teacherName", getTeacherName())
.append("gradeId", getGradeId())
.append("gradeName", getGradeName())
.append("idCard", getIdCard())
.append("sex", getSex())
.append("age", getAge())
.append("title", getTitle())
.append("education", getEducation())
.append("appearance", getAppearance())
.append("courseName", getCourseName())
.append("className", getClassName())
.append("bzrClassName", getBzrClassName())
.append("fbzrClassName", getFbzrClassName())
.append("isTeachingGroupLeader", getIsTeachingGroupLeader())
.append("isResearchGroupLeader", getIsResearchGroupLeader())
.append("classHour", getClassHour())
.append("classTeacherDetails", getClassTeacherDetails())
.append("state", getState())
.toString();
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesAward.java
...@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel; ...@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 教师档案获奖情况对象 teacher_files_award * 教师档案获奖情况对象 teacher_files_award
...@@ -46,7 +48,17 @@ public class TeacherFilesAward extends BaseEntity ...@@ -46,7 +48,17 @@ public class TeacherFilesAward extends BaseEntity
@Excel(name = "发证机关") @Excel(name = "发证机关")
private String licenseIssuingAuthority; private String licenseIssuingAuthority;
public void setId(Long id) private List<SchoolAccessory> accessories;
public List<SchoolAccessory> getAccessories() {
return accessories;
}
public void setAccessories(List<SchoolAccessory> accessories) {
this.accessories = accessories;
}
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesMaterial.java
...@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel; ...@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 教师档案课题编写情况对象 teacher_files_material * 教师档案课题编写情况对象 teacher_files_material
...@@ -38,7 +40,17 @@ public class TeacherFilesMaterial extends BaseEntity ...@@ -38,7 +40,17 @@ public class TeacherFilesMaterial extends BaseEntity
@Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date publishTime; private Date publishTime;
public void setId(Long id) private List<SchoolAccessory> accessories;
public List<SchoolAccessory> getAccessories() {
return accessories;
}
public void setAccessories(List<SchoolAccessory> accessories) {
this.accessories = accessories;
}
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesThesis.java
...@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel; ...@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 教师档案论文情况对象 teacher_files_thesis * 教师档案论文情况对象 teacher_files_thesis
...@@ -46,7 +48,17 @@ public class TeacherFilesThesis extends BaseEntity ...@@ -46,7 +48,17 @@ public class TeacherFilesThesis extends BaseEntity
@Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date publishTime; private Date publishTime;
public void setId(Long id) private List<SchoolAccessory> schoolAccessoryList ;
public List<SchoolAccessory> getSchoolAccessoryList() {
return schoolAccessoryList;
}
public void setSchoolAccessoryList(List<SchoolAccessory> schoolAccessoryList) {
this.schoolAccessoryList = schoolAccessoryList;
}
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesTraining.java
...@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel; ...@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 教师档案培训情况对象 teacher_files_training * 教师档案培训情况对象 teacher_files_training
...@@ -42,7 +44,17 @@ public class TeacherFilesTraining extends BaseEntity ...@@ -42,7 +44,17 @@ public class TeacherFilesTraining extends BaseEntity
@Excel(name = "是否合格", readConverterExp = "1=合格，0不合格") @Excel(name = "是否合格", readConverterExp = "1=合格，0不合格")
private String isQualified; private String isQualified;
public void setId(Long id) private List<SchoolAccessory> accessories;
public List<SchoolAccessory> getAccessories() {
return accessories;
}
public void setAccessories(List<SchoolAccessory> accessories) {
this.accessories = accessories;
}
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolRewardsPunishments/SchoolScAwardsMapper.java 0 → 100644
package yangtz.cs.liu.campus.mapper.schoolRewardsPunishments;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScAwards;
import yangtz.cs.liu.campus.vo.schoolRewardsPunishments.SchoolScAwardsVo;
import java.util.List;
/**
* 学校获奖Mapper接口
*
* @author ruoyi
* @date 2023-11-06
*/
public interface SchoolScAwardsMapper extends BaseMapper<SchoolScAwards>
{
/**
* 查询学校获奖
*
* @param id 学校获奖主键
* @return 学校获奖
*/
public SchoolScAwardsVo selectSchoolScAwardsById(Long id);
/**
* 查询学校获奖列表
*
* @param schoolScAwardsVo 学校获奖
* @return 学校获奖集合
*/
public List<SchoolScAwardsVo> selectSchoolScAwardsList(SchoolScAwardsVo schoolScAwardsVo);
/**
* 新增学校获奖
*
* @param schoolScAwardsVo 学校获奖
* @return 结果
*/
public int insertSchoolScAwards(SchoolScAwardsVo schoolScAwardsVo);
/**
* 修改学校获奖
*
* @param schoolScAwardsVo 学校获奖
* @return 结果
*/
public int updateSchoolScAwards(SchoolScAwardsVo schoolScAwardsVo);
/**
* 删除学校获奖
*
* @param id 学校获奖主键
* @return 结果
*/
public int deleteSchoolScAwardsById(Long id);
/**
* 批量删除学校获奖
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSchoolScAwardsByIds(Long[] ids);
/**
* 批量新增附件信息
*
* @param schoolAccessoryList 附件信息列表
* @return 结果
*/
public int batchSchoolAccessory(List<SchoolAccessory> schoolAccessoryList);
/**
* 批量删除附件信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSchoolAccessoryByBusinessIds(Long[] ids);
/**
* 通过学校获奖主键删除附件信息信息
*
* @param id 学校获奖ID
* @return 结果
*/
public int deleteSchoolAccessoryByBusinessId(Long id);
/**
* 获取所有学校获奖附件
* @return
*/
public List<SchoolAccessory> selectAccessoryList();
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolRewardsPunishments/SchoolScDisciplineMapper.java 0 → 100644
package yangtz.cs.liu.campus.mapper.schoolRewardsPunishments;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScDiscipline;
import java.util.List;
import java.util.Map;
/**
* 学生违纪Mapper接口
*
* @author ruoyi
* @date 2023-11-06
*/
public interface SchoolScDisciplineMapper extends BaseMapper<SchoolScDiscipline>
{
/**
* 查询学生违纪
*
* @param id 学生违纪主键
* @return 学生违纪
*/
public SchoolScDiscipline selectSchoolScDisciplineById(Long id);
/**
* 查询学生违纪列表
*
* @param schoolScDiscipline 学生违纪
* @return 学生违纪集合
*/
public List<SchoolScDiscipline> selectSchoolScDisciplineList(SchoolScDiscipline schoolScDiscipline);
/**
* 新增学生违纪
*
* @param schoolScDiscipline 学生违纪
* @return 结果
*/
public int insertSchoolScDiscipline(SchoolScDiscipline schoolScDiscipline);
/**
* 修改学生违纪
*
* @param schoolScDiscipline 学生违纪
* @return 结果
*/
public int updateSchoolScDiscipline(SchoolScDiscipline schoolScDiscipline);
/**
* 删除学生违纪
*
* @param id 学生违纪主键
* @return 结果
*/
public int deleteSchoolScDisciplineById(Long id);
/**
* 批量删除学生违纪
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSchoolScDisciplineByIds(Long[] ids);
/**
* 获取最新三个年级
* @return
*/
List<Map<String, Object>> getGrade();
/**
* 根据年级获取班级
* @param gradeId
* @return
*/
List<Map<String, Object>> getClassList(Long gradeId);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/TeacherFilesNoticeMapper.java
...@@ -9,6 +9,7 @@ import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo; ...@@ -9,6 +9,7 @@ import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo;
import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo; import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 教师档案通知Mapper接口 * 教师档案通知Mapper接口
...@@ -43,7 +44,7 @@ public interface TeacherFilesNoticeMapper ...@@ -43,7 +44,7 @@ public interface TeacherFilesNoticeMapper
public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice); public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
public List<TeacherFilesNotice> selctTeacherByUserId(@Param("userId") Long userId, @Param("teacherFiles") TeacherFilesNotice teacherFiles); public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles);
/** /**
* 修改教师档案通知 * 修改教师档案通知
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolRewardsPunishments/SchoolScAwardsServiceImpl.java 0 → 100644
package yangtz.cs.liu.campus.service.impl.schoolRewardsPunishments;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScAwards;
import yangtz.cs.liu.campus.mapper.schoolRewardsPunishments.SchoolScAwardsMapper;
import yangtz.cs.liu.campus.service.schoolRewardsPunishments.ISchoolScAwardsService;
import yangtz.cs.liu.campus.vo.schoolRewardsPunishments.SchoolScAwardsVo;
import java.util.ArrayList;
import java.util.List;
/**
* 学校获奖Service业务层处理
*
* @author ruoyi
* @date 2023-11-06
*/
@Service
public class SchoolScAwardsServiceImpl extends ServiceImpl<SchoolScAwardsMapper,SchoolScAwards> implements ISchoolScAwardsService
{
@Autowired
private SchoolScAwardsMapper schoolScAwardsMapper;
/**
* 查询学校获奖
*
* @param id 学校获奖主键
* @return 学校获奖
*/
@Override
public SchoolScAwardsVo selectSchoolScAwardsById(Long id)
{
return schoolScAwardsMapper.selectSchoolScAwardsById(id);
}
/**
* 查询学校获奖列表
*
* @param schoolScAwardsVo 学校获奖
* @return 学校获奖
*/
@Override
public List<SchoolScAwardsVo> selectSchoolScAwardsList(SchoolScAwardsVo schoolScAwardsVo)
{
List<SchoolScAwardsVo> schoolScAwardsVos = schoolScAwardsMapper.selectSchoolScAwardsList(schoolScAwardsVo);
List<SchoolAccessory> schoolAccessoryList = new ArrayList<>();
//获取学校获奖所有附件
List<SchoolAccessory> schoolAccessories = schoolScAwardsMapper.selectAccessoryList();
schoolScAwardsVos.forEach(schoolScAwardsVo1 -> {
for (SchoolAccessory schoolAccessory : schoolAccessories) {
if (schoolAccessory.getBusinessId().equals(schoolScAwardsVo1.getId())){
schoolAccessoryList.add(schoolAccessory);
}
}
if (schoolAccessoryList.size() > 0){
schoolScAwardsVo1.setSchoolAccessoryList(schoolAccessoryList);
}
});
return schoolScAwardsVos;
}
/**
* 新增学校获奖
*
* @param schoolScAwardsVo 学校获奖
* @return 结果
*/
@Transactional
@Override
public int insertSchoolScAwards(SchoolScAwardsVo schoolScAwardsVo)
{
SysUser user = SecurityUtils.getLoginUser().getUser();
schoolScAwardsVo.setApplyId(user.getUserId());
schoolScAwardsVo.setApplyName(user.getUserName());
schoolScAwardsVo.setApplyTime(DateUtils.getNowDate());
schoolScAwardsVo.setCreateBy(user.getUserName());
schoolScAwardsVo.setCreateTime(DateUtils.getNowDate());
int i = schoolScAwardsMapper.insertSchoolScAwards(schoolScAwardsVo);
insertSchoolAccessory(schoolScAwardsVo);
return i;
}
/**
* 修改学校获奖
*
* @param schoolScAwardsVo 学校获奖
* @return 结果
*/
@Transactional
@Override
public int updateSchoolScAwards(SchoolScAwardsVo schoolScAwardsVo)
{
schoolScAwardsVo.setUpdateBy(SecurityUtils.getUsername());
schoolScAwardsVo.setUpdateTime(DateUtils.getNowDate());
schoolScAwardsMapper.deleteSchoolAccessoryByBusinessId(schoolScAwardsVo.getId());
insertSchoolAccessory(schoolScAwardsVo);
return schoolScAwardsMapper.updateSchoolScAwards(schoolScAwardsVo);
}
/**
* 批量删除学校获奖
*
* @param ids 需要删除的学校获奖主键
* @return 结果
*/
@Override
public int deleteSchoolScAwardsByIds(Long[] ids)
{
//删除附件
schoolScAwardsMapper.deleteSchoolAccessoryByBusinessIds(ids);
return schoolScAwardsMapper.deleteSchoolScAwardsByIds(ids);
}
/**
* 删除学校获奖信息
*
* @param id 学校获奖主键
* @return 结果
*/
@Override
public int deleteSchoolScAwardsById(Long id)
{
return schoolScAwardsMapper.deleteSchoolScAwardsById(id);
}
/**
* 提交
* @param schoolScAwards
* @return
*/
@Override
public int submit(SchoolScAwards schoolScAwards) {
return schoolScAwardsMapper.updateById(schoolScAwards);
}
/**
* 新增附件信息信息
*
* @param schoolScAwardsVo 学校获奖对象
*/
public void insertSchoolAccessory(SchoolScAwardsVo schoolScAwardsVo)
{
List<SchoolAccessory> schoolAccessoryList = schoolScAwardsVo.getSchoolAccessoryList();
Long id = schoolScAwardsVo.getId();
if (StringUtils.isNotNull(schoolAccessoryList))
{
List<SchoolAccessory> list = new ArrayList<SchoolAccessory>();
for (SchoolAccessory schoolAccessory : schoolAccessoryList)
{
schoolAccessory.setBusinessId(id);
schoolAccessory.setModuleName("获奖与违纪-学校获奖");
schoolAccessory.setAccessoryType("学校获奖附件");
schoolAccessory.setCreateBy(SecurityUtils.getUsername());
schoolAccessory.setCreateTime(DateUtils.getNowDate());
list.add(schoolAccessory);
}
if (list.size() > 0)
{
schoolScAwardsMapper.batchSchoolAccessory(list);
}
}
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolRewardsPunishments/SchoolScDisciplineServiceImpl.java 0 → 100644
package yangtz.cs.liu.campus.service.impl.schoolRewardsPunishments;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScDiscipline;
import yangtz.cs.liu.campus.mapper.schoolRewardsPunishments.SchoolScDisciplineMapper;
import yangtz.cs.liu.campus.service.schoolRewardsPunishments.ISchoolScDisciplineService;
import java.util.List;
import java.util.Map;
/**
* 学生违纪Service业务层处理
*
* @author ruoyi
* @date 2023-11-06
*/
@Service
public class SchoolScDisciplineServiceImpl extends ServiceImpl<SchoolScDisciplineMapper,SchoolScDiscipline> implements ISchoolScDisciplineService
{
@Autowired
private SchoolScDisciplineMapper schoolScDisciplineMapper;
/**
* 查询学生违纪
*
* @param id 学生违纪主键
* @return 学生违纪
*/
@Override
public SchoolScDiscipline selectSchoolScDisciplineById(Long id)
{
return schoolScDisciplineMapper.selectSchoolScDisciplineById(id);
}
/**
* 查询学生违纪列表
*
* @param schoolScDiscipline 学生违纪
* @return 学生违纪
*/
@Override
public List<SchoolScDiscipline> selectSchoolScDisciplineList(SchoolScDiscipline schoolScDiscipline)
{
return schoolScDisciplineMapper.selectSchoolScDisciplineList(schoolScDiscipline);
}
/**
* 新增学生违纪
*
* @param schoolScDiscipline 学生违纪
* @return 结果
*/
@Override
public int insertSchoolScDiscipline(SchoolScDiscipline schoolScDiscipline)
{
schoolScDiscipline.setCreateTime(DateUtils.getNowDate());
return schoolScDisciplineMapper.insertSchoolScDiscipline(schoolScDiscipline);
}
/**
* 修改学生违纪
*
* @param schoolScDiscipline 学生违纪
* @return 结果
*/
@Override
public int updateSchoolScDiscipline(SchoolScDiscipline schoolScDiscipline)
{
schoolScDiscipline.setUpdateTime(DateUtils.getNowDate());
return schoolScDisciplineMapper.updateSchoolScDiscipline(schoolScDiscipline);
}
/**
* 批量删除学生违纪
*
* @param ids 需要删除的学生违纪主键
* @return 结果
*/
@Override
public int deleteSchoolScDisciplineByIds(Long[] ids)
{
return schoolScDisciplineMapper.deleteSchoolScDisciplineByIds(ids);
}
/**
* 删除学生违纪信息
*
* @param id 学生违纪主键
* @return 结果
*/
@Override
public int deleteSchoolScDisciplineById(Long id)
{
return schoolScDisciplineMapper.deleteSchoolScDisciplineById(id);
}
/**
* 获取最新三个年级
* @return
*/
@Override
public List<Map<String, Object>> getGrade() {
return schoolScDisciplineMapper.getGrade();
}
/**
* 根据年级获取班级
* @param gradeId
* @return
*/
@Override
public List<Map<String, Object>> getClassList(Long gradeId) {
return schoolScDisciplineMapper.getClassList(gradeId);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesServiceImpl.java
package yangtz.cs.liu.campus.service.impl.teacherFiles; package yangtz.cs.liu.campus.service.impl.teacherFiles;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SchoolTeacher; import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.TermRange; import com.ruoyi.common.utils.TermRange;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import yangtz.cs.liu.campus.domain.award.Award; import yangtz.cs.liu.campus.domain.award.Award;
import yangtz.cs.liu.campus.domain.material.Material; import yangtz.cs.liu.campus.domain.material.Material;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
...@@ -13,6 +15,7 @@ import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor; ...@@ -13,6 +15,7 @@ import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
import yangtz.cs.liu.campus.domain.teacherFiles.*; import yangtz.cs.liu.campus.domain.teacherFiles.*;
import yangtz.cs.liu.campus.domain.thesis.Thesis; import yangtz.cs.liu.campus.domain.thesis.Thesis;
import yangtz.cs.liu.campus.domain.training.Training; import yangtz.cs.liu.campus.domain.training.Training;
import yangtz.cs.liu.campus.mapper.accessory.AccessoryMapper;
import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMapper; import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMapper;
import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMentorMapper; import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMentorMapper;
import yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMapper; import yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMapper;
...@@ -64,6 +67,10 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService ...@@ -64,6 +67,10 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
@Autowired @Autowired
private SchoolClassMentorMapper classMentorMapper; private SchoolClassMentorMapper classMentorMapper;
@Autowired
private AccessoryMapper accessoryMapper;
/** /**
* 查询教师档案 * 查询教师档案
* *
...@@ -73,11 +80,49 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService ...@@ -73,11 +80,49 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
@Override @Override
public TeacherFilesVO selectTeacherFilesById(Long id) public TeacherFilesVO selectTeacherFilesById(Long id)
{ {
TeacherFilesVO teacherFiles = teacherFilesMapper.selectTeacherFilesById(id); TeacherFilesVO teacherFiles = teacherFilesMapper.selectTeacherFilesById(id);
teacherFiles.setMaterialList(FmaterialMapper.selectTeacherFilesMaterialListByFilesId(id)); //教师档案课题编写情况
teacherFiles.setThesisList(FthesisMapper.selectTeacherFilesThesisListByFilesId(id)); List<TeacherFilesMaterial> teacherFilesMaterials = FmaterialMapper.selectTeacherFilesMaterialListByFilesId(id);
teacherFiles.setTrainingList(FtrainingMapper.selectTeacherFilesTrainingListByFilesId(id)); for (TeacherFilesMaterial date :teacherFilesMaterials){
teacherFiles.setAwardList(FawardMapper.selectTeacherFilesAwardListByFilesId(id)); LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolAccessory::getBusinessId,date.gettId())
.eq(SchoolAccessory::getAccessoryType,"材料编写附件");
List<SchoolAccessory> accessories = accessoryMapper.selectList(wrapper);
date.setAccessories(accessories);
}
teacherFiles.setMaterialList(teacherFilesMaterials);
//论文
List<TeacherFilesThesis> teacherFilesTheses = FthesisMapper.selectTeacherFilesThesisListByFilesId(id);
for (TeacherFilesThesis date : teacherFilesTheses){
LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolAccessory::getBusinessId,date.gettId())
.eq(SchoolAccessory::getAccessoryType,"论文情况附件");
List<SchoolAccessory> accessories = accessoryMapper.selectList(wrapper);
date.setSchoolAccessoryList(accessories);
}
teacherFiles.setThesisList(teacherFilesTheses);
//教师档案培训情况
List<TeacherFilesTraining> teacherFilesTrainings = FtrainingMapper.selectTeacherFilesTrainingListByFilesId(id);
for (TeacherFilesTraining date :teacherFilesTrainings){
LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolAccessory::getBusinessId,date.gettId())
.eq(SchoolAccessory::getAccessoryType,"培训情况附件");
List<SchoolAccessory> accessories = accessoryMapper.selectList(wrapper);
date.setAccessories(accessories);
}
teacherFiles.setTrainingList(teacherFilesTrainings);
//教师档案获奖情况
List<TeacherFilesAward> teacherFilesAwards = FawardMapper.selectTeacherFilesAwardListByFilesId(id);
for (TeacherFilesAward date :teacherFilesAwards){
LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolAccessory::getBusinessId,date.gettId())
.eq(SchoolAccessory::getAccessoryType,"获奖情况附件");
List<SchoolAccessory> accessories = accessoryMapper.selectList(wrapper);
date.setAccessories(accessories);
}
teacherFiles.setAwardList(teacherFilesAwards);
return teacherFiles; return teacherFiles;
} }
...@@ -114,9 +159,8 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService ...@@ -114,9 +159,8 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
} }
@Override public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles) {
public List<TeacherFilesNotice> selctTeacherByUserId(Long userId,TeacherFilesNotice teacherFiles) { return teacherFilesNoticeMapper.selctTeacherByUserId(teacherFiles);
return teacherFilesNoticeMapper.selctTeacherByUserId(userId,teacherFiles);
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolRewardsPunishments/ISchoolScAwardsService.java 0 → 100644
package yangtz.cs.liu.campus.service.schoolRewardsPunishments;
import com.baomidou.mybatisplus.extension.service.IService;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScAwards;
import yangtz.cs.liu.campus.vo.schoolRewardsPunishments.SchoolScAwardsVo;
import java.util.List;
/**
* 学校获奖Service接口
*
* @author ruoyi
* @date 2023-11-06
*/
public interface ISchoolScAwardsService extends IService<SchoolScAwards>
{
/**
* 查询学校获奖
*
* @param id 学校获奖主键
* @return 学校获奖
*/
public SchoolScAwardsVo selectSchoolScAwardsById(Long id);
/**
* 查询学校获奖列表
*
* @param schoolScAwardsVo 学校获奖
* @return 学校获奖集合
*/
public List<SchoolScAwardsVo> selectSchoolScAwardsList(SchoolScAwardsVo schoolScAwardsVo);
/**
* 新增学校获奖
*
* @param schoolScAwardsVo 学校获奖
* @return 结果
*/
public int insertSchoolScAwards(SchoolScAwardsVo schoolScAwardsVo);
/**
* 修改学校获奖
*
* @param schoolScAwardsVo 学校获奖
* @return 结果
*/
public int updateSchoolScAwards(SchoolScAwardsVo schoolScAwardsVo);
/**
* 批量删除学校获奖
*
* @param ids 需要删除的学校获奖主键集合
* @return 结果
*/
public int deleteSchoolScAwardsByIds(Long[] ids);
/**
* 删除学校获奖信息
*
* @param id 学校获奖主键
* @return 结果
*/
public int deleteSchoolScAwardsById(Long id);
/**
* 提交
* @param schoolScAwards
* @return
*/
int submit(SchoolScAwards schoolScAwards);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolRewardsPunishments/ISchoolScDisciplineService.java 0 → 100644
package yangtz.cs.liu.campus.service.schoolRewardsPunishments;
import com.baomidou.mybatisplus.extension.service.IService;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScDiscipline;
import java.util.List;
import java.util.Map;
/**
* 学生违纪Service接口
*
* @author ruoyi
* @date 2023-11-06
*/
public interface ISchoolScDisciplineService extends IService<SchoolScDiscipline>
{
/**
* 查询学生违纪
*
* @param id 学生违纪主键
* @return 学生违纪
*/
public SchoolScDiscipline selectSchoolScDisciplineById(Long id);
/**
* 查询学生违纪列表
*
* @param schoolScDiscipline 学生违纪
* @return 学生违纪集合
*/
public List<SchoolScDiscipline> selectSchoolScDisciplineList(SchoolScDiscipline schoolScDiscipline);
/**
* 新增学生违纪
*
* @param schoolScDiscipline 学生违纪
* @return 结果
*/
public int insertSchoolScDiscipline(SchoolScDiscipline schoolScDiscipline);
/**
* 修改学生违纪
*
* @param schoolScDiscipline 学生违纪
* @return 结果
*/
public int updateSchoolScDiscipline(SchoolScDiscipline schoolScDiscipline);
/**
* 批量删除学生违纪
*
* @param ids 需要删除的学生违纪主键集合
* @return 结果
*/
public int deleteSchoolScDisciplineByIds(Long[] ids);
/**
* 删除学生违纪信息
*
* @param id 学生违纪主键
* @return 结果
*/
public int deleteSchoolScDisciplineById(Long id);
/**
* 获取最新三个年级
* @return
*/
List<Map<String,Object>> getGrade();
/**
* 根据年级获取班级
* @param gradeId
* @return
*/
List<Map<String,Object>> getClassList(Long gradeId);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/teacherFiles/ITeacherFilesService.java
...@@ -6,6 +6,7 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice; ...@@ -6,6 +6,7 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO; import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 教师档案Service接口 * 教师档案Service接口
...@@ -45,7 +46,6 @@ public interface ITeacherFilesService ...@@ -45,7 +46,6 @@ public interface ITeacherFilesService
* @return 教师档案集合 * @return 教师档案集合
*/ */
public int countYqr(TeacherFiles teacherFiles); public int countYqr(TeacherFiles teacherFiles);
public List<TeacherFilesNotice> selctTeacherByUserId(Long userId,TeacherFilesNotice teacherFiles);
public List<TeacherFilesDeletRecord> getTeacherRocer(String tId); public List<TeacherFilesDeletRecord> getTeacherRocer(String tId);
/** /**
...@@ -54,6 +54,7 @@ public interface ITeacherFilesService ...@@ -54,6 +54,7 @@ public interface ITeacherFilesService
* @return * @return
*/ */
public Integer teacherAdd(Long[] ids); public Integer teacherAdd(Long[] ids);
public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles);
/** /**
* 新增教师档案 * 新增教师档案
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolRewardsPunishments/SchoolScAwardsVo.java 0 → 100644
package yangtz.cs.liu.campus.vo.schoolRewardsPunishments;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import java.util.Date;
import java.util.List;
@Data
public class SchoolScAwardsVo
{
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 比赛名称 */
@Excel(name = "比赛名称")
private String competitionName;
/** 主办单位 */
@Excel(name = "主办单位")
private String organizer;
/** 获奖名称 */
@Excel(name = "获奖名称")
private String awardsName;
/** 主管部门id */
private Long competentDeptId;
/** 主管部门 */
@Excel(name = "主管部门")
private String competentDept;
/** 获奖级别(字典) */
@Excel(name = "获奖级别")
private String awardsLevel;
/** 部门主任id */
private Long deptDirectorId;
/** 部门主任 */
@Excel(name = "部门主任")
private String deptDirector;
/** 获奖时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "获奖时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date awardsTime;
/** 获奖类型(字典) */
@Excel(name = "获奖类型")
private String awardsType;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 审核状态(0未提交，1审核中，2通过，3驳回) */
@Excel(name = "审核状态")
private String auditState;
/** 申请人id */
private Long applyId;
/** 申请人 */
private String applyName;
/** 申请时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
/** 创建者 */
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/** 更新者 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/** 是否删除 */
@TableField(fill = FieldFill.INSERT)
private String delFlag;
//图片附件
private List<SchoolAccessory> schoolAccessoryList;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
}
smart-campus/src/main/resources/mapper/schoolDcwj/SchoolDcwjMapper.xml
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
</if> </if>
and r.student_id = #{studentId} and d.dcwj_zt = '2' and d.del_flag = '0' and r.del_flag = '0' and r.student_id = #{studentId} and d.dcwj_zt = '2' and d.del_flag = '0' and r.del_flag = '0'
</where> </where>
order by d.create_time desc
</select> </select>
<select id="teacherGetDcwjList" resultType="yangtz.cs.liu.wechat.vo.schoolDcwj.Vo_SchoolDcwj"> <select id="teacherGetDcwjList" resultType="yangtz.cs.liu.wechat.vo.schoolDcwj.Vo_SchoolDcwj">
...@@ -95,6 +96,7 @@ ...@@ -95,6 +96,7 @@
</if> </if>
and r.teacher_id = #{teacherId} and d.dcwj_zt = '2' and d.del_flag = '0' and r.del_flag = '0' and r.teacher_id = #{teacherId} and d.dcwj_zt = '2' and d.del_flag = '0' and r.del_flag = '0'
</where> </where>
order by d.create_time desc
</select> </select>
<select id="queryList" resultType="yangtz.cs.liu.campus.vo.schoolDcwj.DawjVo"> <select id="queryList" resultType="yangtz.cs.liu.campus.vo.schoolDcwj.DawjVo">
......
smart-campus/src/main/resources/mapper/teacherFiles/TeacherFilesNoticeMapper.xml
...@@ -45,19 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -45,19 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selctTeacherByUserId" resultType="yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice">
SELECT fn.*,tf.state,tf.id as fId from teacher_files tf LEFT JOIN teacher_files_notice fn on fn.id= tf.notice_id WHERE tf.teacher_id = #{userId}
and fn.notice_state = 2
<if test="teacherFiles.noticeRange != null and teacherFiles.noticeRange != ''"> and fn.notice_range = #{teacherFiles.noticeRange}</if>
<if test="teacherFiles.noticeYear != null and teacherFiles.noticeYear != ''"> and fn.notice_year = #{teacherFiles.noticeYear}</if>
<if test="teacherFiles.noticeSemester != null and teacherFiles.noticeSemester != ''"> and fn.notice_semester = #{teacherFiles.noticeSemester}</if>
<if test="teacherFiles.noticeName != null and teacherFiles.noticeName != ''"> and fn.notice_name like concat('%', #{teacherFiles.noticeName}, '%')</if>
<if test="teacherFiles.noticeState != null and teacherFiles.noticeState != ''"> and fn.notice_state = #{teacherFiles.noticeState}</if>
<if test="teacherFiles.startTime != null "> and start_time = #{teacherFiles.startTime}</if>
<if test="teacherFiles.endTime != null "> and end_time = #{teacherFiles.endTime}</if>
</select>
<select id="selectTeacherFilesNoticeListByUser" parameterType="TeacherFilesNotice" resultType="TeacherFilesNoticeTotal"> <select id="selectTeacherFilesNoticeListByUser" parameterType="TeacherFilesNotice" resultType="TeacherFilesNoticeTotal">
<include refid="selectTeacherFilesNoticeTotalVo"/> <include refid="selectTeacherFilesNoticeTotalVo"/>
<where> <where>
...@@ -78,6 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -78,6 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<select id="selctTeacherByUserId" parameterType="TeacherFiles" resultType="yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice">
SELECT fn.*,tf.state,tf.id as fId from teacher_files tf LEFT JOIN teacher_files_notice fn on fn.id= tf.notice_id WHERE tf.teacher_id = #{userId}
and fn.notice_state = 2
<if test="noticeName != null "> and fn.notice_name LIKE concat('%', #{noticeName}, '%') </if>
</select>
<insert id="insertTeacherFilesNotice" parameterType="TeacherFilesNotice"> <insert id="insertTeacherFilesNotice" parameterType="TeacherFilesNotice">
insert into teacher_files_notice insert into teacher_files_notice
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment