Skip to content

D
dd_school
Commit 8cbd4b10 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents 86ef3e1c 41797696
Showing with 472 additions and 146 deletions
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
import request from '@/utils/request'
// 通知列表
// 添加任务
export function addTeacherNotice(data) {
return request({
url: '/teacherFiles/notice',
method: 'post',
data: data
})
}
// 任务列表
export function listTeacherNotice(query) {
return request({
url: '/teacherFiles/notice/list',
......@@ -9,24 +18,54 @@ export function listTeacherNotice(query) {
})
}
// 添加通知
export function addTeacherNotice(data) {
// 任务详情
export function infoTeaNotice(id) {
return request({
url: `/teacherFiles/notice/${id}`,
method: 'put'
})
}
// 任务修改
export function updateTask(data) {
return request({
url: '/teacherFiles/notice',
method: 'post',
method: 'put',
data: data
})
}
// 信息发布
// 发布任务
export function infoTeacherNotice(id) {
return request({
url: `/teacherFiles/notice/release/${id}`,
method: 'put'
})
}
// 任务撤回
export function taskRetracted(id) {
return request({
url: '/teacherFiles/notice/withdraw/' + id,
method: 'put'
})
}
// 任务完成
export function taskCompleted(id) {
return request({
url: '/teacherFiles/notice/complete/' + id,
method: 'put'
})
}
// 任务删除
export function delTaskInfo(id) {
return request({
url: '/teacherFiles/notice/' + id,
method: 'delete'
})
}
// 通知下档案查看|数据维护
export function getteacherNotice(query) {
......@@ -36,7 +75,6 @@ export function getteacherNotice(query) {
params: query
})
}
//老师查看档案详情
export function getNoticeInfo(query) {
return request({
......@@ -54,7 +92,6 @@ export function getDepInfo(query) {
params: query
})
}
//查看档案详情
export function getFileTnfo(id) {
return request({
......@@ -70,3 +107,43 @@ export function syncNotice(id) {
})
}
// 教师档案修改
export function updateInfo(data) {
return request({
url: '/teacherFiles/files',
method: 'put',
data: data
})
}
// 教师档案删除
export function delInfo(id) {
return request({
url: '/teacherFiles/files/' + id,
method: 'delete'
})
}
// 教师档案提交审核
// /teacherFiles/files/submitTo/29
export function fileSubReview(id) {
return request({
url: `/teacherFiles/files/submitTo/${id}`,
method: 'put'
})
}
// 教师档案提交通过
export function fileSubApproved(id) {
return request({
url: `/teacherFiles/files/reject/${id}`,
method: 'put'
})
}
// 教师档案提交驳回
export function fileSubRejected(id) {
return request({
url: `/teacherFiles/files/passThrough/${id}`,
method: 'put'
})
}
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/massOrganization/clubRegistrationReview/index.vue
......@@ -35,10 +35,11 @@
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="name" label="姓名" />
<el-table-column align="center" prop="sex" label="性别" />
<el-table-column align="center" prop="grade" label="年级" />
<el-table-column align="center" prop="grade" label="级部" />
<el-table-column align="center" prop="classes" label="班级" />
<el-table-column align="center" prop="hobby" label="兴趣爱好" />
<el-table-column align="center" prop="phone" label="联系电话" />
<el-table-column align="center" prop="cardid" label="身份证号" />
<el-table-column align="center" prop="hobby" label="兴趣爱好" />
<el-table-column align="center" prop="reason" label="申请理由" />
<el-table-column align="center" prop="status" label="审核状态">
<template slot-scope="{ row }">
......@@ -107,25 +108,33 @@
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="兴趣爱好">
<el-input v-model="form.hobby"></el-input>
<el-form-item label="联系电话">
<el-input v-model="form.phone"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="联系电话">
<el-input v-model="form.phone"></el-input>
<el-form-item label="身份证号">
<el-input v-model="form.cardid"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="兴趣爱好">
<el-input v-model="form.hobby"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="申请理由">
<el-input v-model="form.reason"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="审核状态">
<el-input v-model="form.status"></el-input>
<el-input v-model="form.status"> </el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -153,6 +162,7 @@ export default {
name: "clubRegistrationReview",
data() {
return {
cat: "",
queryParams: {
pageNum: 1,
pageSize: 10,
......@@ -222,16 +232,23 @@ export default {
},
// 查看
handQuery(row) {
console.log(row, "查看row");
// console.log(row, "查看row");
this.reset();
const ids = row.id;
this.title = "社团报名审核";
this.dialogTableVisible = true;
// this.form = row;
listsigninInfo(ids).then((response) => {
console.log(ids, "id");
if (response.data && response.data.name) {
this.form = response.data;
this.form.status = response.data.status;
this.cat = this.form.status;
if (this.cat === "1") {
this.form.status = "未审核";
} else if (this.cat === "2") {
this.form.status = "同意";
} else if (this.cat === "3") {
this.form.status = "不同意";
}
}
});
},
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
......@@ -128,77 +128,59 @@
<el-form-item label="姓名:" style="padding-right: 10px">
<el-input v-model="form.teacherName"></el-input>
</el-form-item>
<el-form-item label="性别:" style="padding-right: 10px">
<!-- <el-form-item label="性别:" style="padding-right: 10px">
<el-input v-model="form.sex"></el-input>
</el-form-item> -->
<el-form-item label="性别：" style="padding-right: 10px">
<el-select
v-model="form.sex"
placeholder="请输入性别"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="年龄:" style="padding-right: 10px">
<el-input v-model="form.age"></el-input>
</el-form-item>
<el-form-item label="职称:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.title"
></el-input>
<el-input v-model="form.title"></el-input>
</el-form-item>
<el-form-item label="学历:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.education"
></el-input>
<el-input v-model="form.education"></el-input>
</el-form-item>
<el-form-item label="政治面貌:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.appearance"
></el-input>
<el-input v-model="form.appearance"></el-input>
</el-form-item>
<el-form-item label="任教学科:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.courseName"
></el-input>
<el-input v-model="form.courseName"></el-input>
</el-form-item>
<el-form-item label="任教班级:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.className"
></el-input>
<el-input v-model="form.className"></el-input>
</el-form-item>
<el-form-item label="任正班主任班级:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.bzrClassName"
></el-input>
<el-input v-model="form.bzrClassName"></el-input>
</el-form-item>
<el-form-item label="任副班主任班级:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.fbzrClassName"
></el-input>
<el-input v-model="form.fbzrClassName"></el-input>
</el-form-item>
<el-form-item label="是否教学组长:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.isTeachingGroupleader"
></el-input>
<el-input v-model="form.isTeachingGroupLeader"></el-input>
</el-form-item>
<el-form-item label="是否教研组长:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.isResearchGroupLeader"
></el-input>
<el-input v-model="form.isResearchGroupLeader"></el-input>
</el-form-item>
<el-form-item label="设计课时量:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.classHour"
></el-input>
<el-input v-model="form.classHour"></el-input>
</el-form-item>
<el-form-item label="班主任情况:" style="padding-right: 10px">
<el-input
:="check == true ? true : false"
v-model="form.classTeacherDetails"
></el-input>
<el-input v-model="form.classTeacherDetails"></el-input>
</el-form-item>
</el-form>
<span
......@@ -385,15 +367,29 @@
<script>
import {
addTeacherNotice, //添加任务
listTeacherNotice, // 任务列表
infoTeaNotice, //任务详情
updateTask, //添加修改
infoTeacherNotice, //发布任务
taskRetracted, //任务撤回
taskCompleted, //任务完成
delTaskInfo, //任务删除
getteacherNotice, // 通知下档案查看|数据维护
getNoticeInfo, //查看档案详情
getNoticeInfo, //老师查看档案详情
getDepInfo, //级部查看档案详情
getFileTnfo, //查看档案详情
getDepInfo, //级部查询列表
syncNotice, // 同步档案
syncNotice, //同步档案
updateInfo, //教师档案修改
delInfo, //教师档案删除
fileSubReview, //教师档案提交审核
fileSubApproved, //教师档案提交通过
fileSubRejected, //教师档案提交驳回
} from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
export default {
name: "dataReceiver",
dicts: ["sys_user_sex"],
data() {
return {
// 遮罩层
......@@ -427,7 +423,8 @@ export default {
courseName: "",
className: "",
bzrClassName: "",
isTeachingGroupleader: "",
fbzrClassName: "",
isTeachingGroupLeader: "",
isResearchGroupLeader: "",
classHour: "",
classTeacherDetails: "",
......@@ -443,8 +440,6 @@ export default {
};
},
mounted() {
// console.log("id", this.$route.query.noticeId);
// console.log("status", this.$route.query.noticeState);
this.getList();
},
methods: {
......@@ -487,13 +482,16 @@ export default {
});
},
// 提取
handleExtract(row) {
console.log(row, "row提取");
this.dialogVisible = true;
const id = row.detail;
// 提取 `
handleExtract() {
const id = this.form.id;
syncNotice(id).then((res) => {
console.log(res, "提取");
console.log(id, "id");
console.log("res提取", res);
this.tableFirstData = res;
this.tableSecondData = res;
this.tableThirdData = res;
this.tableForthData = res;
});
},
//修改按钮
......@@ -501,10 +499,33 @@ export default {
this.check = false;
this.title = "基本信息修改";
this.dialogVisible = true;
this.form = row;
},
//弹窗确定按钮
confirmDialog() {
const params = {
id: this.form.id,
sex: this.form.sex,
age: this.form.age,
title: this.form.title,
education: this.form.education,
appearance: this.form.appearance,
courseName: this.form.courseName,
className: this.form.className,
bzrClassName: this.form.bzrClassName,
fbzrClassName: this.form.fbzrClassName,
isTeachingGroupLeader: this.form.isTeachingGroupLeader,
isResearchGroupLeader: this.form.isResearchGroupLeader,
classHour: this.form.classHour,
classTeacherDetails: this.form.classTeacherDetails,
state: this.form.state,
};
console.log(params, "弹窗确定按钮");
updateInfo(params).then((res) => {
console.log(res, "res");
this.form = res;
});
this.dialogVisible = false;
},
//多选按钮
......@@ -513,25 +534,17 @@ export default {
},
// 删除按钮
handleDelete(row) {
//判断，如果进度是未填写可以直接删除不需要提醒
//如果是其他状态需要提示相应的状态
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
const ids = row.id || this.ids;
this.$modal
.confirm("是否确认删除？")
.then(function () {
return delInfo(ids);
})
.then(() => {
this.$message({
type: "success",
message: "删除成功!",
});
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
.catch(() => {});
},
},
};
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
......@@ -16,7 +16,7 @@
<el-select v-model="queryForm.noticeState" placeholder="请选择任务状态">
<el-option label="未发布" value="1"></el-option>
<el-option label="已发布" value="2"></el-option>
<el-option label="已结束" value="3"></el-option>
<el-option label="已结束" value="7"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -43,7 +43,7 @@
icon="el-icon-delete"
size="mini"
type="danger"
@click="handleDeleteMuti"
@click="handleDelete"
>删除</el-button
>
</el-form-item>
......@@ -107,7 +107,13 @@
>
<template slot-scope="{ row }">
{{
row.noticeState == 1 ? "未发布" : 2 ? "已发布" : 3 ? "已结束" : ""
row.noticeState == 1
? "未发布"
: row.noticeState == 2
? "已发布"
: row.noticeState == 7
? "已发布"
: ""
}}
</template>
</el-table-column>
......@@ -142,16 +148,19 @@
</el-button>
</div>
<div>
<!-- v-if="scope.row.noticeState == '2'" -->
<el-button size="mini" type="text" @click="dataReceiver(scope.row)"
<el-button
v-if="scope.row.noticeState == '2'"
size="mini"
type="text"
@click="dataReceiver(scope.row)"
>数据接收人员
</el-button>
<el-button
v-if="scope.row.noticeState == '2'"
size="mini"
type="text"
@click="dataMaintenance(scope.row)"
>数据维护
<!-- v-if="scope.row.noticeState == '2'" -->
</el-button>
<el-button
v-if="scope.row.noticeState == '2'"
......@@ -177,21 +186,21 @@
</div>
<div>
<el-button
v-if="scope.row.noticeState == '3'"
v-if="scope.row.noticeState == '7'"
size="mini"
type="text"
@click="dataReceiver(scope.row)"
>数据接收人员
</el-button>
<el-button
v-if="scope.row.noticeState == '3'"
v-if="scope.row.noticeState == '7'"
size="mini"
type="text"
@click="dataMaintenance(scope.row)"
@click="dataInspection(scope.row)"
>数据查看
</el-button>
<el-button
v-if="scope.row.noticeState == '3'"
v-if="scope.row.noticeState == '7'"
size="mini"
type="text"
@click="handleExport(scope.row)"
......@@ -272,19 +281,31 @@
<script>
import {
listTeacherNotice, // 通知列表
addTeacherNotice, // 添加通知
infoTeacherNotice, // 信息发布
addTeacherNotice, //添加任务
listTeacherNotice, // 任务列表
infoTeaNotice, //任务详情
updateTask, //添加修改
infoTeacherNotice, //发布任务
taskRetracted, //任务撤回
taskCompleted, //任务完成
delTaskInfo, //任务删除
getteacherNotice, // 通知下档案查看|数据维护
getNoticeInfo, //查看档案详情//查看档案详情
syncNotice, // 同步档案
getDepInfo, //级部查询列表
getNoticeInfo, //老师查看档案详情
getDepInfo, //级部查看档案详情
getFileTnfo, //查看档案详情
syncNotice, //同步档案
updateInfo, //教师档案修改
delInfo, //教师档案删除
fileSubReview, //教师档案提交审核
fileSubApproved, //教师档案提交通过
fileSubRejected, //教师档案提交驳回
} from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
import { format } from "@/utils/activiti/myUtil.js";
export default {
name: "teacherElectronicRecord",
data() {
return {
selectedIds: [],
// 遮罩层
loading: true,
// 总条数
......@@ -309,6 +330,7 @@ export default {
// 弹窗标题
title: "",
form: {
noticeYear: "",
noticeSemester: "",
noticeRange: "全体教师",
startTime: "",
......@@ -342,7 +364,7 @@ export default {
// 表单重置
reset() {
this.queryForm = {
(this.queryForm = {
noticeYear: "",
noticeSemester: "",
noticeRange: "",
......@@ -350,8 +372,15 @@ export default {
noticeName: "",
startTime: "",
endTime: "",
};
this.resetForm("queryForm");
}),
(this.form = {
noticeYear: "",
noticeSemester: "",
noticeRange: "全体教师",
startTime: "",
endTime: "",
});
// this.resetForm("queryForm");
},
//重置按钮
resetQuery() {
......@@ -360,9 +389,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
console.log("selection", selection);
this.ids = selection.map((item) => item.id);
console.log("this.ids", this.ids);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
......@@ -375,38 +402,68 @@ export default {
},
//弹窗确定按钮
confirmDialog() {
addTeacherNotice(this.form).then((res) => {
console.log(res, "弹窗确定");
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
// 修改
updateTask(this.form)
.then((response) => {
this.getList();
this.$message.success("修改成功");
this.dialogVisible = false;
})
.catch((err) => {});
} else {
// 新增
addTeacherNotice(this.form)
.then((response) => {
this.getList();
this.$message.success("新增成功");
this.dialogVisible = false;
})
.catch((err) => {});
}
}
});
},
//多选删除按钮
handleDeleteMuti() {
console.log("delete ids", this.ids);
// 接口
},
handleDeleteMuti() {},
//修改按钮
handleEdit(row) {
console.log(row, "row1");
this.title = "修改任务";
this.dialogVisible = true;
this.form = row;
},
// 删除按钮
handleDelete(row) {},
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm("是否确认删除？")
.then(function () {
return delTaskInfo(ids);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
// 发布按钮
handlePublish(row) {
this.$modal
.confirm("是否确认发布此信息？")
.then(() => {
.confirm("是否发布该活动？")
.then(function () {
return infoTeacherNotice(row.id);
console.log(row, "发布按钮");
})
.then(() => {
this.getList();
this.$modal.msgSuccess("发布成功");
})
.catch((exception) => {
throw new Error(exception);
.catch((err) => {
console.error(err);
});
},
// 数据接收人员按钮
......@@ -441,12 +498,51 @@ export default {
console.log(pageNum, "数据维护按钮num");
console.log(pageSize, "数据维护按钮size");
},
// 数据查看
dataInspection() {
infoTeaNotice().then((res) => {});
},
// 导出按钮
handleExport(row) {},
handleExport(row) {
// this.download(`/artExam/exportAddress/${this.examId}`, {
// ...this.queryParams
// }, `教师电子档案${Date.now()}.xlsx`)
},
// 撤回按钮
handleRevocation(row) {},
handleRevocation(row) {
// taskRetracted
this.$modal
.confirm("是否撤回该活动？")
.then(function () {
return taskRetracted(row.id);
console.log(row, "撤回按钮");
})
.then(() => {
this.getList();
this.$modal.msgSuccess("撤回成功");
})
.catch((err) => {
console.error(err);
});
},
// 结束按钮
handleFinish(row) {},
handleFinish(row) {
// taskCompleted
this.$modal
.confirm("是否结束该活动？")
.then(function () {
return taskCompleted(row.id);
console.log(row, "结束按钮");
})
.then(() => {
this.getList();
this.$modal.msgSuccess("任务结束");
})
.catch((err) => {
console.error(err);
});
},
},
};
</script>
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationSigninController.java
......@@ -87,21 +87,24 @@ public class SchoolOrganizationSigninController extends BaseController
@PostMapping("/approve")
public AjaxResult approve(@RequestBody signinApprove2Vo vo)
{
SchoolOrganizationSignin signin = schoolOrganizationSigninService.getById(vo.getId());
SchoolOrganizationSignin so = new SchoolOrganizationSignin();
so.setId(vo.getId());
so.setStatus(vo.getStatus());
//同意后还要将当前人员数据插入到社团成员表中
if (StringUtils.equals(vo.getStatus(),"2")){
if (signin!=null && StringUtils.equals(so.getStatus(),"2")){
SchoolOrganizationMember member = new SchoolOrganizationMember();
member.setCid(so.getCid());
member.setName(so.getName());
member.setGrade(so.getGrade());
member.setClasses(so.getClasses());
member.setOrgName(so.getOrgName());
member.setPhone(so.getPhone());
member.setSex(so.getSex());
member.setUserId(so.getUserId());
schoolOrganizationMemberService.save(member);
member.setCid(signin.getCid());
member.setName(signin.getName());
member.setGrade(signin.getGrade());
member.setClasses(signin.getClasses());
member.setOrgName(signin.getOrgName());
member.setPhone(signin.getPhone());
member.setSex(signin.getSex());
member.setUserId(signin.getUserId());
member.setCardid(signin.getCardid());
boolean save = schoolOrganizationMemberService.save(member);
System.out.println(save);
}
return toAjax(schoolOrganizationSigninService.updateById(so));
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesController.java
......@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
import javax.servlet.http.HttpServletResponse;
......@@ -90,10 +91,10 @@ public class TeacherFilesController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:files:remove')")
@Log(title = "教师档案", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable Long id)
{
return toAjax(teacherFilesService.deleteTeacherFilesByIds(ids));
return toAjax(teacherFilesService.deleteTeacherFilesById(id));
}
......@@ -108,4 +109,38 @@ public class TeacherFilesController extends BaseController
return toAjax(teacherFilesService.synchronous(id));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案审核通过", businessType = BusinessType.UPDATE)
@PutMapping("/passThrough/{id}")
public AjaxResult passThrough(@PathVariable("id") Long id)
{
TeacherFiles teacherFiles = new TeacherFiles();
teacherFiles.setId(id);
teacherFiles.setState("5");
return toAjax(teacherFilesService.updateTeacherFiles(teacherFiles));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案审核驳回", businessType = BusinessType.UPDATE)
@PutMapping("/reject/{id}")
public AjaxResult reject(@PathVariable("id") Long id)
{
TeacherFiles teacherFiles = new TeacherFiles();
teacherFiles.setId(id);
teacherFiles.setState("9");
return toAjax(teacherFilesService.updateTeacherFiles(teacherFiles));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案提交", businessType = BusinessType.UPDATE)
@PutMapping("/submitTo/{id}")
public AjaxResult submitTo(@PathVariable("id") Long id)
{
TeacherFiles teacherFiles = new TeacherFiles();
teacherFiles.setId(id);
teacherFiles.setState("4");
return toAjax(teacherFilesService.updateTeacherFiles(teacherFiles));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesNoticeController.java
......@@ -94,14 +94,31 @@ public class TeacherFilesNoticeController extends BaseController
return toAjax(teacherFilesNoticeService.release(id));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案通知撤回", businessType = BusinessType.UPDATE)
@PutMapping("/withdraw/{id}")
public AjaxResult withdraw(@PathVariable("id") String id)
{
return toAjax(teacherFilesNoticeService.withdraw(id));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案通知完成", businessType = BusinessType.UPDATE)
@PutMapping("/complete/{id}")
public AjaxResult complete(@PathVariable("id") String id)
{
return toAjax(teacherFilesNoticeService.complete(id));
}
/**
* 删除教师档案通知
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:remove')")
@Log(title = "教师档案通知", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable("id") String id)
{
return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeByIds(ids));
return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeById(id));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java
......@@ -62,4 +62,7 @@ public class SchoolOrganizationSignin extends OurBaseEntity
/** userId */
private Long userId;
/** 身份证号 */
private String cardid;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesAward.java
......@@ -39,7 +39,7 @@ public class TeacherFilesAward extends BaseEntity
private Date awardTime;
/** 获奖等级（1一等奖，2二等奖，3三等奖） */
@Excel(name = "获奖等级", readConverterExp = "1=一等奖，2二等奖，3三等奖")
@Excel(name = "获奖等级", readConverterExp = "1=一等奖，2=二等奖，3=三等奖")
private String gradeOfAward;
/** 发证机关 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/TeacherFilesMapper.java
......@@ -4,6 +4,7 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
import java.util.List;
import java.util.Map;
/**
* 教师档案Mapper接口
......@@ -47,6 +48,13 @@ public interface TeacherFilesMapper
public int updateTeacherFilesState(String noticeId);
public int updateTeacherFilesState1(String noticeId);
public int updateTeacherFilesState7(String noticeId);
public int updateTeacherFilesName(Map map);
/**
* 删除教师档案
*
......@@ -62,4 +70,7 @@ public interface TeacherFilesMapper
* @return 结果
*/
public int deleteTeacherFilesByIds(Long[] ids);
public int deleteTeacherFilesByNoticeId(String noticeId);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesNoticeServiceImpl.java
......@@ -176,7 +176,6 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
teacherFiles.setIdCard(schoolTeacher.getIdCard());
teacherFiles.setSex(schoolTeacher.getSex());
teacherFiles.setEducation(schoolTeacher.getEducation());
System.out.println(schoolTeacher.getTeacherName()+"---------"+schoolTeacher.getBirthday());
Date birthday = schoolTeacher.getBirthday();
if(birthday!=null){
SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy");
......@@ -200,7 +199,13 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
public int updateTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice)
{
teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
return teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
teacherFilesNotice.setNoticeName(teacherFilesNotice.getNoticeYear()+"学年"+teacherFilesNotice.getNoticeSemester()+"教师档案填写");
int i = teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
Map map = new HashMap();
map.put("noticeId",teacherFilesNotice.getId());
map.put("filesSemester",teacherFilesNotice.getNoticeYear()+"学年"+teacherFilesNotice.getNoticeSemester());
teacherFilesMapper.updateTeacherFilesName(map);
return i;
}
@Override
......@@ -208,11 +213,34 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
TeacherFilesNotice teacherFilesNotice =new TeacherFilesNotice();
teacherFilesNotice.setId(id);
teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
teacherFilesNotice.setNoticeState("2");
int i = teacherFilesMapper.updateTeacherFilesState(id);
teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
return i;
}
@Override
public int withdraw(String id) {
TeacherFilesNotice teacherFilesNotice =new TeacherFilesNotice();
teacherFilesNotice.setId(id);
teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
teacherFilesNotice.setNoticeState("1");
int i = teacherFilesMapper.updateTeacherFilesState1(id);
teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
return i;
}
@Override
public int complete(String id) {
TeacherFilesNotice teacherFilesNotice =new TeacherFilesNotice();
teacherFilesNotice.setId(id);
teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
teacherFilesNotice.setNoticeState("7");
int i = teacherFilesMapper.updateTeacherFilesState7(id);
teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
return i;
}
/**
* 批量删除教师档案通知
*
......@@ -234,6 +262,8 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
@Override
public int deleteTeacherFilesNoticeById(String id)
{
return teacherFilesNoticeMapper.deleteTeacherFilesNoticeById(id);
int i = teacherFilesNoticeMapper.deleteTeacherFilesNoticeById(id);
teacherFilesMapper.deleteTeacherFilesByNoticeId(id);
return i;
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/teacherFiles/ITeacherFilesNoticeService.java
......@@ -47,6 +47,10 @@ public interface ITeacherFilesNoticeService
public int release(String id);
public int withdraw(String id);
public int complete(String id);
/**
* 批量删除教师档案通知
*
......
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationSigninMapper.xml
......@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
<result property="userId" column="user_id" />
<result property="cardid" column="cardid" />
</resultMap>
......
smart-campus/src/main/resources/mapper/teacherFiles/TeacherFilesMapper.xml
......@@ -143,14 +143,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</update>
<update id="updateTeacherFilesName" parameterType="Map">
update teacher_files set files_semester = #{filesSemester} where notice_id = #{noticeId}
</update>
<update id="updateTeacherFilesState" parameterType="String">
update teacher_files set state = 2 where notice_id = #{noticeId}
</update>
<update id="updateTeacherFilesState1" parameterType="String">
update teacher_files set state = 1 where notice_id = #{noticeId}
</update>
<update id="updateTeacherFilesState7" parameterType="String">
update teacher_files set state = 7 where notice_id = #{noticeId}
</update>
<delete id="deleteTeacherFilesById" parameterType="Long">
delete from teacher_files where id = #{id}
</delete>
<delete id="deleteTeacherFilesByNoticeId" parameterType="String">
delete from teacher_files where notice_id = #{noticeId}
</delete>
<delete id="deleteTeacherFilesByIds" parameterType="String">
delete from teacher_files where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
......
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