Skip to content

D
dd_school
Commit 8ec89e70 by WYM
Options

教师电子档案-工作量信息:增、改、查、导入、导出修改 

(1)"周课时量"改名"周课时总量"
(2)增加：早读、正课、晚自习、周末课时、是否满工作量
parent b779ba64
Showing with 208 additions and 71 deletions
ruoyi-admin/src/test/java/com/ruoyi/test/RuoyiTest.java
package com.ruoyi.test;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import java.io.IOException;
public class RuoyiTest {
public static void main(String[] args) {
String password = "1111@aaaa";
String encode = new BCryptPasswordEncoder().encode(password);
System.out.println(encode);
}
}
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/awardEntry/index.vue
......@@ -39,8 +39,11 @@
<el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="嘉奖类别" prop="awardType">
<el-input v-model="queryParams.awardType" placeholder="请输入嘉奖级别" clearable
@keyup.enter.native="handleQuery" />
<el-select v-model="queryParams.awardType" clearable placeholder="请选择">
<el-option v-for="dict in dict.type.student_award_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="嘉奖级别" prop="awardRank">
<el-select v-model="queryParams.awardRank" clearable placeholder="请选择">
......@@ -106,14 +109,26 @@
<el-table-column label="班级" align="center" prop="className" width="60px" />
<el-table-column label="班级类型" align="center" prop="classType" width="80px" />
<el-table-column label="姓名" align="center" prop="name" width="80px" show-overflow-tooltip />
<el-table-column label="身份证号" align="center" prop="idCard" width="180px" show-overflow-tooltip />
<el-table-column label="性别" align="center" prop="sex" width="60px">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
<el-table-column label="班主任" align="center" prop="classTeacher" width="80px" show-overflow-tooltip />
<el-table-column label="级部主任" align="center" prop="departmentDirector" width="80px" show-overflow-tooltip />
<el-table-column label="嘉奖类别" align="center" prop="awardType" width="120px">
<template slot-scope="scope">
<dict-tag :options="dict.type.student_award_type" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="嘉奖级别" align="center" prop="awardRank" width="80px">
<template slot-scope="scope">
<dict-tag :options="dict.type.student_award_rank" :value="scope.row.awardRank" />
</template>
</el-table-column>
<el-table-column label="嘉奖类别" align="center" prop="awardType" width="80px" show-overflow-tooltip />
<el-table-column label="嘉奖时间" align="center" prop="awardTime" width="160">
<el-table-column label="嘉奖名称" align="center" prop="awardName" width="150px" show-overflow-tooltip />
<el-table-column label="嘉奖时间" align="center" prop="awardTime" width="160px">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -211,29 +226,44 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号" />
<el-form-item label="性别" prop="sex">
<el-select v-model="form.sex" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班主任" prop="classTeacher">
<el-input v-model="form.classTeacher" placeholder="请输入班主任" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="级部主任" prop="departmentDirector">
<el-input v-model="form.departmentDirector" placeholder="请输入级部主任" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="嘉奖类别" prop="awardType">
<el-input v-model="form.awardType" placeholder="请输入嘉奖类别" />
<el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.student_award_type" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="嘉奖级别" prop="awardRank">
<el-select v-model="form.awardRank" clearable placeholder="请选择" style="width: 100%;">
......@@ -243,6 +273,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="嘉奖名称" prop="awardName">
<el-input v-model="form.awardName" placeholder="请输入嘉奖名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
......@@ -305,7 +340,7 @@ import { checkIdcard } from '@/utils/utilLibrary/validate'
import { listStudentAward, listStudentAwardgr, getStudentAward, delStudentAward, addStudentAward, addStudentAwardgr, updateStudentAward, reviewStudentAward } from "@/api/smartSchool/classAdviser/studentCommendation";
export default {
name: "StudentAward",
dicts: ['semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type_wj', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'student_award_rank'],
dicts: ['semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type_wj', 'yearda', 'rankda','sys_user_sex', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'student_award_rank', 'student_award_type'],
data() {
return {
title: "",
......@@ -498,6 +533,7 @@ export default {
awardType: null,
awardRank: null,
awardTime: null,
awardName: null,
remark: null,
auditState: null,
createById: null,
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentCommendation/commendationView/index.vue
......@@ -39,8 +39,11 @@
<el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="嘉奖类别" prop="awardType">
<el-input v-model="queryParams.awardType" placeholder="请输入嘉奖级别" clearable
@keyup.enter.native="handleQuery" />
<el-select v-model="queryParams.awardType" clearable placeholder="请选择">
<el-option v-for="dict in dict.type.student_award_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="嘉奖级别" prop="awardRank">
<el-select v-model="queryParams.awardRank" clearable placeholder="请选择">
......@@ -88,14 +91,26 @@
<el-table-column label="班级" align="center" prop="className" width="60px" />
<el-table-column label="班级类型" align="center" prop="classType" width="80px" />
<el-table-column label="姓名" align="center" prop="name" width="80px" show-overflow-tooltip />
<el-table-column label="身份证号" align="center" prop="idCard" width="180px" show-overflow-tooltip />
<el-table-column label="性别" align="center" prop="sex" width="60px">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
<el-table-column label="班主任" align="center" prop="classTeacher" width="80px" show-overflow-tooltip />
<el-table-column label="级部主任" align="center" prop="departmentDirector" width="80px" show-overflow-tooltip />
<el-table-column label="嘉奖类别" align="center" prop="awardType" width="120px">
<template slot-scope="scope">
<dict-tag :options="dict.type.student_award_type" :value="scope.row.awardType" />
</template>
</el-table-column>
<el-table-column label="嘉奖级别" align="center" prop="awardRank" width="80px">
<template slot-scope="scope">
<dict-tag :options="dict.type.student_award_rank" :value="scope.row.awardRank" />
</template>
</el-table-column>
<el-table-column label="嘉奖类别" align="center" prop="awardType" width="80px" show-overflow-tooltip />
<el-table-column label="嘉奖时间" align="center" prop="awardTime" width="160">
<el-table-column label="嘉奖名称" align="center" prop="awardName" width="150px" show-overflow-tooltip />
<el-table-column label="嘉奖时间" align="center" prop="awardTime" width="160px">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template>
......@@ -185,29 +200,44 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号" />
<el-form-item label="性别" prop="sex">
<el-select v-model="form.sex" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班主任" prop="classTeacher">
<el-input v-model="form.classTeacher" placeholder="请输入班主任" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="级部主任" prop="departmentDirector">
<el-input v-model="form.departmentDirector" placeholder="请输入级部主任" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="嘉奖类别" prop="awardType">
<el-input v-model="form.awardType" placeholder="请输入嘉奖类别" />
<el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.student_award_type" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="嘉奖级别" prop="awardRank">
<el-select v-model="form.awardRank" clearable placeholder="请选择" style="width: 100%;">
......@@ -217,6 +247,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="嘉奖名称" prop="awardName">
<el-input v-model="form.awardName" placeholder="请输入嘉奖名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
......@@ -247,7 +282,7 @@ import { checkIdcard } from '@/utils/utilLibrary/validate'
import { listStudentAward, listStudentAwardgr, getStudentAward, delStudentAward, addStudentAward, addStudentAwardgr, updateStudentAward, reviewStudentAward, listStudentAwardtg } from "@/api/smartSchool/classAdviser/studentCommendation";
export default {
name: "StudentAward",
dicts: ['semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type_wj', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'student_award_rank'],
dicts: ['semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type_wj', 'yearda', 'rankda','sys_user_sex', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states', 'student_award_rank', 'student_award_type'],
data() {
return {
// 遮罩层
......@@ -443,6 +478,7 @@ export default {
awardType: null,
awardRank: null,
awardTime: null,
awardName: null,
remark: null,
auditState: null,
createById: null,
......
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
......@@ -582,13 +582,11 @@
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="周课时量" align="center" prop="weeklyClassHours" width="100px"
show-overflow-tooltip />
<!-- <el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="120px"
show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip /> -->
<el-table-column label="早读" align="center" prop="earlyReading" width="70px" />
<el-table-column label="正课" align="center" prop="requiredCourses" width="70px" />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="70px" />
<el-table-column label="周末课时" align="center" prop="weekendClassHours" width="80px" />
<el-table-column label="周课时总量" align="center" prop="weeklyClassHours" width="80px" />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip />
......
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
......@@ -23,7 +23,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semster" clearable placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.semester" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
......@@ -200,10 +200,10 @@
</span>
</template>
</el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" sortable width="70px" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" sortable width="70px" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px" show-overflow-tooltip />
<el-table-column label="周末课时" align="center" prop="weekendClassHours" sortable width="80px" show-overflow-tooltip />
<el-table-column label="早读" align="center" prop="earlyReading" sortable width="70px" />
<el-table-column label="正课" align="center" prop="requiredCourses" sortable width="70px" />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px" />
<el-table-column label="周末课时" align="center" prop="weekendClassHours" sortable width="80px" />
<el-table-column label="周课时总量" align="center" prop="weeklyClassHours" sortable width="80px" />
<el-table-column label="是否满工作量" align="center" prop="workloadFullFlag" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
......@@ -935,7 +935,7 @@ export default {
},
handleQuerycx() {
this.query = true;
this.resetQuery();
//this.resetQuery();
},
/** 查询工作量信息列表 */
getList() {
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
......@@ -570,13 +570,11 @@
<el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
<el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
</el-table-column>
<el-table-column label="周课时量" align="center" prop="weeklyClassHours" width="80px"
show-overflow-tooltip />
<!-- <el-table-column label="早读" align="center" prop="earlyReading" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="100px"
show-overflow-tooltip />
<el-table-column label="合计" align="center" prop="amountTo" show-overflow-tooltip /> -->
<el-table-column label="早读" align="center" prop="earlyReading" width="70px" />
<el-table-column label="正课" align="center" prop="requiredCourses" width="70px" />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" width="70px" />
<el-table-column label="周末课时" align="center" prop="weekendClassHours" width="80px" />
<el-table-column label="周课时总量" align="center" prop="weeklyClassHours" width="80px" />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" show-overflow-tooltip />
......
ruoyi-ui/vue.config.js
......@@ -39,17 +39,17 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `http://localhost:8848`,
target: `http://localhost:11325`,
// target: ` http://192.168.1.120:8848`,
//target: ` http://43.143.63.140:8848`,
//target: ` http://43.143.63.140:8095`,
//部署时后端地址
// target: `http://47.105.176.202:5131`,
//target: `http://47.105.176.202:5131`,
//学校内网
// target: `http://10.20.100.201:57321`,
// target: `http://47.105.176.202:5115`,
// target: `http://172.16.100.96:5131`,
target: 'http://192.168.31.12:5131',
//target: 'http://192.168.31.12:5131',
// target: `http://172.18.6.157:8848`,
changeOrigin: true,
pathRewrite: {
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
......@@ -517,7 +517,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
document.add(pdfPTable);
//2.表格 工作量信息
PdfPTable pdfPTablegz = PDFUtil.getPdfPTable(13, 100, 1500);
PdfPTable pdfPTablegz = PDFUtil.getPdfPTable(17, 100, 1500);
Chunk qtchunkgz = PDFUtil.getChunk("工作量信息",font);
Paragraph qtParagraphgz = PDFUtil.getParagraph(qtchunkgz, Element.ALIGN_LEFT, 0, null);
qtParagraphgz.setSpacingAfter(5f);
......@@ -537,11 +537,11 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPTitleCell("聘任情况", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("班级", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("班级类型", cellFont, pdfCell, pdfPTablegz, 20);
/* PDFUtil.addPdfPTitleCell("早读", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("早读", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("正课", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("晚自习", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("合计", cellFont, pdfCell, pdfPTablegz, 20);*/
PDFUtil.addPdfPTitleCell("周课时", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("周末课时", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("周课时总量", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("证明人", cellFont, pdfCell, pdfPTablegz, 20);
for (SchoolAworkloadVo date: schoolAworkload){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablegz, 20);
......@@ -555,10 +555,10 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("appointment_situation",date.getAppointmentSituation()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(date.getClassName(), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(date.getClassType(), cellcoentFont, pdfCell, pdfPTablegz, 20);
/* PDFUtil.addPdfPCell(isNotString(date.getEarlyReading()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getEarlyReading()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getRequiredCourses()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getEveningSelfStudy()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getAmountTo()), cellcoentFont, pdfCell, pdfPTablegz, 20);*/
PDFUtil.addPdfPCell(isNotString(date.getWeekendClassHours()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getWeeklyClassHours()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getUserName()), cellcoentFont, pdfCell, pdfPTablegz, 20);
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java
......@@ -117,7 +117,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
*/
// @Excel(name = "现具备专技资格时间")
@Excel(name = "现职称取得时间")
// @JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
@TableField("current_professional_title_time")
@DateTimeFormat(pattern = "yyyy-MM")
private Date currentProfessionalTitleTime;
......@@ -135,7 +135,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
*/
// @Excel(name = "现聘专技资格时间")
@Excel(name = "现聘职称时间")
// @JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "UTC",pattern="yyyy-MM")
@TableField("current_hiring_professional_title_time")
@DateTimeFormat(pattern = "yyyy-MM")
private Date currentHiringProfessionalTitleTime;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/student/SchoolStudentAward.java
......@@ -78,7 +78,7 @@ public class SchoolStudentAward
private String departmentDirector;
/** 嘉奖类别 */
@Excel(name = "嘉奖类别")
@Excel(name = "嘉奖类别",dictType = "student_award_type")
private String awardType;
/** 嘉奖级别 */
......@@ -90,6 +90,9 @@ public class SchoolStudentAward
@Excel(name = "嘉奖时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date awardTime;
@Excel(name = "嘉奖名称")
private String awardName;
/** 备注 */
@Excel(name = "备注")
private String remark;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EncodeMapper.java
......@@ -4,4 +4,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEncode;
public interface EncodeMapper extends BaseMapper<SchoolEncode> {
String getMaxCodeByYwfl(SchoolEncode param);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java
......@@ -90,9 +90,26 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
String year = String.valueOf(LocalDate.now().getYear());
//定义序列号
String orderNum = "00001";
//自编码
//自编码 业务分类+分类+学年+5位数序列号 逐渐递增
long encode = Long.parseLong(ywfl + fl + year + orderNum);
while (true){
// 查询当前业务分类最大的编码
SchoolEncode param = new SchoolEncode();
param.setYwfl(ywfl);
param.setFl(fl);
param.setYear(year);
String maxCode = encodeMapper.getMaxCodeByYwfl(param);
if(StringUtils.isNotEmpty(maxCode)){
encode = Long.parseLong(ywfl + fl + year + maxCode);
encode = encode + 1;
}
orderNum = String.valueOf(encode).substring(10);
SchoolEncode schoolEncode = new SchoolEncode();
schoolEncode.setYwfl(ywfl);
schoolEncode.setFl(fl);
schoolEncode.setYear(year);
schoolEncode.setOrderNumber(orderNum);
encodeMapper.insert(schoolEncode);
/*while (true){
LambdaQueryWrapper<SchoolEncode> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolEncode::getYwfl,ywfl).eq(SchoolEncode::getFl,fl).eq(SchoolEncode::getYear,year).eq(SchoolEncode::getOrderNumber,orderNum);
List<SchoolEncode> schoolEncodes = encodeMapper.selectList(wrapper);
......@@ -108,7 +125,7 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
encodeMapper.insert(schoolEncode);
break;
}
}
}*/
return String.valueOf(encode);
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java
......@@ -209,7 +209,7 @@ String url ="https://oapi.dingtalk.com/robot/send?access_token=06ac9f1927d64a805
sb.append("设备名称:");
sb.append(schoolEquipmentLedger.getEquipmentName());
sb.append("\n");
sb.append("保修地点");
sb.append("保修地点:");
sb.append(schoolEquipmentRepair.getPlace());
sb.append("\n");
sb.append("问题:");
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
......@@ -1523,15 +1523,15 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
// list.add(schoolXsyouthTeacher);
// comperhensiveVo.setSchoolXsyouthTeachers(list);
// }
List<SchoolXsyouthTeacher> list = new ArrayList<>();
SchoolXsyouthTeacherVo schoolXsyouthTeacherVo = new SchoolXsyouthTeacherVo();
schoolXsyouthTeacherVo.setIdCard(basicInformation.getIdCard());
List<SchoolXsyouthTeacher> schoolXsyouthTeachers = schoolXsyouthTeacherService.selectSchoolXsyouthTeacherList(schoolXsyouthTeacherVo);
/*List<SchoolXsyouthTeacher> list = new ArrayList<>();
if (schoolXsyouthTeachers.size() > 0){
SchoolXsyouthTeacher schoolXsyouthTeacher = schoolXsyouthTeachers.get(0);
list.add(schoolXsyouthTeacher);
}
comperhensiveVo.setSchoolXsyouthTeachers(list);
}*/
comperhensiveVo.setSchoolXsyouthTeachers(schoolXsyouthTeachers);
return comperhensiveVo;
}
public ComperhensiveVo comprehensiveByPhoneNumber(String phoneNumber) throws Exception {
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/student/SchoolStudentAwardServiceImpl.java
......@@ -143,6 +143,8 @@ public class SchoolStudentAwardServiceImpl extends ServiceImpl<SchoolStudentAwar
//查询性别字典键值
List<SysDictData> sex = sysDictDataMapper.selectDictDataByType("sys_user_sex");
//查询嘉奖级别字典键值
List<SysDictData> studentAwardType = sysDictDataMapper.selectDictDataByType("student_award_type");
//查询嘉奖级别字典键值
List<SysDictData> studentAwardRank = sysDictDataMapper.selectDictDataByType("student_award_rank");
for (SchoolStudentAwardVo schoolStudentAwardVo : list) {
if (StringUtils.isNull(schoolStudentAwardVo.getSchoolYear())) {
......@@ -295,15 +297,27 @@ public class SchoolStudentAwardServiceImpl extends ServiceImpl<SchoolStudentAwar
awardRank1 = sysDictData.getDictValue();
}
}
//判断嘉奖类别输入是否正确
String awardType = schoolStudentAwardVo.getAwardType();
String awardType1 = "";
for (SysDictData sysDictData : studentAwardType) {
if (awardType.equals(sysDictData.getDictLabel())){
awardType1 = sysDictData.getDictValue();
}
}
if (StringUtils.isEmpty(sex2)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、性别输入错误,请您重新输入! ");
}else if (StringUtils.isEmpty(awardRank1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、嘉奖级别输入错误,请您重新输入! ");
}else if (StringUtils.isEmpty(awardType1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、嘉奖类别输入错误,请您重新输入! ");
}else {
schoolStudentAwardVo.setSex(sex2);
schoolStudentAwardVo.setAwardRank(awardRank1);
schoolStudentAwardVo.setAwardType(awardType1);
}
}
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/student/SchoolStudentAchievementVo.java
......@@ -46,7 +46,7 @@ public class SchoolStudentAchievementVo
private String className;
/** 班级类型 */
@Excel(name = "班级类型",combo = {"提高班","普通班","音乐班","美术班","体育班","特优班"})
@Excel(name = "班级类型",combo = {"特优班","实验班","普通班","艺术班","体育班","国际班","其他"})
private String classType;
/** 姓名 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/student/SchoolStudentAwardVo.java
......@@ -44,7 +44,7 @@ public class SchoolStudentAwardVo {
private String className;
/** 班级类型 */
@Excel(name = "班级类型",combo = {"提高班","普通班","音乐班","美术班","体育班","特优班","春季班"})
@Excel(name = "班级类型",combo = {"特优班","实验班","普通班","艺术班","体育班","国际班","其他"})
private String classType;
/** 姓名 */
......@@ -74,7 +74,7 @@ public class SchoolStudentAwardVo {
private String departmentDirector;
/** 嘉奖类别 */
@Excel(name = "嘉奖类别")
@Excel(name = "嘉奖类别",combo = {"综合类","学业成绩类","综合素质类","专项表彰类","其他类"})
private String awardType;
/** 嘉奖级别 */
......@@ -86,6 +86,8 @@ public class SchoolStudentAwardVo {
@Excel(name = "嘉奖时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date awardTime;
@Excel(name = "嘉奖名称")
private String awardName;
/** 备注 */
@Excel(name = "备注")
private String remark;
......
smart-campus/src/main/resources/mapper/schoolAnnualAssessment/SchoolAnnualAssessmentMapper.xml
......@@ -42,7 +42,7 @@
</foreach>
</if>
</where>
order by create_time DESC
order by year DESC
</select>
<select id="selectSchoolAnnualAssessmentById" parameterType="Long" resultMap="SchoolAnnualAssessmentResult">
......
smart-campus/src/main/resources/mapper/schoolEquipment/EncodeMapper.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.campus.mapper.schoolEquipment.EncodeMapper">
<select id="getMaxCodeByYwfl" resultType="java.lang.String">
SELECT max(order_number)
FROM school_encode
WHERE ywfl = #{ywfl} AND fl = #{fl} AND year = #{year}
</select>
</mapper>
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentMapper.xml
......@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
order by school_year desc,year desc
</select>
......@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{idCard}
</foreach>
</if>
order by school_year desc,year desc
</select>
<select id="selectSchoolAclassTeacherAssessmentById" parameterType="Long" resultMap="SchoolAclassTeacherAssessmentResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.xml
......@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
order by school_year desc,year desc,semester asc
</select>
......@@ -106,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{idCard}
</foreach>
</if>
order by school_year desc,year desc,semester asc
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolGkAchievementMapper.xml
......@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="noAuditState != null and noAuditState != ''"> and audit_state != #{noAuditState}</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
order by year desc
</select>
<select id="selectSchoolGkAchievementList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo" resultMap="SchoolGkAchievementResult">
......@@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{userId}
</foreach>
</if>
order by year desc
</select>
<select id="selectSchoolGkAchievementById" parameterType="Long" resultMap="SchoolGkAchievementResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXacademicWorksMapper.xml
......@@ -56,7 +56,7 @@
</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
</where>
order by create_time DESC
order by award_time DESC
</select>
<select id="selectSchoolXacademicWorksById" parameterType="Long" resultMap="SchoolXacademicWorksResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsMapper.xml
......@@ -56,7 +56,7 @@
</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
</where>
order by create_time DESC
order by award_time DESC
</select>
<select id="selectSchoolXcomprehensiveHonorsById" parameterType="Long" resultMap="SchoolXcomprehensiveHonorsResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXlectureAwardsMapper.xml
......@@ -56,7 +56,7 @@
</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
</where>
order by create_time DESC
order by award_time DESC
</select>
<select id="selectSchoolXlectureAwardsById" parameterType="Long" resultMap="SchoolXlectureAwardsResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXprojectResearchMapper.xml
......@@ -55,7 +55,7 @@
</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
</where>
order by create_time DESC
order by award_time DESC
</select>
<select id="selectSchoolXprojectResearchById" parameterType="Long" resultMap="SchoolXprojectResearchResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXsyouthTeacherMapper.xml
......@@ -54,6 +54,7 @@
</foreach>
</if>
</where>
order by school_year desc, grade asc,semester desc
</select>
<select id="selectSchoolXsyouthTeacherById" parameterType="Long" resultMap="SchoolXsyouthTeacherResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml
......@@ -62,7 +62,7 @@
</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
</where>
order by create_time DESC
order by exam_time DESC
</select>
<select id="selectSchoolXteachingAchievementsById" parameterType="Long" resultMap="SchoolXteachingAchievementsResult">
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteamAwardMapper.xml
......@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
</where>
order by school_year desc,year desc
</select>
<select id="selectSchoolXteamAwardVoList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAwardVo" resultType="SchoolXteamAwardVo">
......@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="sub1 != null and sub1 != ''"> or sub = #{sub1}</if>
</where>
order by school_year desc,year desc
</select>
<select id="selectSchoolXteamAwardById" parameterType="Long" resultMap="SchoolXteamAwardResult">
......
smart-campus/src/main/resources/mapper/student/SchoolStudentAwardMapper.xml
......@@ -22,6 +22,7 @@
<result property="awardType" column="award_type" />
<result property="awardRank" column="award_rank" />
<result property="awardTime" column="award_time" />
<result property="awardName" column="award_name" />
<result property="remark" column="remark" />
<result property="auditState" column="audit_state" />
<result property="createById" column="create_by_id" />
......@@ -34,7 +35,7 @@
</resultMap>
<sql id="selectSchoolStudentAwardVo">
select id, school_year, semester, year, grade, class_name, class_type, name, id_card, sex, class_teacher_id, class_teacher, department_director_id, department_director, award_type, award_rank, award_time, remark, audit_state, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag from school_student_award
select id, school_year, semester, year, grade, class_name, class_type, name, id_card, sex, class_teacher_id, class_teacher, department_director_id, department_director, award_type, award_rank, award_time, award_name,remark, audit_state, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag from school_student_award
</sql>
<select id="selectSchoolStudentAwardList" parameterType="SchoolStudentAward" resultMap="SchoolStudentAwardResult">
......@@ -115,6 +116,7 @@
<if test="awardType != null">award_type,</if>
<if test="awardRank != null">award_rank,</if>
<if test="awardTime != null">award_time,</if>
<if test="awardName != null">award_name,</if>
<if test="remark != null">remark,</if>
<if test="auditState != null">audit_state,</if>
<if test="createById != null">create_by_id,</if>
......@@ -141,6 +143,7 @@
<if test="awardType != null">#{awardType},</if>
<if test="awardRank != null">#{awardRank},</if>
<if test="awardTime != null">#{awardTime},</if>
<if test="awardName != null">#{awardName},</if>
<if test="remark != null">#{remark},</if>
<if test="auditState != null">#{auditState},</if>
<if test="createById != null">#{createById},</if>
......@@ -171,6 +174,7 @@
<if test="awardType != null">award_type = #{awardType},</if>
<if test="awardRank != null">award_rank = #{awardRank},</if>
<if test="awardTime != null">award_time = #{awardTime},</if>
<if test="awardName != null">award_name = #{awardName},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="auditState != null">audit_state = #{auditState},</if>
<if test="createById != null">create_by_id = #{createById},</if>
......
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