Skip to content

D
dd_school
Commit 1ccd7110 by Cat
Options

Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

parents 5222be6c c1696fe7
Showing with 2316 additions and 592 deletions
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
...@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity; ...@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 部门表 sys_dept * 部门表 sys_dept
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysDept extends BaseEntity public class SysDept extends BaseEntity
...@@ -32,7 +32,7 @@ public class SysDept extends BaseEntity ...@@ -32,7 +32,7 @@ public class SysDept extends BaseEntity
private String deptName; private String deptName;
/** 显示顺序 */ /** 显示顺序 */
private Integer orderNum; private Long orderNum;
/** 负责人 */ /** 负责人 */
private String leader; private String leader;
...@@ -51,7 +51,7 @@ public class SysDept extends BaseEntity ...@@ -51,7 +51,7 @@ public class SysDept extends BaseEntity
/** 父部门名称 */ /** 父部门名称 */
private String parentName; private String parentName;
/** 子部门 */ /** 子部门 */
private List<SysDept> children = new ArrayList<SysDept>(); private List<SysDept> children = new ArrayList<SysDept>();
...@@ -98,12 +98,12 @@ public class SysDept extends BaseEntity ...@@ -98,12 +98,12 @@ public class SysDept extends BaseEntity
} }
@NotNull(message = "显示顺序不能为空") @NotNull(message = "显示顺序不能为空")
public Integer getOrderNum() public Long getOrderNum()
{ {
return orderNum; return orderNum;
} }
public void setOrderNum(Integer orderNum) public void setOrderNum(Long orderNum)
{ {
this.orderNum = orderNum; this.orderNum = orderNum;
} }
......
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
...@@ -116,6 +116,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter ...@@ -116,6 +116,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers("/dd/user/login").permitAll() .antMatchers("/dd/user/login").permitAll()
.antMatchers( "/common/**").permitAll() .antMatchers( "/common/**").permitAll()
.antMatchers( "/dd/school/**").permitAll() .antMatchers( "/dd/school/**").permitAll()
//打印下载接口放行
.antMatchers("/school/student/queryOne/**","/school/studentStatus/proofStatus/**").permitAll()
//网页注册登录接口放行 //网页注册登录接口放行
.antMatchers( "/web/artStudent/register","/web/artStudent/login").permitAll() .antMatchers( "/web/artStudent/register","/web/artStudent/login").permitAll()
// 静态资源，可匿名访问 // 静态资源，可匿名访问
......
ruoyi-ui/README.md
...@@ -33,4 +33,7 @@ npm run build:prod ...@@ -33,4 +33,7 @@ npm run build:prod
在index页面，打开created中 this.csToken() 在index页面，打开created中 this.csToken()
#生产环境 #生产环境
在index页面，打开created中 this.getCode() 在index页面，打开created中 this.getCode()
Navbar.vue中的退出登录注销。
<!-- <el-dropdown-item divided @click.native="logout">
<span>退出登录</span>
</el-dropdown-item> -->
ruoyi-ui/src/permission.js
...@@ -15,6 +15,8 @@ const whiteList = [ ...@@ -15,6 +15,8 @@ const whiteList = [
"/register", "/register",
"/index", "/index",
"/dd", "/dd",
"/studentRegistra",
"/printBarcodes",
]; ];
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
......
ruoyi-ui/src/router/index.js
...@@ -62,6 +62,31 @@ export const constantRoutes = [ ...@@ -62,6 +62,31 @@ export const constantRoutes = [
hidden: true, hidden: true,
}, },
{ {
path: "/studentRegistra",
component: () =>
import(
"@/views/smartSchool/teachAffairAdministration/affairStudentManage/studentRegistra"
),
hidden: true,
},
//设备台账
{
path: "/printBarcodes",
component: () =>
import(
"@/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes"
),
hidden: true,
},
{
path: "/studentRegistra",
component: () =>
import(
"@/views/smartSchool/teachAffairAdministration/affairStudentManage/studentRegistra"
),
hidden: true,
},
{
path: "/register", path: "/register",
component: () => import("@/views/register"), component: () => import("@/views/register"),
hidden: true, hidden: true,
......
ruoyi-ui/src/views/activiti/definition/index.vue
...@@ -130,8 +130,8 @@ ...@@ -130,8 +130,8 @@
<script> <script>
import { listDefinition, delDefinition, suspendOrActiveDefinition, convert2Model } from "@/api/activiti/definition.js" import { listDefinition, delDefinition, suspendOrActiveDefinition, convert2Model } from "@/api/activiti/definition.js"
import { format } from "@/utils/activiti/myUtil.js" import { format } from "@/utils/activiti/myUtil.js"
export default { export default {
name: "Definition", name: "Definition",
data() { data() {
......
ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentManagement/index.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</el-form-item> </el-form-item>
<el-form-item label="仪器分类"> <el-form-item label="仪器分类">
<treeselect v-model="queryForm.instrumentTypeId" :options="equiList" :normalizer="normalizer" <treeselect v-model="queryForm.instrumentTypeId" :options="equiList" :normalizer="normalizer"
placeholder="选择分类编码" clearable style="width: 192px" /> placeholder="选择分类编码" clearable style="width: 192px" noOptionsText="暂无数据" />
</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 type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<el-col :span="20"> <el-col :span="20">
<el-form-item label="仪器分类" prop="instrumentTypeName"> <el-form-item label="仪器分类" prop="instrumentTypeName">
<treeselect v-model="form.instrumentTypeName" :options="equiList" :normalizer="normalizer" <treeselect v-model="form.instrumentTypeName" :options="equiList" :normalizer="normalizer"
placeholder="选择" clearable style="width: 100%" /> placeholder="选择" clearable style="width: 100%" noOptionsText="暂无数据"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/secondaryDivision/index.vue
...@@ -202,21 +202,33 @@ export default { ...@@ -202,21 +202,33 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1, pageNum: 1,
pageSize: 10,
curriculaId: "",
studentName: "",
classId: "",
selectedCourse: "",
pageNum: 1,
pageSize: 10 pageSize: 10
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.getList(); this.getList();
}, },
// 重置 // 重置
reset() { reset() {
this.postForm = { this.form = {
curriculaId: '', curriculaId: "",
course: "",
courseName: "",
coursePeopleNumber: "",
classesNumber: "",
peopleNumber: "",
divisionClassesRule: "",
divisionClassesFrequency: '1',
} }
this.resetForm('postForm'); this.resetForm('form');
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -232,45 +244,32 @@ export default { ...@@ -232,45 +244,32 @@ export default {
}, },
// 分班按钮 // 分班按钮
submitForm() { submitForm() {
// 检查是否已经分班
const alreadyDivided = this.selectedCourse.every(course => course.divisionClassesRule !== "");
console.log('this.selectedCourse', this.selectedCourse);
if (alreadyDivided) {
this.$message.warning("已经分班，无法重复操作");
return;
}
this.$confirm('确定要分班吗？', '提示', { this.$confirm('确定要分班吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// let that = this; const formData = this.selectedCourse.map((course) => {
// for (let i = 0; i < this.selectedCourse.length; i++) { console.log(course);
// that.selectedCourse[i].divisionClassesRule = that.form.divisionClassesRule; return {
// const course = this.selectedCourse[i]; curriculaId: this.queryForm.curriculaId,
// console.log('course.divisionClassesRule:', course.divisionClassesRule); course: course.course,
// console.log('course.classesNumber:', course.classesNumber); classesNumber: course.classesNumber,
// console.log('course.peopleNumber:', course.peopleNumber); peopleNumber: course.peopleNumber,
// if (course.divisionClassesRule === '' || course.classesNumber === '' || course.peopleNumber === '') { coursePeopleNumber: course.peopleNumber,
// this.$message.error("分班规则、班级数量和每班人数不能为空"); divisionClassesRule: this.form.divisionClassesRule,
// return; divisionClassesFrequency: course.divisionClassesFrequency
// } };
// let totalPeopleNumber = course.classesNumber * course.peopleNumber; });
// if (totalPeopleNumber > this.selectedCourse.length) { addDivisionec(formData).then((response) => {
// this.$message.error("班级数量和每班人数相乘不能超过总人数"); console.log(response);
// return; this.$modal.msgSuccess('分班成功');
// }
// }
// console.log('this.selectedCourse', this.selectedCourse);
addDivisionec(this.selectedCourse).then((response) => {
console.log('this.selectedCourse', this.selectedCourse);
this.$modal.msgSuccess("分班成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}).catch(error => { }).catch(error => {
console.error(error);
});
})
}) })
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/summerViewing/index.vue
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="分班规则" prop="divisionClassesRule"> <el-form-item label="分班规则" prop="divisionClassesRule">
<el-radio-group v-model="form.divisionClassesRule"> <el-radio-group v-model="form.divisionClassesRule">
<el-radio label='1'>平行分班</el-radio> <el-radio label="1">平行分班</el-radio>
<el-radio label='2'>分层分班</el-radio> <el-radio label="2">分层分班</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -63,9 +63,9 @@ ...@@ -63,9 +63,9 @@
<el-input v-model="course.peopleNumber" placeholder="每班人数"></el-input> <el-input v-model="course.peopleNumber" placeholder="每班人数"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
<div style="text-align: center"> <div style="text-align: center">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
...@@ -88,15 +88,15 @@ export default { ...@@ -88,15 +88,15 @@ export default {
dicts: ['section_type'], dicts: ['section_type'],
data() { data() {
return { return {
divisionClassesRule: '',
selectedCourse: [], selectedCourse: [],
classList: [], classList: [],
// 查询表单 // 查询表单
queryForm: { queryForm: {
divisionClassesRule: '', curriculaId: "",
curriculaId: '', studentName: "",
studentsName: '', classId: "",
classId: '', selectedCourse: "",
selectedCourse: '',
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}, },
...@@ -188,12 +188,12 @@ export default { ...@@ -188,12 +188,12 @@ export default {
coursePeopleNumber: item.peopleNumber, coursePeopleNumber: item.peopleNumber,
classesNumber: '', classesNumber: '',
peopleNumber: '', peopleNumber: '',
divisionClassesRule: '', divisionClassesRule: "",
divisionClassesFrequency: '1' divisionClassesFrequency: '1'
} }
}); });
// console.log('this.selectedCourse', this.selectedCourse); console.log('this.selectedCourse', this.selectedCourse);
} }
}) })
}, },
...@@ -202,7 +202,14 @@ export default { ...@@ -202,7 +202,14 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1, pageNum: 1,
pageSize: 10,
curriculaId: "",
studentName: "",
classId: "",
selectedCourse: "",
pageNum: 1,
pageSize: 10 pageSize: 10
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.getList(); this.getList();
...@@ -210,10 +217,17 @@ export default { ...@@ -210,10 +217,17 @@ export default {
// 重置 // 重置
reset() { reset() {
this.postForm = { this.form = {
curriculaId: '', curriculaId: "",
course: "",
courseName: "",
coursePeopleNumber: "",
classesNumber: "",
peopleNumber: "",
divisionClassesRule: "",
divisionClassesFrequency: '1',
} }
this.resetForm('postForm'); this.resetForm('form');
}, },
// 取消按钮 // 取消按钮
...@@ -230,47 +244,33 @@ export default { ...@@ -230,47 +244,33 @@ export default {
}, },
// 分班按钮 // 分班按钮
submitForm() { submitForm() {
// 检查是否已经分班
const alreadyDivided = this.selectedCourse.every(course => course.divisionClassesRule !== "");
console.log('this.selectedCourse', this.selectedCourse);
if (alreadyDivided) {
this.$message.warning("已经分班，无法重复操作");
return;
}
this.$confirm('确定要分班吗？', '提示', { this.$confirm('确定要分班吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// let that = this; const formData = this.selectedCourse.map((course) => {
// for (let i = 0; i < this.selectedCourse.length; i++) {
// that.selectedCourse[i].divisionClassesRule = that.form.divisionClassesRule; return {
// const course = this.selectedCourse[i]; curriculaId: this.queryForm.curriculaId,
// console.log('course.divisionClassesRule:', course.divisionClassesRule); course: course.course,
// console.log('course.classesNumber:', course.classesNumber); classesNumber: course.classesNumber,
// console.log('course.peopleNumber:', course.peopleNumber); peopleNumber: course.peopleNumber,
// if (course.divisionClassesRule === '' || course.classesNumber === '' || course.peopleNumber === '') { coursePeopleNumber: course.peopleNumber,
// this.$message.error("分班规则、班级数量和每班人数不能为空"); divisionClassesRule: this.form.divisionClassesRule,
// return; divisionClassesFrequency: course.divisionClassesFrequency
// } };
// let totalPeopleNumber = course.classesNumber * course.peopleNumber; });
// console.log('totalPeopleNumber', totalPeopleNumber);
// if (totalPeopleNumber > this.coursePeopleNumber) { addDivision(formData).then((response) => {
// console.log('this.coursePeopleNumber', this.coursePeopleNumber); console.log(response);
// this.$message.error("班级数量和每班人数相乘不能超过总人数"); this.$modal.msgSuccess('分班成功');
// return;
// }
// }
// console.log('this.selectedCourse', this.selectedCourse);
addDivision(this.selectedCourse).then((response) => {
console.log('this.selectedCourse', this.selectedCourse);
this.$modal.msgSuccess("分班成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}).catch(error => { }).catch(error => {
console.error(error);
});
})
}) })
...@@ -285,6 +285,8 @@ export default { ...@@ -285,6 +285,8 @@ export default {
} }
} }
</script> </script>
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue
...@@ -72,8 +72,8 @@ ...@@ -72,8 +72,8 @@
<el-col :span="16"> <el-col :span="16">
<el-form-item label="发布时间"> <el-form-item label="发布时间">
<el-date-picker v-model="dateRange" type="daterange" range-separator="至" <el-date-picker v-model="dateRange" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss" :style="{ width: '100%' }"> value-format="yyyy-MM-dd" :style="{ width: '100%' }">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/laboratoryAppointment/index.vue
...@@ -86,8 +86,6 @@ ...@@ -86,8 +86,6 @@
<el-option v-for="item in tableList" :key="item.id" :value="item.experimentName" <el-option v-for="item in tableList" :key="item.id" :value="item.experimentName"
:label="item.experimentName"></el-option> :label="item.experimentName"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -267,7 +265,6 @@ export default { ...@@ -267,7 +265,6 @@ export default {
}, },
methods: { methods: {
//表单查询 //表单查询
getList() { getList() {
getLabplanlist(this.queryForm).then(response => { getLabplanlist(this.queryForm).then(response => {
...@@ -289,10 +286,8 @@ export default { ...@@ -289,10 +286,8 @@ export default {
//选择实验名称自动带出信息 //选择实验名称自动带出信息
getName() { getName() {
const selectedExperiment = this.tableList.find(experiment => experiment.experimentName === this.form.experimentName); const selectedExperiment = this.tableList.find(experiment => experiment.experimentName === this.form.experimentName);
if (selectedExperiment) { if (selectedExperiment) {
this.selectedExperiment = selectedExperiment; // 确保将选中的实验赋值给 selectedExperiment this.selectedExperiment = selectedExperiment; // 确保将选中的实验赋值给 selectedExperiment
// 将实验的字段赋值给表单字段 // 将实验的字段赋值给表单字段
this.form.experimentPlanId = selectedExperiment.chapterContent?.id || ""; this.form.experimentPlanId = selectedExperiment.chapterContent?.id || "";
this.form.chapterContent = selectedExperiment.chapterContent || ""; this.form.chapterContent = selectedExperiment.chapterContent || "";
...@@ -368,17 +363,20 @@ export default { ...@@ -368,17 +363,20 @@ export default {
this.nowType = type; this.nowType = type;
this.getSchholyear(); this.getSchholyear();
if (type != 0) { if (type != 0) {
const id = row.id if (row && row.id) {
getLabplanxq(id).then(response => { const id = row.id;
if (response.code == 200) { getLabplanxq(id).then(response => {
console.log(response); if (response.code == 200) {
Object.keys(this.form).forEach(key => { console.log(response);
if (response.data[key]) { Object.keys(this.form).forEach(key => {
this.$set(this.form, key, response.data[key]); if (response.data[key]) {
} this.$set(this.form, key, response.data[key]);
}) }
} });
}) }
});
}
} }
this.dialogTableVisible = true; this.dialogTableVisible = true;
}, },
...@@ -418,7 +416,7 @@ export default { ...@@ -418,7 +416,7 @@ export default {
declareState: '0', declareState: '0',
}; };
console.log(params);
addLabplan(params).then(response => { addLabplan(params).then(response => {
this.$modal.msgSuccess('保存成功'); this.$modal.msgSuccess('保存成功');
this.dialogTableVisible = false; this.dialogTableVisible = false;
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/teachLeaveApprove/HandleResolve/TeacherLeaveInfo.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="老师姓名" prop="teacherName"> <el-form-item label="老师姓名" prop="teacherName">
<el-input readonly :value="infoForm.teacherName"/> <el-input readonly :value="infoForm.teacherName" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<el-form-item label="请假类型"> <el-form-item label="请假类型">
<el-select readonly :value="infoForm.type" style="width: 100%" placeholder=""> <el-select readonly :value="infoForm.type" style="width: 100%" placeholder="">
<el-option v-for="dict in dict.type.biz_leave_type" :key="dict.value" :value="dict.value" <el-option v-for="dict in dict.type.biz_leave_type" :key="dict.value" :value="dict.value"
:label="dict.label"></el-option> :label="dict.label"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="请假开始时间" prop="startTime"> <el-form-item label="请假开始时间" prop="startTime">
<el-date-picker readonly style="width: 100%" v-model="infoForm.startTime" type="datetime" <el-date-picker readonly style="width: 100%" v-model="infoForm.startTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker> value-format="yyyy/MM/dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="请假结束时间" prop="endTime"> <el-form-item label="请假结束时间" prop="endTime">
<el-date-picker readonly style="width: 100%" v-model="infoForm.endTime" type="datetime" <el-date-picker readonly style="width: 100%" v-model="infoForm.endTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker> value-format="yyyy/MM/dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -48,25 +48,25 @@ ...@@ -48,25 +48,25 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item label="请假开始时间" prop="startTime"> <el-form-item label="请假开始时间" prop="startTime">
<el-date-picker readonly v-model="infoForm.startTime" type="date" style="width: 100%" <el-date-picker readonly v-model="infoForm.startTime" type="date" style="width: 100%"
value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker> value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-select :value="infoForm.startSort" style="width: 100%" placeholder="请选择课程节次"> <el-select :value="infoForm.startSort" style="width: 100%" placeholder="请选择课程节次">
<el-option v-for="dict in dict.type.course_arrange" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.course_arrange" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option> :value="dict.value"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :offset="2" :span="7"> <el-col :offset="2" :span="7">
<el-form-item label="请假结束时间" prop="endTime"> <el-form-item label="请假结束时间" prop="endTime">
<el-date-picker readonly type="date" v-model="infoForm.endTime" value-format="yyyy-MM-dd" <el-date-picker readonly type="date" v-model="infoForm.endTime" value-format="yyyy-MM-dd"
style="width: 100%" placeholder="选择日期"></el-date-picker> style="width: 100%" placeholder="选择日期"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-select :value="infoForm.endSort" style="width: 100%" placeholder="请选择课程节次"> <el-select :value="infoForm.endSort" style="width: 100%" placeholder="请选择课程节次">
<el-option v-for="dict in dict.type.course_arrange" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.course_arrange" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option> :value="dict.value"></el-option>
</el-select> </el-select>
</el-col> </el-col>
</el-row> </el-row>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<el-col> <el-col>
<el-form-item label="请假原因"> <el-form-item label="请假原因">
<el-input readonly :value="infoForm.reasonForLeave" type="textarea" placeholder="" <el-input readonly :value="infoForm.reasonForLeave" type="textarea" placeholder=""
:autosize="{ minRows: 3 }"/> :autosize="{ minRows: 3 }" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -82,15 +82,13 @@ ...@@ -82,15 +82,13 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实际开始时间" prop="realityStartTime"> <el-form-item label="实际开始时间" prop="realityStartTime">
<el-date-picker style="width: 100%" v-model="infoForm.realityStartTime" type="datetime" <el-date-picker style="width: 100%" v-model="infoForm.realityStartTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="" value-format="yyyy-MM-dd HH:mm:ss" placeholder="" :picker-options="limitStartTime"></el-date-picker>
:picker-options="limitStartTime"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实际结束时间" prop="realityEndTime"> <el-form-item label="实际结束时间" prop="realityEndTime">
<el-date-picker style="width: 100%" v-model="infoForm.realityEndTime" type="datetime" <el-date-picker style="width: 100%" v-model="infoForm.realityEndTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="" value-format="yyyy-MM-dd HH:mm:ss" placeholder="" :picker-options="limitEndTime"></el-date-picker>
:picker-options="limitEndTime"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -100,7 +98,7 @@ ...@@ -100,7 +98,7 @@
</el-form> </el-form>
</el-card> </el-card>
<TaskResolve v-if="!$attrs.readOnly" :taskId="this.$attrs.taskId" :instanceId="instanceId" :id="id" <TaskResolve v-if="!$attrs.readOnly" :taskId="this.$attrs.taskId" :instanceId="instanceId" :id="id"
v-on="this.$listeners"></TaskResolve> v-on="this.$listeners"></TaskResolve>
</div> </div>
</template> </template>
...@@ -156,8 +154,8 @@ export default { ...@@ -156,8 +154,8 @@ export default {
limitStartTime, limitStartTime,
infoForm: {}, infoForm: {},
rules: { rules: {
realityStartTime: [{required: true, message: '实际开始时间不能为空', trigger: 'change'}], realityStartTime: [{ required: true, message: '实际开始时间不能为空', trigger: 'change' }],
realityEndTime: [{required: true, message: '实际结束时间不能为空', trigger: 'change'}] realityEndTime: [{ required: true, message: '实际结束时间不能为空', trigger: 'change' }]
} }
} }
}, },
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/teachLeaveApprove/HandleResolve/index.vue
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
:modal="false" :modal="false"
fullscreen fullscreen
:modal-append-to-body="false" :modal-append-to-body="false"
> >
<!-- <template slot="title">--> <!-- <template slot="title">-->
<!-- <div class="custom-dialog__header">--> <!-- <div class="custom-dialog__header">-->
...@@ -15,7 +14,6 @@ ...@@ -15,7 +14,6 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
<div class="resolve-dialog-bady" > <div class="resolve-dialog-bady" >
<div class="left-menu"> <div class="left-menu">
<el-tabs tab-position="left" v-model="asyncComponent" @tab-click="selectMenu" style="height: 800px"> <el-tabs tab-position="left" v-model="asyncComponent" @tab-click="selectMenu" style="height: 800px">
...@@ -40,8 +38,6 @@ ...@@ -40,8 +38,6 @@
</keep-alive> </keep-alive>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
...@@ -38,10 +38,15 @@ ...@@ -38,10 +38,15 @@
</el-table-column> </el-table-column>
<el-table-column label="证书照片" align="center" prop="schoolAccessoryList"> <el-table-column label="证书照片" align="center" prop="schoolAccessoryList">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image style="width: 100px; height: 100px" :src="scope.row.pictureUrl" <el-carousel :interval="4000" height="100px">
:preview-src-list="scope.row.previewUrls"></el-image> <el-carousel-item v-for="(item, index) in scope.row.schoolAccessoryList" :key="index">
<el-image style="width: 100px; height: 100px" :src="item.accessoryUrl"
:preview-src-list="[item.accessoryUrl]"></el-image>
</el-carousel-item>
</el-carousel>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注1" align="center" prop="remark1" /> <el-table-column label="备注1" align="center" prop="remark1" />
<el-table-column label="备注2" align="center" prop="remark2" /> <el-table-column label="备注2" align="center" prop="remark2" />
<el-table-column label="备注3" align="center" prop="remark3" /> <el-table-column label="备注3" align="center" prop="remark3" />
...@@ -115,11 +120,15 @@ ...@@ -115,11 +120,15 @@
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*" <el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload" :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload"
:http-request="uploadImage"> :http-request="uploadImage">
<img v-if="form.schoolAccessoryList && form.schoolAccessoryList.length > 0" <div v-if="form.schoolAccessoryList && form.schoolAccessoryList.length > 0">
:src="form.schoolAccessoryList[0].accessoryUrl" class="avatar" /> <el-image v-for="(photo, index) in form.schoolAccessoryList" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="photo.accessoryUrl"
:preview-src-list="[photo.accessoryUrl]"></el-image>
</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>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="备注1"> <el-form-item label="备注1">
...@@ -232,11 +241,13 @@ export default { ...@@ -232,11 +241,13 @@ export default {
schoolAccessoryList: [ schoolAccessoryList: [
{ required: true, message: "证书照片不能为空", trigger: "change" } { required: true, message: "证书照片不能为空", trigger: "change" }
], ],
competitionName: [
{ required: true, message: "比赛项目名称不能为空", trigger: "change" }
],
}, },
previewDialogVisible: false, previewDialogVisible: false,
teacherList: [], teacherList: [],
rules: {},
nowType: 0, // 0新增、1编辑、2查看 nowType: 0, // 0新增、1编辑、2查看
} }
}, },
...@@ -301,27 +312,30 @@ export default { ...@@ -301,27 +312,30 @@ export default {
// 上传图片 // 上传图片
uploadImage(file) { uploadImage(file) {
const fileData = file.file const fileData = file.file;
const formData = new FormData() const formData = new FormData();
formData.append('file', fileData) formData.append('file', fileData);
this.uploadLoading = true this.uploadLoading = true;
// Upload the file and add the uploaded file to the schoolAccessoryList
commonUpload(formData) commonUpload(formData)
.then(response => { .then(response => {
this.uploadLoading = false this.uploadLoading = false;
this.$modal.msgSuccess('上传成功') this.$modal.msgSuccess('上传成功');
this.imageUrl = process.env.VUE_APP_BASE_API + response.url
// 添加以下代码将文件信息添加到 uploadedFiles 数组中 // Add the uploaded file to the schoolAccessoryList
this.uploadedFiles.push({ this.form.schoolAccessoryList.push({
accessoryUrl: process.env.VUE_APP_BASE_API + response.url, accessoryUrl: process.env.VUE_APP_BASE_API + response.url,
accessoryName: fileData.name accessoryName: fileData.name
}) });
}) })
.catch(error => { .catch(error => {
this.uploadLoading = false this.uploadLoading = false;
}) });
}, },
//重置 //重置
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams = {
...@@ -371,25 +385,26 @@ export default { ...@@ -371,25 +385,26 @@ export default {
} }
this.nowType = type; this.nowType = type;
if (type != 0) { if (type != 0) {
const id = row.id const id = row.id;
getCompetitionxq(id).then(response => { getCompetitionxq(id).then(response => {
if (response.code == 200) { if (response.code == 200) {
Object.keys(this.form).forEach(key => { Object.keys(this.form).forEach(key => {
if (response.data[key]) { if (response.data[key]) {
this.$set(this.form, key, response.data[key]); this.$set(this.form, key, response.data[key]);
}
if (response.data.schoolAccessoryList && response.data.schoolAccessoryList.length > 0) {
this.imageUrl = response.data.schoolAccessoryList[0].accessoryUrl; // 将图片地址赋值给 imageUrl
} }
});
}) // Populate the schoolAccessoryList with multiple images
if (response.data.schoolAccessoryList && response.data.schoolAccessoryList.length > 0) {
this.form.schoolAccessoryList = response.data.schoolAccessoryList;
}
} }
}) });
} }
this.dialogVisible = true; this.dialogVisible = true;
}, },
//查询老师 //查询老师
getTeacher() { getTeacher() {
getTeacher().then(response => { getTeacher().then(response => {
...@@ -412,7 +427,6 @@ export default { ...@@ -412,7 +427,6 @@ export default {
accessoryName: file.accessoryName accessoryName: file.accessoryName
}); });
} }
updateCompetition(this.form).then(({ code }) => { updateCompetition(this.form).then(({ code }) => {
if (code == 200) { if (code == 200) {
this.$modal.msgSuccess('修改成功') this.$modal.msgSuccess('修改成功')
......
ruoyi-ui/src/views/smartSchool/massOrganization/basicInformationManagement/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="80px">
:model="queryForm"
ref="queryForm"
size="small"
:inline="true"
label-width="80px"
>
<el-form-item prop="name" label="社团名称"> <el-form-item prop="name" label="社团名称">
<el-input v-model="queryForm.name" placeholder="社团名称"></el-input> <el-input v-model="queryForm.name" placeholder="社团名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="teachers" label="指导教师"> <el-form-item prop="teachers" label="指导教师">
<el-input <el-input v-model="queryForm.teachers" placeholder="指导教师"></el-input>
v-model="queryForm.teachers"
placeholder="指导教师"
></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</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-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd()">新增</el-button>
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd()"
>新增</el-button
>
</el-col> </el-col>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<div class="listBlock"> <div class="listBlock">
<div class="itemBlock" v-for="(task, index) in tasks" :key="index"> <div class="itemBlock" v-for="(task, index) in tasks" :key="index">
<div <div style="
style="
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
" ">
>
<div style="width: 50%"> <div style="width: 50%">
<!-- 任务详细信息 --> <!-- 任务详细信息 -->
<div class="task-info"> <div class="task-info">
...@@ -77,49 +52,17 @@ ...@@ -77,49 +52,17 @@
<!-- 按钮 --> <!-- 按钮 -->
<div class="task-buttons"> <div class="task-buttons">
<el-button <el-button style="margin-left: 10px" size="mini" type="danger" round @click="handleDelete(task)">删除
style="margin-left: 10px"
size="mini"
type="danger"
round
@click="handleDelete(task)"
>删除
</el-button> </el-button>
<el-button <el-button type="success" size="small" round
type="success" @click="clubRegistrationReview(task.id, task.teachers)">社团报名审核</el-button>
size="small" <el-button type="info" size="small" round @click="clubActivityRecord(task.id)">社团活动记录</el-button>
round <el-button type="warning" size="small" round @click="memberManagement(task.id)">成员管理
@click="clubRegistrationReview(task.id, task.teachers)"
>社团报名审核</el-button
>
<el-button
type="info"
size="small"
round
@click="clubActivityRecord(task.id)"
>社团活动记录</el-button
>
<el-button
type="warning"
size="small"
round
@click="memberManagement(task.id)"
>成员管理
</el-button> </el-button>
<el-button <el-button class="purpleBtn" size="small" round type="primary"
class="purpleBtn" @click="communityStyle(task.id, task.teachers)">社团风采
size="small"
round
type="primary"
@click="communityStyle(task.id, task.teachers)"
>社团风采
</el-button> </el-button>
<el-button <el-button type="primary" size="small" round @click="basicInformation(task.id, task.teachers)">基础信息管理
type="primary"
size="small"
round
@click="basicInformation(task.id, task.teachers)"
>基础信息管理
</el-button> </el-button>
</div> </div>
</div> </div>
...@@ -129,45 +72,22 @@ ...@@ -129,45 +72,22 @@
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<div> <div>
<el-form-item label="社团名称" prop="name"> <el-form-item label="社团名称" prop="name">
<el-input <el-input v-model="form.name" placeholder="请输入社团名称"></el-input>
v-model="form.name"
placeholder="请输入社团名称"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="指导教师" prop="teachers"> <el-form-item label="指导教师" prop="teachers">
<el-select <el-select style="width: 100%" multiple v-model="form.teachers" filterable placeholder="请选择指导教师"
style="width: 100%" @change="changeTeacher">
multiple <el-option v-for="item in teacherInfo" :key="item.teacherCode" :label="item.teacherName"
v-model="form.teachers" :value="item.teacherCode">
filterable
placeholder="请选择指导教师"
@change="changeTeacher"
>
<el-option
v-for="item in teacherInfo"
:key="item.teacherCode"
:label="item.teacherName"
:value="item.teacherCode"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社团宗旨" prop="aim"> <el-form-item label="社团宗旨" prop="aim">
<el-input <el-input type="textarea" :rows="4" v-model="form.aim" placeholder="请输入社团宗旨"></el-input>
type="textarea"
:rows="4"
v-model="form.aim"
placeholder="请输入社团宗旨"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="社团简介" prop="intro"> <el-form-item label="社团简介" prop="intro">
<el-input <el-input type="textarea" :rows="4" v-model="form.intro" placeholder="请输入社团简介"></el-input>
type="textarea"
:rows="4"
v-model="form.intro"
placeholder="请输入社团简介"
></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -368,7 +288,7 @@ export default { ...@@ -368,7 +288,7 @@ export default {
this.$message.success("修改成功"); this.$message.success("修改成功");
this.open = false; this.open = false;
}) })
.catch((err) => {}); .catch((err) => { });
} else { } else {
// 新增 // 新增
const params = { const params = {
...@@ -385,7 +305,7 @@ export default { ...@@ -385,7 +305,7 @@ export default {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.open = false; this.open = false;
}) })
.catch((err) => {}); .catch((err) => { });
} }
} }
}); });
...@@ -403,7 +323,7 @@ export default { ...@@ -403,7 +323,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => {}); .catch(() => { });
}, },
// 重置表单 // 重置表单
reset() { reset() {
...@@ -466,7 +386,7 @@ export default { ...@@ -466,7 +386,7 @@ export default {
text-align: left; text-align: left;
} }
.task-level > span { .task-level>span {
margin-right: 25px; margin-right: 25px;
} }
...@@ -490,13 +410,13 @@ export default { ...@@ -490,13 +410,13 @@ export default {
padding-left: 60%; padding-left: 60%;
} }
.task-count > .count { .task-count>.count {
font-weight: bold; font-weight: bold;
color: #307def; color: #307def;
font-size: 45px; font-size: 45px;
} }
.task-count > .sun { .task-count>.sun {
color: rgba(16, 16, 16, 1); color: rgba(16, 16, 16, 1);
font-size: 18px; font-size: 18px;
text-align: center; text-align: center;
......
ruoyi-ui/src/views/smartSchool/massOrganization/communityStyle/index.vue
<!--社团风采--> <!--社团风采-->
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="标题" prop="theme"> <el-form-item label="标题" prop="theme">
<el-input <el-input v-model="queryParams.theme" placeholder="请输入标题" clearable />
v-model="queryParams.theme"
placeholder="请输入标题"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</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-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table <el-table v-loading="loading" ref="table" :data="picList" @selection-change="handleSelectionChange">
v-loading="loading"
ref="table"
:data="picList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="80" /> <el-table-column label="序号" align="center" type="index" width="80" />
<el-table-column label="风采主题" align="center" prop="theme" /> <el-table-column label="风采主题" align="center" prop="theme" />
...@@ -69,68 +34,32 @@ ...@@ -69,68 +34,32 @@
</el-table-column> </el-table-column>
<el-table-column label="是否发布" align="center" prop="isfb"> <el-table-column label="是否发布" align="center" prop="isfb">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch v-model="scope.row.isShow" active-value="1" inactive-value="0"
v-model="scope.row.isShow" @change="handleIsShow(scope.row)"></el-switch>
active-value="1"
inactive-value="0"
@change="handleIsShow(scope.row)"
></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 未发布可以修改删除 --> <!-- 未发布可以修改删除 -->
<div> <div>
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除
</el-button> </el-button>
</div> </div>
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)">查看
size="mini"
type="text"
icon="el-icon-edit"
@click="handleCheck(scope.row)"
>查看
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total > 0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改社团主题对话框 --> <!-- 添加或修改社团主题对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form <el-form ref="form" :model="form" :rules="rules" label-width="90px" style="width: 80%; margin: auto">
ref="form" <el-form-item prop="file" style="
:model="form"
:rules="rules"
label-width="90px"
style="width: 80%; margin: auto"
>
<el-form-item
prop="file"
style="
display: flex; display: flex;
text-align: center; text-align: center;
justify-content: center; justify-content: center;
...@@ -159,12 +88,8 @@ ...@@ -159,12 +88,8 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="风采主题:" prop="theme"> <el-form-item label="风采主题:" prop="theme">
<el-input <el-input :readonly="check == true ? true : false" v-model="form.theme" placeholder="请输入风采主题"
:readonly="check == true ? true : false" style="width: 100%" />
v-model="form.theme"
placeholder="请输入风采主题"
style="width: 100%"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -493,7 +418,7 @@ export default { ...@@ -493,7 +418,7 @@ export default {
this.$message.success("修改成功"); this.$message.success("修改成功");
this.open = false; this.open = false;
}) })
.catch((err) => {}); .catch((err) => { });
} else { } else {
// 新增 // 新增
const params = { const params = {
...@@ -508,7 +433,7 @@ export default { ...@@ -508,7 +433,7 @@ export default {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.open = false; this.open = false;
}) })
.catch((err) => {}); .catch((err) => { });
} }
} }
}); });
...@@ -519,8 +444,7 @@ export default { ...@@ -519,8 +444,7 @@ export default {
if (ids) { if (ids) {
this.$modal this.$modal
.confirm( .confirm(
`是否确认删除选中的${ `是否确认删除选中的${Object.hasOwnProperty.call(ids, "length") ? ids.length : 1
Object.hasOwnProperty.call(ids, "length") ? ids.length : 1
}条数据？` }条数据？`
) )
.then(() => { .then(() => {
...@@ -552,7 +476,7 @@ export default { ...@@ -552,7 +476,7 @@ export default {
isCommunityFb(data) isCommunityFb(data)
.then((response) => { .then((response) => {
this.$modal.closeLoading(); this.$modal.closeLoading();
this.$modal.msgSuccess("修改成功"); this.$message.success("修改成功");
}) })
.catch((error) => { .catch((error) => {
this.$modal.closeLoading(); this.$modal.closeLoading();
...@@ -562,6 +486,7 @@ export default { ...@@ -562,6 +486,7 @@ export default {
// 取消操作时的逻辑 // 取消操作时的逻辑
}); });
}, },
}, },
}; };
</script> </script>
......
ruoyi-ui/src/views/smartSchool/personWork/logisticsWarranty/index.vue
...@@ -502,8 +502,11 @@ export default { ...@@ -502,8 +502,11 @@ export default {
} }
} }
}); });
}) })();
}, },
// 反馈结果按钮 // 反馈结果按钮
submitFormfk() { submitFormfk() {
this.$refs.formfk.validate((valid) => { this.$refs.formfk.validate((valid) => {
......
ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/components/receiveList.vue
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
this.getList(); this.getList();
}, },
//根据组id查询组成员 //根据组id查询组成员
getList() { getList() {
this.loading = true; this.loading = true;
this.notificationId = this.$route.query.id; this.notificationId = this.$route.query.id;
console.log('this..notificationId', this.notificationId); console.log('this..notificationId', this.notificationId);
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
/** 关闭 */ /** 关闭 */
handleClose() { handleClose() {
this.$tab.closeOpenPage({ this.$tab.closeOpenPage({
path: '/schoolManage/schoolInfoPush' path: '/schoolManage/schoolNotice/school'
}); });
}, },
......
ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/infoPush/school/index.vue
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<el-tab-pane label="停用" :name="State.STOP"></el-tab-pane> <el-tab-pane label="停用" :name="State.STOP"></el-tab-pane>
</el-tabs> </el-tabs>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input size="small" v-model="queryParams.title" placeholder="请输入标题" clearable <el-input size="small" v-model="queryParams.title" placeholder="请输入标题" clearable
......
ruoyi-ui/src/views/smartSchool/schoolManage/schoolNotice/personnelGrouping/authUser.vue
...@@ -244,7 +244,7 @@ export default { ...@@ -244,7 +244,7 @@ export default {
// 返回按钮 // 返回按钮
handleClose() { handleClose() {
const obj = { path: "/system/role" }; const obj = { path: "/schoolManage/schoolNotice/personnelGrouping" };
this.$tab.closeOpenPage(obj); this.$tab.closeOpenPage(obj);
}, },
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
...@@ -316,6 +316,7 @@ import Treeselect from "@riophae/vue-treeselect"; ...@@ -316,6 +316,7 @@ import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import QRCode from "qrcodejs2"; // 生成二维码插件 import QRCode from "qrcodejs2"; // 生成二维码插件
import printJS from "print-js"; // 打印插件 import printJS from "print-js"; // 打印插件
import * as dd from 'dingtalk-jsapi';
export default { export default {
...@@ -621,58 +622,55 @@ export default { ...@@ -621,58 +622,55 @@ export default {
}, `设备台账_${Date.now()}.xlsx`) }, `设备台账_${Date.now()}.xlsx`)
}, },
//生成批量打印条码 //点击批量打印跳转
printBarcodes() { printBarcodes() {
this.printDialog = true // this.printDialog = true;
this.printList = this.chooseList this.printList = this.chooseList;
this.$nextTick(() => { console.log(11, this.printList);
this.chooseList.map((item, index) => { const url = 'http://localhost:1024/printBarcodes';
const dom = document.getElementById(`qrcode${index}`).lastElementChild console.log(url, 'url');
if (dom == null) { const ids = this.electItem.join(',');
new QRCode(`qrcode${index}`, { console.log(ids, 'ids');
width: 150, const encodes = this.chooseList.map(item => item.encode).join(',');
height: 150, console.log(encodes, 'encodes');
text: item.encode, const printListParam = encodeURIComponent(JSON.stringify(this.printList));
}); dd.biz.util.openLink({
} url: `${url}?ids=${ids}&encodes=${encodes}&printList=${printListParam}`,
}) onSuccess: () => {
console.log('跳转成功，准备打印');
// 打印条码
// this.printCode();
},
onFail: (error) => {
console.error('跳转失败', error);
}
});
},
this.printList.map((item, index) => {
const domPrint = document.getElementById(`print${index}`).lastElementChild
if (domPrint == null) {
new QRCode(`print${index}`, {
width: 60,
height: 60,
text: item.encode,
});
}
})
})
},
//打印条码 //打印条码
printCode() { // printCode() {
printJS({ // printJS({
printable: 'printBlock', // 标签元素id // printable: 'printBlock', // 标签元素id
type: 'html', // type: 'html',
targetStyles: ['*'], // targetStyles: ['*'],
font_size: '10px', // font_size: '10px',
style: ` // style: `
@media print{ // @media print{
@page{ // @page{
size:auto; // size:auto;
margin:4mm 0mm 0mm 0mm // margin:4mm 0mm 0mm 0mm
} // }
@page :first { // @page :first {
margin-top:2mm // margin-top:2mm
} // }
#printBlock{ // #printBlock{
display:block!important // display:block!important
} // }
}` // }`
}) // })
}, // },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue 0 → 100644
<template>
<div>
<!-- 打印二维码 弹框部分 -->
<el-dialog title="打印条码预览" :visible.sync="printDialog" width="30%">
<div class="qrCodeList">
<div v-for="(item, index) in chooseList" :key="index">
<div class="titlShow">东营市二中</div>
<div class="flexBlock qrCode">
<div class="qrCodeLeft">
<div :id="'qrcode' + index"></div>
<div>{{ item.encode }}</div>
</div>
<div class="qrCodeRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div>
<div>地点：{{ item.place }}</div>
</div>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="printCode">打 印</el-button>
</div>
</el-dialog>
<!-- 打印二维码 弹框部分 -->
<!-- 隐藏二维码页面样式 -->
<div id="printBlock">
<div v-for="(item, index) in printList" :key="index" class="printBody">
<div class="titlePrint">东营市二中</div>
<div class="flexBlock printQrCode">
<div class="printLeft">
<div :id="'print' + index" class="printImg"></div>
<div>{{ item.encode }}</div>
</div>
<div class="printRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div>
<div>地点：{{ item.place }}</div>
</div>
</div>
<div style="page-break-after:always"></div>
</div>
</div>
<!-- 隐藏二维码页面样式 -->
</div>
</template>
<script>
import { getToken } from "@/utils/auth";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import QRCode from "qrcodejs2"; // 生成二维码插件
import printJS from "print-js"; // 打印插件
export default {
name: "index",
data() {
return {
loading: true, // 遮罩层
total: 0, // 总条数
deviceData: [], // 设备台账表格数据
title: "", // 弹出层标题
dialogVisible: false, // 添加或修改
queryParams: { // 查询参数
pageNum: 1,
pageSize: 10,
equipmentName: '',
classificationCode: undefined,
equipmentState: '',
affiliationType: '',
},
classificationOptions: [], // 分类编码树状结构
formModel: {},
nowOptionType: '', // 0 入库 1 编辑 2 查看
electItem: [], // 选中的数据
isDisabledBtn: true,
chooseList: [], //用户选择的table数据
printDialog: false, // 打印二维码预览
printList: [],
userList: [] //使用人列表
};
},
created() {
const ids = this.$route.query.ids;
const encodes = this.$route.query.encodes;
const printList = JSON.parse(decodeURIComponent(this.$route.query.printList));
this.printBarcodes(ids, encodes, printList);
},
methods: {
//生成批量打印条码
printBarcodes(ids, encodes, printList) {
this.printDialog = true;
console.log(ids, encodes);
this.printList = [...printList];
this.chooseList = [...this.printList];
console.log(this.chooseList, '122');
this.$nextTick(() => {
this.printList.map((item, index) => {
const domPrint = document.getElementById(`print${index}`).lastElementChild;
if (domPrint == null) {
new QRCode(`print${index}`, {
width: 60,
height: 60,
text: item.encode,
});
}
});
this.chooseList.map((item, index) => {
const dom = document.getElementById(`qrcode${index}`).lastElementChild;
if (dom == null) {
new QRCode(`qrcode${index}`, {
width: 150,
height: 150,
text: item.encode,
});
}
});
});
},
//打印条码
printCode() {
printJS({
printable: printBlock,
type: 'html',
targetStyles: ['*'],
font_size: '10px',
style: `
@media print{
@page{
size:auto;
margin:4mm 0mm 0mm 0mm
}
@page :first{
margin-top:2mm
}
#printBlock{
display:block!important
}
}`
});
}
},
}
</script>
<style scoped>
::v-deep .el-form-item,
::v-deep .el-select {
width: 100%;
}
::v-deep .el-form-item--small .el-form-item__content {
width: 75%;
}
.qrCodeList {
max-height: 500px;
overflow-y: scroll;
}
.qrCode {
width: 300px;
font-size: 14px;
line-height: 30px;
align-items: flex-start;
margin: 0 auto 20px auto;
}
.qrCodeLeft {
text-align: center;
}
.qrCodeRight {
padding: 20px 0 20px 15px;
}
.titlShow {
font-weight: bold;
text-align: center;
padding-bottom: 10px;
font-size: 16px;
}
#printBlock {
display: none;
margin: 0px !important;
}
.printLeft {
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}
.printBody {
width: 250px;
}
.printQrCode {
font-size: 6px;
line-height: 20px;
align-items: center;
padding: 8px;
}
.printRight {
width: 60%;
padding: 0 5px;
}
.titlePrint {
font-size: 8px;
font-weight: bold;
text-align: center;
}
.printImg {
display: block;
}
</style>
ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="借用期限（天）" prop="deadline"> <el-form-item label="借用期限（天）" prop="deadline">
<el-input v-model="lendReturnForm.deadline" placeholder="请输入借用期限" <el-input v-model="lendReturnForm.deadline" placeholder="请输入借用期限" :disabled="nowType == 2 ? true : false"
:disabled="nowType == 2 ? true : false"></el-input> type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
...@@ -619,7 +619,8 @@ import { uploadImage as commonUpload } from '@/api/common' ...@@ -619,7 +619,8 @@ import { uploadImage as commonUpload } from '@/api/common'
import { ExportType, Gender, Nations, Area } from '@/enums/common' import { ExportType, Gender, Nations, Area } from '@/enums/common'
import { getYearList } from '@/utils/utilLibrary/getYearList' import { getYearList } from '@/utils/utilLibrary/getYearList'
import { getNewYear } from "@/api/smartSchool/teachAffairAdministration/affairClassView"; import { getNewYear } from "@/api/smartSchool/teachAffairAdministration/affairClassView";
import * as dd from 'dingtalk-jsapi';
import { im_1_0 } from '@alicloud/dingtalk'
export default { export default {
name: 'AffairStudentManage', name: 'AffairStudentManage',
components: { ClassSelect, PicAvatar }, components: { ClassSelect, PicAvatar },
...@@ -921,17 +922,40 @@ export default { ...@@ -921,17 +922,40 @@ export default {
}) })
}, },
// 学籍证明 // 学籍证明
// studentProve(row) {
// this.$router.push({
// path: '/teachAffairAdministration/studentProve',
// query: {
// id: row.id,
// name: row.studentName,
// idCard: row.idCard,
// schoolNo: row.schoolNo
// }
// })
// },
studentProve(row) { studentProve(row) {
this.$router.push({ console.log('准备跳转');
path: '/teachAffairAdministration/studentProve', const baseUrl = window.location.protocol + '//' + window.location.host; // 获取当前页面的协议、主机作为前缀URL
query: { console.log('im_1_0', baseUrl);
id: row.id, const url = `http://localhost:1024/studentRegistra?id=${row.id}&name=${row.studentName}&idCard=${row.idCard}&schoolNo=${row.schoolNo}`;
name: row.studentName, // const newURL = `${baseUrl}/studentRegistra?id=${encodeURIComponent(row.id)}&name=${encodeURIComponent(row.studentName)}&idCard=${encodeURIComponent(row.idCard)}&schoolNo=${encodeURIComponent(row.schoolNo)}`;
idCard: row.idCard, dd.biz.util.openLink({
schoolNo: row.schoolNo // url: newURL,
url: url,
onSuccess: () => {
console.log(newURL, 'newURL');
console.log('跳转成功，准备打印');
},
onFail: (err) => {
console.log('跳转失败', err);
} }
}) });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/studentRegistra.vue 0 → 100644
<template>
<div class="app-container">
<div style="width: 100%; display: flex; justify-content: center; flex-wrap: nowrap;">
<!-- <el-button type="primary" plain size="mini" @click="closeCurrentTab">关闭
</el-button> -->
<el-button type="primary" plain size="mini" @click="downloadProve">下载
</el-button>
<el-button type="primary" plain size="mini" @click="printTable">打印
</el-button>
</div>
<el-card :style="{ width: '850px', height: clientHeight, margin: '0 auto' }">
<div id="postFormContainer">
<br /><br />
<div style="display: block; font-weight: 600; font-size: 35px; text-align: center">学籍证明</div>
<br />
<span style="display: block; font-size: 25px; text-indent:50px; line-height: 40px">
{{ studentInfo.studentName }}同学，身份证号{{ studentInfo.idCard }} ，性别{{
studentInfo.sex
}}，{{ studentInfo.birthday }}生，
省学籍辅号{{ studentInfo.schoolNo }},全国学籍号{{
studentInfo.nationalNumber
}},系东营市第二中学{{ studentInfo.enrollmentYear }}级{{ studentInfo.classValue }}班学生，特此证明。
</span>
<br /><br /><br />
<div style="width: 100%; display:flex; justify-content: center; font-size:20px;">
<div>
<el-image style="width: 160px; height: 200px" :src="url"></el-image>
<br />
<div style="text-align: center">山东学籍管理</div>
</div>
</div>
<br /><br /><br />
<div style="position: relative; background: #1ab394">
<div style="position: absolute; right: 30px; font-size: 20px ">
<span>东营市第二中学</span>
<br /><br />
<span> {{ time }}</span>
</div>
</div>
</div>
</el-card>
</div>
</template>
<script>
import printJS from "print-js";
import { closeCurrentTab } from "@/utils/utilLibrary/routerBatch/routerBatch.js";
import { getStudent } from '@/api/smartSchool/teachAffairAdministration/affairStudentManage'
export default {
name: 'StudentProve',
data() {
return {
clientHeight: document.body.scrollHeight + 'px',
baseUrl: process.env.VUE_APP_BASE_API,
studentInfo: {},
url: '',
time: " ",
}
},
components: {},
methods: {
closeCurrentTab,
getImage() {
const studentId = this.$route.query.id;
getStudent(studentId).then((res) => {
this.studentInfo = res.data
if (res.data.sex == 0) {
this.studentInfo.sex = "男"
} else {
this.studentInfo.sex = "女"
}
if (res.data.birthday.charAt(5) == 0) {
if (res.data.birthday.charAt(8) == 0) {
this.studentInfo.birthday = res.data.birthday.slice(0, 4) + "年" + res.data.birthday.slice(6, 7) + "月" + res.data.birthday.slice(9, 10) + "日"
} else {
this.studentInfo.birthday = res.data.birthday.slice(0, 4) + "年" + res.data.birthday.slice(6, 7) + "月" + res.data.birthday.slice(8, 10) + "日"
}
} else {
if (res.data.birthday.charAt(8) == 0) {
this.studentInfo.birthday = res.data.birthday.slice(0, 4) + "年" + res.data.birthday.slice(5, 7) + "月" + res.data.birthday.slice(9, 10) + "日"
} else {
this.studentInfo.birthday = res.data.birthday.slice(0, 4) + "年" + res.data.birthday.slice(5, 7) + "月" + res.data.birthday.slice(8, 10) + "日"
}
}
this.url = this.baseUrl + this.studentInfo.avatar
console.log(this.url, 107)
});
},
// 打印
printTable() {
// 重置表单
printJS({
printable: 'postFormContainer',
targetStyles: ['*'],
type: "html",
})
},
/**
* 获取当前时间
*/
currentTime() {
var date = new Date();
var year = date.getFullYear(); //月份从0~11，所以加一
let month = date.getMonth();
console.log("month", month);
var dateArr = [
date.getMonth() + 1,
date.getDate(),
];
var strDate =
year + "年" + dateArr[0] + "月" + dateArr[1] + "日"
console.log("strDate", strDate);
return strDate
},
downloadProve() {
this.download(`/school/studentStatus/proofStatus/${this.$route.query.id}`, {}, `${this.studentInfo.studentName}.docx`)
},
},
created() {
this.getImage()
this.time = this.currentTime()
},
activated() {
this.getImage()
this.time = this.currentTime()
}
}
</script>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/components/AwardDetails.vue
...@@ -247,7 +247,7 @@ export default { ...@@ -247,7 +247,7 @@ export default {
// 关闭页面 // 关闭页面
closePage() { closePage() {
this.$tab.closeOpenPage({ this.$tab.closeOpenPage({
path: '/teacherManage/teacherInforManage' path: '/schoolManage/teacherManage/teacherInforManage'
}) })
}, },
}, },
......
ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/components/Resume.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<span>老师信息</span> <span>老师信息</span>
<hr/> <hr />
<br/> <br />
<el-form :model="techerInfoForm" ref="reftecherInfoForm" size="small" :inline="true" label-width="100px"> <el-form :model="techerInfoForm" ref="reftecherInfoForm" size="small" :inline="true" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="教师名称" clearable prop="teacherName"> <el-form-item label="教师名称" clearable prop="teacherName">
<el-input v-model="techerInfoForm.teacherName" disabled clearable @keyup.enter.native="handleQuery"/> <el-input v-model="techerInfoForm.teacherName" disabled clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="性别" prop="sex"> <el-form-item label="性别" prop="sex">
<el-select disabled v-model="techerInfoForm.sex" style="width: 100%" placeholder="请选择性别"> <el-select disabled v-model="techerInfoForm.sex" style="width: 100%" placeholder="请选择性别">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option> :value="dict.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -22,19 +22,19 @@ ...@@ -22,19 +22,19 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="教师电话" clearable prop="teacherTel"> <el-form-item label="教师电话" clearable prop="teacherTel">
<el-input disabled v-model="techerInfoForm.teacherTel" clearable @keyup.enter.native="handleQuery"/> <el-input disabled v-model="techerInfoForm.teacherTel" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作编号" clearable prop="teacherCode"> <el-form-item label="工作编号" clearable prop="teacherCode">
<el-input disabled v-model="techerInfoForm.teacherCode" clearable @keyup.enter.native="handleQuery"/> <el-input disabled v-model="techerInfoForm.teacherCode" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<span>履历信息</span> <span>履历信息</span>
<hr/> <hr />
<br/> <br />
<el-row> <el-row>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="resumeAdd">增加</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="resumeAdd">增加</el-button>
<el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="resumeEdit">修改</el-button> <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="resumeEdit">修改</el-button>
...@@ -42,38 +42,37 @@ ...@@ -42,38 +42,37 @@
</el-button> </el-button>
<el-button type="info" size="mini" plain icon="el-icon-close" @click="closePage">关闭</el-button> <el-button type="info" size="mini" plain icon="el-icon-close" @click="closePage">关闭</el-button>
</el-row> </el-row>
<br/> <br />
<el-table stripe v-loading="loading" style="width: 100%" :data="resumeList" <el-table stripe v-loading="loading" style="width: 100%" :data="resumeList" @selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"> <el-table-column type="selection" align="center" width="55" />
<el-table-column type="selection" align="center" width="55"/> <el-table-column label="序号" type="index" align="center" width="55" />
<el-table-column label="序号" type="index" align="center" width="55"/> <el-table-column label="学校/工作单位" width="width" align="center" prop="learnSchool" />
<el-table-column label="学校/工作单位" width="width" align="center" prop="learnSchool"/>
<el-table-column label="履历开始时间" :formatter="dateFormat" width="width" align="center" <el-table-column label="履历开始时间" :formatter="dateFormat" width="width" align="center"
prop="learnStart"></el-table-column> prop="learnStart"></el-table-column>
<el-table-column label="履历结束时间" :formatter="dateFormat" width="width" align="center" <el-table-column label="履历结束时间" :formatter="dateFormat" width="width" align="center"
prop="learnEnd"></el-table-column> prop="learnEnd"></el-table-column>
<el-table-column label="备注" width="width" align="center" prop="remark"/> <el-table-column label="备注" width="width" align="center" prop="remark" />
</el-table> </el-table>
<ExPagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <ExPagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"/> @pagination="getList" />
<!-- 履历编辑修改，新增弹窗--> <!-- 履历编辑修改，新增弹窗-->
<el-dialog :title="title" :visible.sync="openTeacherResume" width="800px"> <el-dialog :title="title" :visible.sync="openTeacherResume" width="800px">
<el-form :model="resumeForm" :rules="resumeRules" ref="refresumeForm" size="small" <el-form :model="resumeForm" :rules="resumeRules" ref="refresumeForm" size="small" style="width: 90%; margin: auto"
style="width: 90%; margin: auto" label-width="110px"> label-width="110px">
<el-form-item label="学校/工作单位" prop="learnSchool"> <el-form-item label="学校/工作单位" prop="learnSchool">
<el-input v-model="resumeForm.learnSchool" clearable style="width: 100%"/> <el-input v-model="resumeForm.learnSchool" clearable style="width: 100%" />
</el-form-item> </el-form-item>
<el-form-item label="履历开始时间" prop="learnStart"> <el-form-item label="履历开始时间" prop="learnStart">
<el-date-picker v-model="resumeForm.learnStart" type="date" style="width: 100%" <el-date-picker v-model="resumeForm.learnStart" type="date" style="width: 100%"
placeholder="履历开始时间"></el-date-picker> placeholder="履历开始时间"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="履历结束时间" clearable prop="learnEnd"> <el-form-item label="履历结束时间" clearable prop="learnEnd">
<el-date-picker v-model="resumeForm.learnEnd" type="date" style="width: 100%" <el-date-picker v-model="resumeForm.learnEnd" type="date" style="width: 100%"
placeholder="履历结束时间"></el-date-picker> placeholder="履历结束时间"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="备注" clearable prop="remark"> <el-form-item label="备注" clearable prop="remark">
<el-input type="textarea" :rows="3" style="width: 100%" v-model="resumeForm.remark" clearable/> <el-input type="textarea" :rows="3" style="width: 100%" v-model="resumeForm.remark" clearable />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div style="width: 300px; margin: auto"> <div style="width: 300px; margin: auto">
...@@ -87,8 +86,8 @@ ...@@ -87,8 +86,8 @@
</template> </template>
<script> <script>
import {getInform} from '@/api/smartSchool/teacherManage/teacherInformation' import { getInform } from '@/api/smartSchool/teacherManage/teacherInformation'
import {listResume, getOneResume, addResume, editResume, deleteResume} from '@/api/smartSchool/teacherManage/resume' import { listResume, getOneResume, addResume, editResume, deleteResume } from '@/api/smartSchool/teacherManage/resume'
// import message from "@/views/home/message/message"; // import message from "@/views/home/message/message";
export default { export default {
...@@ -126,9 +125,9 @@ export default { ...@@ -126,9 +125,9 @@ export default {
resumeForm: {}, resumeForm: {},
// 履历校验规则 // 履历校验规则
resumeRules: { resumeRules: {
learnSchool: [{required: true, message: '学校/工作单位不能为空', trigger: 'blur'}], learnSchool: [{ required: true, message: '学校/工作单位不能为空', trigger: 'blur' }],
learnStart: [{required: true, message: '履历开始时间不能为空', trigger: 'blur'}], learnStart: [{ required: true, message: '履历开始时间不能为空', trigger: 'blur' }],
learnEnd: [{required: true, message: '履历结束时间不能为空', trigger: 'blur'}] learnEnd: [{ required: true, message: '履历结束时间不能为空', trigger: 'blur' }]
} }
} }
}, },
...@@ -280,7 +279,7 @@ export default { ...@@ -280,7 +279,7 @@ export default {
// 关闭页面 // 关闭页面
closePage() { closePage() {
this.$tab.closeOpenPage({ this.$tab.closeOpenPage({
path: '/teacherManage/teacherInforManage' path: '/schoolManage/teacherManage/teacherInforManage'
}) })
} }
}, },
......
ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-form-item> </el-form-item>
<el-form-item label="职工类型" prop="employeeType"> <el-form-item label="职工类型" prop="employeeType">
<el-select v-model="queryParams.employeeType" placeholder="请选择职工类型"> <el-select v-model="queryParams.employeeType" placeholder="请选择职工类型" clearable>
<el-option v-for="dict in dict.type.employee_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.employee_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -456,6 +456,7 @@ export default { ...@@ -456,6 +456,7 @@ export default {
education: null, education: null,
status: null, status: null,
deptId: null, deptId: null,
employeeType: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
......
ruoyi-ui/src/views/system/user/authRole.vue
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="8" :offset="2"> <el-col :span="8" :offset="2">
<el-form-item label="登录账号" prop="phonenumber"> <el-form-item label="登录账号" prop="phonenumber">
<el-input v-model="form.phonenumber" disabled/> <el-input v-model="form.phonenumber" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" :offset="2"> <el-col :span="8" :offset="2">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户名称" prop="userName">
<el-input v-model="form.userName" disabled/> <el-input v-model="form.userName" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -23,24 +23,24 @@ ...@@ -23,24 +23,24 @@
<h4 class="form-header h4">角色信息</h4> <h4 class="form-header h4">角色信息</h4>
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table"
@selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)"> @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
<el-table-column type="selection" :reserve-selection="true" width="85"></el-table-column> <el-table-column type="selection" :reserve-selection="true" width="85"></el-table-column>
<el-table-column label="序号" type="index" align="center"> <el-table-column label="序号" type="index" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="角色编号" align="center" prop="roleId"/> <el-table-column label="角色编号" align="center" prop="roleId" />
<el-table-column label="角色名称" align="center" prop="roleName"/> <el-table-column label="角色名称" align="center" prop="roleName" />
<el-table-column label="权限字符" align="center" prop="roleKey"/> <el-table-column label="权限字符" align="center" prop="roleKey" />
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">--> <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.createTime) }}</span>--> <!-- <span>{{ parseTime(scope.row.createTime) }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="pageNum" :limit.sync="pageSize"/> <pagination v-show="total > 0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;"> <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import {getAuthRole, updateAuthRole} from "@/api/system/user"; import { getAuthRole, updateAuthRole } from "@/api/system/user";
export default { export default {
name: "AuthRole", name: "AuthRole",
...@@ -109,14 +109,14 @@ export default { ...@@ -109,14 +109,14 @@ export default {
submitForm() { submitForm() {
const userId = this.form.userId; const userId = this.form.userId;
const roleIds = this.roleIds.join(","); const roleIds = this.roleIds.join(",");
updateAuthRole({userId: userId, roleIds: roleIds}).then((response) => { updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
this.$modal.msgSuccess("授权成功"); this.$modal.msgSuccess("授权成功");
this.close(); this.close();
}); });
}, },
/** 关闭按钮 */ /** 关闭按钮 */
close() { close() {
const obj = {path: "/teacherManage/teacherInforManage"}; const obj = { path: "/schoolManage/teacherManage/teacherInforManage" };
this.$tab.closeOpenPage(obj); this.$tab.closeOpenPage(obj);
}, },
}, },
......
ruoyi-ui/src/views/whitePage.vue
<template> <template>
<div> <div>
<button @click="csToken">获取钉钉授权码</button> <!-- <button @click="csToken">获取钉钉授权码</button> -->
</div> </div>
</template> </template>
......
ruoyi-ui/vue.config.js
...@@ -35,7 +35,7 @@ module.exports = { ...@@ -35,7 +35,7 @@ module.exports = {
host: "", host: "",
port: 1024, port: 1024,
hot: true, hot: true,
open: true, open: "chrome",
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
...@@ -44,10 +44,10 @@ module.exports = { ...@@ -44,10 +44,10 @@ module.exports = {
//target: ` http://43.143.63.140:8848`, //target: ` http://43.143.63.140:8848`,
//target: ` http://43.143.63.140:8095`, //target: ` http://43.143.63.140:8095`,
//部署时后端地址 //部署时后端地址
target: `http://47.105.176.202:5131`, //target: `http://47.105.176.202:8137`,
//学校内网 //学校内网
// target: `http://10.20.100.201:57321`, // target: `http://10.20.100.201:57321`,
// target: `http://47.105.176.202:5112`, target: `http://47.105.176.202:5112`,
// target: `http://192.168.1.113:8848`, // target: `http://192.168.1.113:8848`,
changeOrigin: true, changeOrigin: true,
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java
...@@ -16,7 +16,9 @@ import com.ruoyi.common.annotation.Excel; ...@@ -16,7 +16,9 @@ import com.ruoyi.common.annotation.Excel;
public class SchoolOrganizationSignin extends OurBaseEntity public class SchoolOrganizationSignin extends OurBaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id */
@Excel(name = "id")
private Long id;
/** 姓名 */ /** 姓名 */
@Excel(name = "姓名") @Excel(name = "姓名")
private String name; private String name;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolgrade/SchoolGradeMapper.java
...@@ -33,4 +33,6 @@ public interface SchoolGradeMapper extends BaseMapper<SchoolGrade> { ...@@ -33,4 +33,6 @@ public interface SchoolGradeMapper extends BaseMapper<SchoolGrade> {
List<SchoolGrade> selectNowSchoolGrade(); List<SchoolGrade> selectNowSchoolGrade();
public Long selectDdClassId(String ddClssId); public Long selectDdClassId(String ddClssId);
String selectUpToYear();
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolgrade/ISchoolGradeImpl.java
...@@ -243,4 +243,9 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade ...@@ -243,4 +243,9 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade
public Long selectDdClassId(String ddId) { public Long selectDdClassId(String ddId) {
return schoolGradeMapper.selectDdClassId(ddId); return schoolGradeMapper.selectDdClassId(ddId);
} }
@Override
public String selectUpToYear() {
return schoolGradeMapper.selectUpToYear();
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolgrade/ISchoolGradeService.java
...@@ -26,5 +26,6 @@ public interface ISchoolGradeService extends IService<SchoolGrade> { ...@@ -26,5 +26,6 @@ public interface ISchoolGradeService extends IService<SchoolGrade> {
//获取最新学年 //获取最新学年
int isNewSchoolYear(); int isNewSchoolYear();
Long selectDdClassId(String ddId); Long selectDdClassId(String ddId);
String selectUpToYear();
} }
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DdLoginController.java
...@@ -6,8 +6,10 @@ import com.dingtalk.api.DefaultDingTalkClient; ...@@ -6,8 +6,10 @@ import com.dingtalk.api.DefaultDingTalkClient;
import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.DingTalkClient;
import com.dingtalk.api.request.OapiUserGetuserinfoRequest; import com.dingtalk.api.request.OapiUserGetuserinfoRequest;
import com.dingtalk.api.request.OapiV2UserGetRequest; import com.dingtalk.api.request.OapiV2UserGetRequest;
import com.dingtalk.api.request.OapiV2UserGetuserinfoRequest;
import com.dingtalk.api.response.OapiUserGetuserinfoResponse; import com.dingtalk.api.response.OapiUserGetuserinfoResponse;
import com.dingtalk.api.response.OapiV2UserGetResponse; import com.dingtalk.api.response.OapiV2UserGetResponse;
import com.dingtalk.api.response.OapiV2UserGetuserinfoResponse;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SchoolTeacher; import com.ruoyi.common.core.domain.entity.SchoolTeacher;
...@@ -55,40 +57,40 @@ public class DdLoginController { ...@@ -55,40 +57,40 @@ public class DdLoginController {
@RequestMapping(value = "/login", method = RequestMethod.GET) @RequestMapping(value = "/login", method = RequestMethod.GET)
public AjaxResult login (@RequestParam("code") String code) { public AjaxResult login (@RequestParam("code") String code) {
AjaxResult ajaxResult = new AjaxResult(); AjaxResult ajaxResult = new AjaxResult();
// // 获取access_token，注意正式代码要有异常流处理 // 获取access_token，注意正式代码要有异常流处理
// String access_token= accessTokenUtils.getToken(); String access_token= accessTokenUtils.getToken();
// // 获取用户信息 // 获取用户信息
// DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/user/getuserinfo"); DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/user/getuserinfo");
// OapiUserGetuserinfoRequest request = new OapiUserGetuserinfoRequest(); OapiUserGetuserinfoRequest request = new OapiUserGetuserinfoRequest();
// request.setCode(code); request.setCode(code);
// request.setHttpMethod("GET"); request.setHttpMethod("GET");
// OapiUserGetuserinfoResponse response; OapiUserGetuserinfoResponse response;
// try { try {
// response = client.execute(request, access_token); response = client.execute(request, access_token);
// } catch (ApiException e) { } catch (ApiException e) {
// // TODO Auto-generated catch block // TODO Auto-generated catch block
// e.printStackTrace(); e.printStackTrace();
// return null; return null;
// } }
// // 查询得到当前用户的userId // 查询得到当前用户的userId
// // 获得到userId之后应用应该处理应用自身的登录会话管理（session）,避免后续的业务交互（前端到应用服务端）每次都要重新获取用户身份，提升用户体验 // 获得到userId之后应用应该处理应用自身的登录会话管理（session）,避免后续的业务交互（前端到应用服务端）每次都要重新获取用户身份，提升用户体验
// String userId = response.getUserid(); String userId = response.getUserid();
// if (StringUtils.isEmpty(userId)){ if (StringUtils.isEmpty(userId)){
// throw new ServiceException("免登码已失效，请重新获取"); throw new ServiceException("免登码已失效，请重新获取");
// } }
// //获取用户详细信息 //获取用户详细信息
// Map<String, Object> userInfo = getUserInfo(userId, access_token); Map<String, Object> userInfo = getUserInfo(userId, access_token);
// String phone = (String) userInfo.get("phone"); String phone = (String) userInfo.get("phone");
// String unionId = (String) userInfo.get("unionId"); String unionId = (String) userInfo.get("unionId");
SchoolTeacher schoolTeacher = schoolTeacherService.selectTeacherByPhone("15888888888"); SchoolTeacher schoolTeacher = schoolTeacherService.selectTeacherByPhone(phone);
if (StringUtils.isNull(schoolTeacher)){ if (StringUtils.isNull(schoolTeacher)){
throw new ServiceException("未查询到该用户信息"); throw new ServiceException("未查询到该用户信息");
} }
Long userId = schoolTeacher.getId(); Long userId1 = schoolTeacher.getId();
SysUser sysUser = sysUserService.selectUserById(userId); SysUser sysUser = sysUserService.selectUserById(userId1);
//更新钉钉用户iid和unionId //更新钉钉用户iid和unionId
// sysUser.setUnionId(unionId); sysUser.setUnionId(unionId);
// schoolTeacherService.updateDdUserId(sysUser, userId); schoolTeacherService.updateDdUserId(sysUser, userId);
String token = loginService.loginNew(sysUser); String token = loginService.loginNew(sysUser);
ajaxResult.put(Constants.TOKEN, token); ajaxResult.put(Constants.TOKEN, token);
return ajaxResult; return ajaxResult;
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DdSchoolDeptController.java deleted 100644 → 0
package yangtz.cs.liu.dingding.controller;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/dd/school/dept")
public class DdSchoolDeptController {
@GetMapping("/getDeptList")
public TableDataInfo getDeptList(){
return null;
}
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/DingJiaXiaoController.java
...@@ -2,44 +2,35 @@ package yangtz.cs.liu.dingding.controller; ...@@ -2,44 +2,35 @@ package yangtz.cs.liu.dingding.controller;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
//import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.entity.SchoolTeacher; import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.core.domain.entity.SchoolTeacherCopy;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import org.apache.regexp.RE;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import yangtz.cs.liu.campus.controller.schoolClass.SchoolClassController;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassCopy;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassHeadmaster; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassHeadmaster;
import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor; import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeCopy;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor;
import yangtz.cs.liu.campus.domain.student.SchoolStudent; import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClassRelation; import yangtz.cs.liu.campus.domain.student.SchoolStudentClassRelation;
import yangtz.cs.liu.campus.domain.student.SchoolStudentClasses; import yangtz.cs.liu.campus.domain.student.SchoolStudentClasses;
import yangtz.cs.liu.campus.domain.student.SchoolStudentParent; import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassCopyService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassHeadmasterService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassHeadmasterService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeCopyService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentClassRelationService; import yangtz.cs.liu.campus.service.student.ISchoolStudentClassRelationService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentClassesService; import yangtz.cs.liu.campus.service.student.ISchoolStudentClassesService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService;
import yangtz.cs.liu.campus.service.student.ISchoolStudentService; import yangtz.cs.liu.campus.service.student.ISchoolStudentService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherCopyService;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherService;
import yangtz.cs.liu.campus.vo.student.SchoolStudentVO; import yangtz.cs.liu.campus.vo.student.SchoolStudentVO;
import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO; import yangtz.cs.liu.campus.vo.teacher.SchoolTeacherVO;
...@@ -48,7 +39,6 @@ import yangtz.cs.liu.dingding.vo.DingJiaXiaoVo; ...@@ -48,7 +39,6 @@ import yangtz.cs.liu.dingding.vo.DingJiaXiaoVo;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* 家校通讯录 * 家校通讯录
...@@ -68,9 +58,6 @@ public class DingJiaXiaoController { ...@@ -68,9 +58,6 @@ public class DingJiaXiaoController {
@Autowired @Autowired
ISchoolGradeService schoolGradeService; ISchoolGradeService schoolGradeService;
//年级临时表
@Autowired
ISchoolGradeCopyService iSchoolGradeCopyService;
//职工与年级关系 ---------------- //职工与年级关系 ----------------
@Autowired @Autowired
...@@ -78,9 +65,6 @@ public class DingJiaXiaoController { ...@@ -78,9 +65,6 @@ public class DingJiaXiaoController {
//学校班级 //学校班级
@Autowired @Autowired
ISchoolClassService iSchoolClassService; ISchoolClassService iSchoolClassService;
//班级表临时
@Autowired
ISchoolClassCopyService iSchoolClassCopyService;
//班主任和班级关系 ------------------ //班主任和班级关系 ------------------
@Autowired @Autowired
ISchoolClassHeadmasterService iSchoolClassHeadmasterService; ISchoolClassHeadmasterService iSchoolClassHeadmasterService;
...@@ -102,15 +86,10 @@ public class DingJiaXiaoController { ...@@ -102,15 +86,10 @@ public class DingJiaXiaoController {
//老师表 //老师表
@Autowired @Autowired
ISchoolTeacherService schoolTeacherService; ISchoolTeacherService schoolTeacherService;
//老师表 临时表
@Autowired
ISchoolTeacherCopyService schoolTeacherCopyService;
//用户表 ---------------- //用户表 ----------------
@Autowired @Autowired
ISysUserService sysUserService; ISysUserService sysUserService;
public List<String> userTypes = new ArrayList<String>(){ public List<String> userTypes = new ArrayList<String>(){
{ {
this.add("teacher"); this.add("teacher");
...@@ -284,7 +263,7 @@ public class DingJiaXiaoController { ...@@ -284,7 +263,7 @@ public class DingJiaXiaoController {
@GetMapping("/updateLabUser") @GetMapping("/updateLabUser")
private String updateLabUser(){ private String updateLabUser(){
//查找当前学年 所有的班级 //查找当前学年 所有的班级
String nowSchoolYear = iSchoolGradeCopyService.selectUpToYear(); String nowSchoolYear = schoolGradeService.selectUpToYear();
SchoolClass schoolClass = new SchoolClass(); SchoolClass schoolClass = new SchoolClass();
schoolClass.setSchoolYear(Integer.valueOf(nowSchoolYear)); schoolClass.setSchoolYear(Integer.valueOf(nowSchoolYear));
List<SchoolClass> schoolClassCopies = iSchoolClassService.selectSchoolClassList(schoolClass); List<SchoolClass> schoolClassCopies = iSchoolClassService.selectSchoolClassList(schoolClass);
...@@ -356,7 +335,7 @@ public class DingJiaXiaoController { ...@@ -356,7 +335,7 @@ public class DingJiaXiaoController {
schoolStudentClassRelation.setClassId(date.getId()); schoolStudentClassRelation.setClassId(date.getId());
iSchoolStudentClassRelationService.save(schoolStudentClassRelation); iSchoolStudentClassRelationService.save(schoolStudentClassRelation);
//学生与班级历史关系 //学生与班级历史关系
SchoolClassCopy school= iSchoolClassCopyService.selectSchoolClassById(date.getId()); SchoolClass school= iSchoolClassService.selectSchoolClassById(date.getId());
SchoolStudentClasses schoolStudentClasses = new SchoolStudentClasses(); SchoolStudentClasses schoolStudentClasses = new SchoolStudentClasses();
schoolStudentClasses.setStudentId(schoolStudent.getId()); schoolStudentClasses.setStudentId(schoolStudent.getId());
schoolStudentClasses.setGrade(school.getGradeName()); schoolStudentClasses.setGrade(school.getGradeName());
......
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/dingDept/DdDeptController.java 0 → 100644
package yangtz.cs.liu.dingding.controller.dingDept;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import yangtz.cs.liu.dingding.service.impl.dingDept.DdDeptServcieImpl;
@RestController
@RequestMapping("/dd/school/dept")
public class DdDeptController extends BaseController {
@Autowired
private DdDeptServcieImpl ddDeptServcie;
/**
* 获取钉钉全部部门列表
*/
@GetMapping("/getDeptList")
public TableDataInfo getDeptList(){
return getDataTable(ddDeptServcie.getDeptList());
}
/**
* 下拉钉钉部门列表到系统
*/
@PostMapping("/addDdDept")
public AjaxResult addDdDept(){
return toAjax(ddDeptServcie.addDdDept());
}
/**
* 同步钉钉部门列表
*/
@GetMapping("/syncDdDept")
public AjaxResult syncDdDept(){
return AjaxResult.success(ddDeptServcie.syncDdDept());
}
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/dingEvent/DingEventController.java
...@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON; ...@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.dingding.config.Constant; import yangtz.cs.liu.dingding.config.Constant;
import yangtz.cs.liu.dingding.utils.AccessTokenUtils; import yangtz.cs.liu.dingding.service.impl.dingDept.DdDeptServcieImpl;
import yangtz.cs.liu.dingding.service.impl.dingUser.DdUserServiceImpl;
import yangtz.cs.liu.dingding.utils.DingCallbackCrypto; import yangtz.cs.liu.dingding.utils.DingCallbackCrypto;
import java.util.Map; import java.util.Map;
...@@ -20,6 +22,11 @@ public class DingEventController { ...@@ -20,6 +22,11 @@ public class DingEventController {
private static Logger log = LoggerFactory.getLogger(DingEventController.class); private static Logger log = LoggerFactory.getLogger(DingEventController.class);
@Autowired
private DdDeptServcieImpl ddDeptServcie;
@Autowired
private DdUserServiceImpl ddUserService;
@PostMapping("/callBack") @PostMapping("/callBack")
public Map<String, String> callBack( public Map<String, String> callBack(
@RequestParam(value = "msg_signature", required = false) String msg_signature, @RequestParam(value = "msg_signature", required = false) String msg_signature,
...@@ -47,12 +54,26 @@ public class DingEventController { ...@@ -47,12 +54,26 @@ public class DingEventController {
// 测试回调url的正确性 // 测试回调url的正确性
log.info("测试回调url的正确性"); log.info("测试回调url的正确性");
} else if ("user_add_org".equals(eventType)) { } else if ("user_add_org".equals(eventType)) {
// 处理通讯录用户增加事件 // 处理通讯录用户增加
log.info("发生了：" + eventType + "事件"); ddUserService.addUser(eventJson);
} else if ("user_modify_org".equals(eventType)) {
// 处理通讯录用户修改
ddUserService.updateUser(eventJson);
} else if ("user_leave_org".equals(eventType)) {
// 处理通讯录用户离职
ddUserService.leaveUser(eventJson);
} else if ("org_dept_create".equals(eventType)){
// 处理通讯录企业部门创建
ddDeptServcie.ddDeptCreate(eventJson);
} else if ("org_dept_modify".equals(eventType)){
// 处理通讯录企业部门修改
ddDeptServcie.ddDeptUpdate(eventJson);
} else if ("org_dept_remove".equals(eventType)){
// 处理通讯录企业部门删除
ddDeptServcie.ddDeptDelete(eventJson);
} else if ("bpms_instance_change".equals(eventType)){ } else if ("bpms_instance_change".equals(eventType)){
// 处理审批实例事件 // 处理审批实例事件
processInstance(eventJson); log.info("发生了：" + eventType + "事件");
} else if ("bpms_task_change".equals(eventType)){ } else if ("bpms_task_change".equals(eventType)){
// 处理审批任务事件 // 处理审批任务事件
eventJson.get(""); eventJson.get("");
...@@ -70,16 +91,4 @@ public class DingEventController { ...@@ -70,16 +91,4 @@ public class DingEventController {
} }
return null; return null;
} }
/**
* 处理审批实例事件
*/
public void processInstance(JSONObject eventJson){
//获取审批类型
String type = eventJson.getString("type");
//判断审批实例是否正常结束
if ("finish".equals(type)){
}
}
} }
smart-campus/src/main/java/yangtz/cs/liu/dingding/controller/dingUser/DingUserController.java
...@@ -4,10 +4,8 @@ import com.ruoyi.common.core.controller.BaseController; ...@@ -4,10 +4,8 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping; import yangtz.cs.liu.dingding.service.impl.dingUser.DdUserServiceImpl;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import yangtz.cs.liu.dingding.utils.DingUserUtils; import yangtz.cs.liu.dingding.utils.DingUserUtils;
/** /**
...@@ -18,42 +16,38 @@ import yangtz.cs.liu.dingding.utils.DingUserUtils; ...@@ -18,42 +16,38 @@ import yangtz.cs.liu.dingding.utils.DingUserUtils;
public class DingUserController extends BaseController { public class DingUserController extends BaseController {
@Autowired @Autowired
private DingUserUtils dingUserUtils; private DdUserServiceImpl ddUserService;
/** /**
* 获取部门用户基础信息 * 获取钉钉所有用户id
*/ */
@GetMapping("/getUserByDeptId") @GetMapping("/getDdUserListAll")
public TableDataInfo getUserByDeptId(@RequestParam("deptId") Long deptId, public TableDataInfo getDdUserListAll(){
@RequestParam("cursor") Long cursor, return getDataTable(ddUserService.getDdUserListAll());
@RequestParam("size") Long size,
@RequestParam("orderField") String orderField,
@RequestParam("containAccessLimit") String containAccessLimit,
@RequestParam("language") String language)
{
return getDataTable(dingUserUtils.getUserByDeptId(deptId, cursor, size, orderField, containAccessLimit, language));
} }
/** /**
* 获取部门用户完整信息 * 下拉钉钉用户到系统
*/ */
@GetMapping("/getUserInfoByDeptId") @PostMapping("/addDdUser")
public TableDataInfo getUserInfoByDeptId(@RequestParam("deptId") Long deptId, public AjaxResult addDdUser(){
@RequestParam("cursor") Long cursor, return toAjax(ddUserService.addDdUser());
@RequestParam("size") Long size,
@RequestParam("orderField") String orderField,
@RequestParam("containAccessLimit") String containAccessLimit,
@RequestParam("language") String language)
{
return getDataTable(dingUserUtils.getUserInfoByDeptId(deptId, cursor, size, orderField, containAccessLimit, language));
} }
/** /**
* 获取用户详情 * 用户表数据同步到教师表
* @return
*/ */
@GetMapping("/getUser") @PostMapping("/addDdTeacher")
public AjaxResult getUser(@RequestParam("userId") String userId){ public AjaxResult addDdTeacher(){
return AjaxResult.success(dingUserUtils.getUser(userId)); return toAjax(ddUserService.addDdTeacher());
} }
/**
* 同步钉钉用户列表
*/
@GetMapping("/syncDdUser")
public AjaxResult syncDdUser(){
return AjaxResult.success(ddUserService.syncDdUser());
}
} }
smart-campus/src/main/java/yangtz/cs/liu/dingding/domain/dingDept/SysDdDept.java 0 → 100644
package yangtz.cs.liu.dingding.domain.dingDept;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.ArrayList;
import java.util.List;
public class SysDdDept extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 部门ID */
private Long deptId;
/** 父部门ID */
private Long parentId;
/** 祖级列表 */
private String ancestors;
/** 部门名称 */
private String deptName;
/** 显示顺序 */
private Long orderNum;
/** 负责人 */
private String leader;
/** 联系电话 */
private String phone;
/** 邮箱 */
private String email;
/** 部门状态:0正常,1停用 */
private String status;
/** 钉钉部门id */
private Long ddDeptId;
/** 钉钉父部门id */
private Long ddParentId;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/** 父部门名称 */
private String parentName;
/** 子部门 */
private List<SysDdDept> children = new ArrayList<SysDdDept>();
public Long getDdDeptId() {
return ddDeptId;
}
public void setDdDeptId(Long ddDeptId) {
this.ddDeptId = ddDeptId;
}
public Long getDdParentId() {
return ddParentId;
}
public void setDdParentId(Long ddParentId) {
this.ddParentId = ddParentId;
}
public Long getDeptId()
{
return deptId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getParentId()
{
return parentId;
}
public void setParentId(Long parentId)
{
this.parentId = parentId;
}
public String getAncestors()
{
return ancestors;
}
public void setAncestors(String ancestors)
{
this.ancestors = ancestors;
}
@NotBlank(message = "部门名称不能为空")
@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
public String getDeptName()
{
return deptName;
}
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
@NotNull(message = "显示顺序不能为空")
public Long getOrderNum() {
return orderNum;
}
public void setOrderNum(Long orderNum) {
this.orderNum = orderNum;
}
public String getLeader()
{
return leader;
}
public void setLeader(String leader)
{
this.leader = leader;
}
@Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
public String getPhone()
{
return phone;
}
public void setPhone(String phone)
{
this.phone = phone;
}
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
public String getEmail()
{
return email;
}
public void setEmail(String email)
{
this.email = email;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
public String getDelFlag()
{
return delFlag;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getParentName()
{
return parentName;
}
public void setParentName(String parentName)
{
this.parentName = parentName;
}
public List<SysDdDept> getChildren() {
return children;
}
public void setChildren(List<SysDdDept> children) {
this.children = children;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("deptId", getDeptId())
.append("parentId", getParentId())
.append("ancestors", getAncestors())
.append("deptName", getDeptName())
.append("orderNum", getOrderNum())
.append("leader", getLeader())
.append("phone", getPhone())
.append("email", getEmail())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/domain/dingGrade/SchoolGradeMentorCopy.java 0 → 100644
package yangtz.cs.liu.dingding.domain.dingGrade;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
public class SchoolGradeMentorCopy extends OurBaseEntity {
/** 老师主键 */
@NotNull(message = "级部教师不能为空")
private Long teacherId;
/** 年级级部主键 */
private Long gradeId;
/** 教师任职开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 教师任职结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
/** 类型（1年级部，2学科组长） */
private String type;
/** 职务 */
private String teacherPost;
/** 学科组(1物理学科组，2化学学科组，3生物学科组) */
private String subGroup;
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/domain/dingUser/SysDdUserDept.java 0 → 100644
package yangtz.cs.liu.dingding.domain.dingUser;
import lombok.Data;
@Data
public class SysDdUserDept {
private Long userId;
private Long deptId;
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/domain/schoolTeacher/SysDdTeacher.java 0 → 100644
package yangtz.cs.liu.dingding.domain.schoolTeacher;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Date;
@Data
public class SysDdTeacher extends BaseEntity
{
private static final long serialVersionUID = 1L;
private Long id;
/**
* 照片路径
*/
@Excel(name = "照片", cellType = Excel.ColumnType.IMAGE, height = 55, type = Excel.Type.EXPORT)
private String picUrl;
/**
* 老师名称
*/
@Excel(name = "老师名称")
@NotBlank(message = "老师名字不能为空")
private String teacherName;
/**
* 性别
*/
@Excel(name = "性别", readConverterExp = "0=男,1=女")
@NotBlank(message = "性别不能为空")
private String sex;
/**
* 民族
*/
@Excel(name = "民族")
private String nation;
/**
* 工作编号
*/
@Excel(name = "工作编号")
private String teacherCode;
/*
* 系统表 用户id
* */
@TableField(exist = false)
private Long userId;
/**
* 生日
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "生日", width = 25, dateFormat = "yyyy-MM-dd")
private Date birthday;
/**
* 学历
*/
@Excel(name = "学历", readConverterExp = "0=高中,1=专科,2=本科,3=研究生,4=硕士,5=博士",combo = {"高中","专科","本科","研究生","硕士","博士"})
private String education;
/**
* 老师电话
*/
@Excel(name = "老师电话")
@NotBlank(message = "老师电话不能为空")
private String teacherTel;
/**
* 身份证号
*/
@Excel(name = "身份证号", width = 30)
@NotBlank(message = "身份证号不能为空")
private String idCard;
/**
* 家庭住址
*/
@Excel(name = "家庭住址", width = 35)
private String homeAddress;
/*
* 微信openid
* */
private String openId;
/*
* 钉钉用户unionId
* */
private String unionId;
/*
* 钉钉用户id
* */
private String ddUserId;
//设备工号
private String deviceNum;
/**部门id**/
@TableField(exist = false)
private Long deptId;
/**部门名称**/
@TableField(exist = false)
private String deptName;
/** 密码 */
@TableField(exist = false)
private String password;
/** 帐号状态（0正常 1停用） */
//@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
@TableField(exist = false)
private String status;
/**签名路径*/
@TableField(exist = false)
private String sign;
/**头像**/
@TableField(exist = false)
private String avatar;
/*职工类型**/
@TableField(exist = false)
private String employeeType;
@TableField(exist = false)
private String email;
/** 父部门ID */
@TableField(exist = false)
private Long parentId;
/** 父部门名称 */
@TableField(exist = false)
private String parentName;
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/mapper/dingDept/DdDeptMapper.java 0 → 100644
package yangtz.cs.liu.dingding.mapper.dingDept;
import yangtz.cs.liu.dingding.domain.dingDept.SysDdDept;
import java.util.List;
import java.util.Map;
public interface DdDeptMapper {
/**
* 查询系统部门列表
* @param sysDdDept
* @return
*/
List<SysDdDept> selectDdDeptList(SysDdDept sysDdDept);
/**
* 根据钉钉部门id查询系统部门信息
*/
SysDdDept selectDeptByDdDeptId(Long ddDeptId);
/**
* 根据部门id查询系统部门信息
*/
SysDdDept selectDeptByDeptId(Long deptId);
/**
* 查询级部信息
*/
List<Map<String,Object>> selectGradeList();
/**
* 新增钉钉部门
* @return
*/
int insertDdDept(SysDdDept sysDdDept);
/**
* 更新钉钉部门
* @param sysDdDept
* @return
*/
int updateDdDeptByDdDeptId(SysDdDept sysDdDept);
/**
* 删除部门
* @param deptId
* @return
*/
int deleteDdDeptById(Long deptId);
/**
* 根据钉钉部门id删除部门
* @param ddDeptId
* @return
*/
int deleteDdDeptByDdDeptId(Long ddDeptId);
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/mapper/dingUser/DdUserMapper.java 0 → 100644
package yangtz.cs.liu.dingding.mapper.dingUser;
import org.apache.ibatis.annotations.Param;
import yangtz.cs.liu.dingding.domain.dingGrade.SchoolGradeMentorCopy;
import yangtz.cs.liu.dingding.domain.dingUser.SysDdUser;
import yangtz.cs.liu.dingding.domain.dingUser.SysDdUserDept;
import java.util.List;
public interface DdUserMapper {
/**
* 批量新增钉钉用户
*/
int batchInsertDdUser(@Param("list") List<SysDdUser> list);
/**
* 新增用户
*/
int insertDdUser(SysDdUser sysDdUser);
/**
* 更新用户
*/
int updateDdUser(SysDdUser sysDdUser);
/**
* 查询全部用户
*/
List<SysDdUser> selectDdUserList(SysDdUser sysDdUser);
/**
* 新增用户部门关系
*/
int insertDdUserDept(SysDdUserDept sysDdUserDept);
/**
* 删除用户
*/
int deleteDdUser(Long userId);
/**
* 删除用户和部门关系
*/
int deleteDdUserDept(Long userId);
/**
* 删除教师
*/
int deleteDdTeacher(Long userId);
/**
* 根据用户id查询用户部门id列表
*/
List<Long> selectDeptIdByUserId(Long userId);
/**
* 根据钉钉用户id查询用户信息
* @param ddUserId
* @return
*/
SysDdUser selectDdUserByDdUserId(String ddUserId);
/**
* 新增级部成员
* @param schoolGradeMentorCopy
* @return
*/
int insertGradeMentor(SchoolGradeMentorCopy schoolGradeMentorCopy);
/**
* 删除级部成员
* @param userId
* @return
*/
int deleteGradeMentor(Long userId);
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/mapper/schoolTeacher/DdTeacherMapper.java 0 → 100644
package yangtz.cs.liu.dingding.mapper.schoolTeacher;
import org.apache.ibatis.annotations.Param;
import yangtz.cs.liu.dingding.domain.schoolTeacher.SysDdTeacher;
import java.util.List;
public interface DdTeacherMapper {
/**
* 批量新增教师
*/
int batchInsertTeacher(@Param("list") List<SysDdTeacher> list);
/**
* 新增教师
*/
int addTeacherList(SysDdTeacher sysDdTeacher);
/**
* 更新教师信息
*/
int updateDdTeacher(SysDdTeacher sysDdTeacher);
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/service/dingDept/IDdDeptService.java 0 → 100644
package yangtz.cs.liu.dingding.service.dingDept;
import com.alibaba.fastjson.JSONObject;
import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
import java.util.List;
public interface IDdDeptService {
/**
* 获取钉钉全部部门列表
* @return
*/
List<OapiV2DepartmentListsubResponse.DeptBaseResponse> getDeptList();
/**
* 下拉钉钉部门列表到系统
* @return
*/
int addDdDept();
/**
* 同步钉钉部门列表
* @return
*/
String syncDdDept();
/**
* 钉钉部门创建
*/
int ddDeptCreate(JSONObject eventJson);
/**
* 钉钉部门修改
*/
int ddDeptUpdate(JSONObject eventJson);
/**
* 钉钉部门删除
*/
int ddDeptDelete(JSONObject eventJson);
}
smart-campus/src/main/java/yangtz/cs/liu/dingding/service/dingUser/IDdUserService.java 0 → 100644
package yangtz.cs.liu.dingding.service.dingUser;
import com.alibaba.fastjson.JSONObject;
import java.util.List;
public interface IDdUserService {
/**
* 获取钉钉全部用户id
*/
List<String> getDdUserListAll();
/**
* 下拉钉钉用户到系统
*/
int addDdUser();
/**
* 用户表数据同步到教师表
* @return
*/
int addDdTeacher();
/**
* 同步钉钉用户
*/
String syncDdUser();
/**
* 处理通讯录用户增加
*/
int addUser(JSONObject eventJson);
/**
* 处理通讯录用户修改
*/
int updateUser(JSONObject eventJson);
/**
* 处理通讯录用户离职
*/
int leaveUser(JSONObject eventJson);
}
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java
...@@ -195,6 +195,14 @@ public class WxSchoolOrganizationController extends BaseController { ...@@ -195,6 +195,14 @@ public class WxSchoolOrganizationController extends BaseController {
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SchoolOrganizationSignin schoolOrganizationSignin) public AjaxResult add(@RequestBody SchoolOrganizationSignin schoolOrganizationSignin)
{ {
//判断cid和userid是否存在 如果存在则先删除 再添加
LambdaQueryWrapper<SchoolOrganizationSignin> wrapper = Wrappers.lambdaQuery();
wrapper.eq(SchoolOrganizationSignin::getCid,schoolOrganizationSignin.getCid());
wrapper.eq(SchoolOrganizationSignin::getUserId,schoolOrganizationSignin.getUserId());
SchoolOrganizationSignin one = schoolOrganizationSigninService.getOne(wrapper);
if (one!=null){
schoolOrganizationSigninService.removeById(one.getId());
}
schoolOrganizationSignin.setStatus("1"); //适配重新报名的情况 schoolOrganizationSignin.setStatus("1"); //适配重新报名的情况
return toAjax(schoolOrganizationSigninService.save(schoolOrganizationSignin)); return toAjax(schoolOrganizationSigninService.save(schoolOrganizationSignin));
} }
......
smart-campus/src/main/resources/mapper/ddDept/DdDeptMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.dingding.mapper.dingDept.DdDeptMapper">
<resultMap type="SysDdDept" id="SysDdDeptResult">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
<result property="deptName" column="dept_name" />
<result property="orderNum" column="order_num" />
<result property="leader" column="leader" />
<result property="phone" column="phone" />
<result property="email" column="email" />
<result property="status" column="status" />
<result property="ddDeptId" column="dd_dept_id" />
<result property="ddParentId" column="dd_parent_id" />
<result property="delFlag" column="del_flag" />
<result property="parentName" column="parent_name" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectDdDeptVo">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time
from sys_dd_dept d
</sql>
<select id="selectDdDeptList" parameterType="SysDdDept" resultMap="SysDdDeptResult">
<include refid="selectDdDeptVo"/>
where d.del_flag = '0'
<if test="deptId != null and deptId != 0">
AND dept_id = #{deptId}
</if>
<if test="parentId != null and parentId != 0">
AND parent_id = #{parentId}
</if>
<if test="deptName != null and deptName != ''">
AND dept_name like concat('%', #{deptName}, '%')
</if>
<if test="status != null and status != ''">
AND status = #{status}
</if>
order by d.parent_id, d.order_num
</select>
<select id="selectDeptByDdDeptId" parameterType="Long" resultMap="SysDdDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time
from sys_dd_dept d
where d.dd_dept_id = #{ddDeptId}
</select>
<select id="selectDeptByDeptId" parameterType="Long" resultMap="SysDdDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.dd_dept_id, d.dd_parent_id, d.del_flag, d.create_by, d.create_time
from sys_dd_dept d
where d.dept_id = #{deptId}
</select>
<select id="selectGradeList" resultType="Map">
select id as gradeId, grade_year as gradeYear from school_grade_copy where del_flag = "0" order by grade_value ASC
</select>
<insert id="insertDdDept" parameterType="SysDdDept" useGeneratedKeys="true" keyProperty="deptId">
insert into sys_dd_dept(
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="parentId != null ">parent_id,</if>
<if test="deptName != null and deptName != ''">dept_name,</if>
<if test="ancestors != null and ancestors != ''">ancestors,</if>
<if test="orderNum != null">order_num,</if>
<if test="leader != null and leader != ''">leader,</if>
<if test="phone != null and phone != ''">phone,</if>
<if test="email != null and email != ''">email,</if>
<if test="status != null">status,</if>
<if test="ddDeptId != null">dd_dept_id,</if>
<if test="ddParentId != null">dd_parent_id,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
<if test="deptId != null and deptId != 0">#{deptId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if>
<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
<if test="orderNum != null">#{orderNum},</if>
<if test="leader != null and leader != ''">#{leader},</if>
<if test="phone != null and phone != ''">#{phone},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="status != null">#{status},</if>
<if test="ddDeptId != null">#{ddDeptId},</if>
<if test="ddParentId != null">#{ddParentId},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
</insert>
<update id="updateDdDept" parameterType="SysDdDept">
update sys_dd_dept
<set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="leader != null">leader = #{leader},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="email != null">email = #{email},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="ddDeptId != null ">dd_dept_id = #{ddDeptId},</if>
<if test="ddParentId != null">dd_parent_id = #{ddParentId},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
where dept_id = #{deptId}
</update>
<update id="updateDdDeptByDdDeptId" parameterType="SysDdDept">
update sys_dd_dept
<set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="leader != null">leader = #{leader},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="email != null">email = #{email},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="ddParentId != null">dd_parent_id = #{ddParentId},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
where dd_dept_id = #{ddDeptId}
</update>
<delete id="deleteDdDeptById" parameterType="Long">
update sys_dd_dept set del_flag = '2' where dept_id = #{deptId} and dept_id != 100
</delete>
<delete id="deleteDdDeptByDdDeptId" parameterType="Long">
update sys_dd_dept set del_flag = '2' where dd_dept_id = #{ddDeptId}
</delete>
</mapper>
smart-campus/src/main/resources/mapper/ddTeacher/DdTeacherMapper.xml 0 → 100644
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="yangtz.cs.liu.dingding.mapper.schoolTeacher.DdTeacherMapper">
<resultMap type="SysDdTeacher" id="SysDdTeacherResult">
<result property="id" column="id"/>
<result property="teacherName" column="teacher_name"/>
<result property="teacherTel" column="teacher_tel"/>
<result property="teacherCode" column="teacher_code"/>
<result property="idCard" column="id_card"/>
<result property="deviceNum" column="device_num"/>
<result property="homeAddress" column="home_address"/>
<result property="nation" column="nation"/>
<result property="picUrl" column="pic_url"/>
<result property="birthday" column="birthday"/>
<result property="education" column="education"/>
<result property="sex" column="sex"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="openId" column="open_id"/>
<result property="ddUserId" column="dd_user_id"/>
<result property="unionId" column="union_id"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
<insert id="addTeacherList" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id">
insert into sys_dd_teacher
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="teacherName != null">teacher_name,</if>
<if test="teacherTel != null">teacher_tel,</if>
<if test="teacherCode != null">teacher_code,</if>
<if test="idCard != null">id_card,</if>
<if test="homeAddress != null">home_address,</if>
<if test="nation != null">nation,</if>
<if test="picUrl != null">pic_url,</if>
<if test="birthday != null">birthday,</if>
<if test="education != null">education,</if>
<if test="sex != null">sex,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="openId != null">open_id,</if>
<if test="ddUserId != null">dd_user_id,</if>
<if test="unionId != null">union_id,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="deviceNum != null">device_num,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="teacherName != null">#{teacherName},</if>
<if test="teacherTel != null">#{teacherTel},</if>
<if test="teacherCode != null">#{teacherCode},</if>
<if test="idCard != null">#{idCard},</if>
<if test="homeAddress != null">#{homeAddress},</if>
<if test="nation != null">#{nation},</if>
<if test="picUrl != null">#{picUrl},</if>
<if test="birthday != null">#{birthday},</if>
<if test="education != null">#{education},</if>
<if test="sex != null">#{sex},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="openId != null">#{openId},</if>
<if test="ddUserId != null">#{ddUserId},</if>
<if test="unionId != null">#{unionId},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="deviceNum != null">#{deviceNum},</if>
</trim>
</insert>
<update id="updateDdTeacher" parameterType="SysDdTeacher">
update sys_dd_teacher
<trim prefix="SET" suffixOverrides=",">
<if test="teacherName != null">teacher_name = #{teacherName},</if>
<if test="teacherTel != null">teacher_tel = #{teacherTel},</if>
<if test="teacherCode != null">teacher_code = #{teacherCode},</if>
<if test="idCard != null">id_card = #{idCard},</if>
<if test="homeAddress != null">home_address = #{homeAddress},</if>
<if test="nation != null">nation = #{nation},</if>
<if test="picUrl != null">pic_url = #{picUrl},</if>
<if test="birthday != null">birthday = #{birthday},</if>
<if test="education != null">education = #{education},</if>
<if test="sex != null">sex = #{sex},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="openId != null">open_id = #{openId}</if>
<if test="ddUserId != null">dd_user_id = #{ddUserId}</if>
<if test="unionId != null">union_id = #{unionId}</if>
</trim>
where id = #{id}
</update>
<!--批量新增教师-->
<insert id="batchInsertTeacher" parameterType="SysDdTeacher" useGeneratedKeys="true" keyProperty="id">
<foreach collection="list" item="data" separator=";">
insert into sys_dd_teacher
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="data.id != null">id,</if>
<if test="data.teacherName != null">teacher_name,</if>
<if test="data.teacherTel != null">teacher_tel,</if>
<if test="data.teacherCode != null">teacher_code,</if>
<if test="data.idCard != null">id_card,</if>
<if test="data.homeAddress != null">home_address,</if>
<if test="data.nation != null">nation,</if>
<if test="data.picUrl != null">pic_url,</if>
<if test="data.birthday != null">birthday,</if>
<if test="data.education != null">education,</if>
<if test="data.sex != null">sex,</if>
<if test="data.createBy != null">create_by,</if>
<if test="data.createTime != null">create_time,</if>
<if test="data.updateBy != null">update_by,</if>
<if test="data.updateTime != null">update_time,</if>
<if test="data.openId != null">open_id,</if>
<if test="data.ddUserId != null">dd_user_id,</if>
<if test="data.unionId != null">union_id,</if>
<if test="data.delFlag != null and data.delFlag != ''">del_flag,</if>
<if test="data.deviceNum != null">device_num,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="data.id != null">#{data.id},</if>
<if test="data.teacherName != null">#{data.teacherName},</if>
<if test="data.teacherTel != null">#{data.teacherTel},</if>
<if test="data.teacherCode != null">#{data.teacherCode},</if>
<if test="data.idCard != null">#{data.idCard},</if>
<if test="data.homeAddress != null">#{data.homeAddress},</if>
<if test="data.nation != null">#{data.nation},</if>
<if test="data.picUrl != null">#{data.picUrl},</if>
<if test="data.birthday != null">#{data.birthday},</if>
<if test="data.education != null">#{data.education},</if>
<if test="data.sex != null">#{data.sex},</if>
<if test="data.createBy != null">#{data.createBy},</if>
<if test="data.createTime != null">#{data.createTime},</if>
<if test="data.updateBy != null">#{data.updateBy},</if>
<if test="data.updateTime != null">#{data.updateTime},</if>
<if test="data.openId != null">#{data.openId},</if>
<if test="data.ddUserId != null">#{data.ddUserId},</if>
<if test="data.unionId != null">#{data.unionId},</if>
<if test="data.delFlag != null and data.delFlag != ''">#{data.delFlag},</if>
<if test="data.deviceNum != null">#{data.deviceNum},</if>
</trim>
</foreach>
</insert>
</mapper>
smart-campus/src/main/resources/mapper/schoolgrade/SchoolGradeMapper.xml
...@@ -58,4 +58,8 @@ ...@@ -58,4 +58,8 @@
select sg.id from school_grade_copy sg select sg.id from school_grade_copy sg
where sg.del_flag = '0' and sg.dd_class_id=#{ddClssId} where sg.del_flag = '0' and sg.dd_class_id=#{ddClssId}
</select> </select>
<select id="selectUpToYear" resultType="java.lang.String">
select max(school_year) nowYear from school_grade_copy where del_flag = '0'
</select>
</mapper> </mapper>
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