Merge remote-tracking branch 'origin/master'

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -287,6 +287,14 @@ public class ExcelUtil<T>
         return importExcel(is, 0);
     }
 
+
+    public List<T> importExceltoRow(InputStream is,int rownum) throws Exception
+    {
+        return importExceltoRow(StringUtils.EMPTY,is, 0,rownum);
+    }
+
+
+
     /**
      * 对excel表单默认第一个索引名转换成list
      *
@@ -298,6 +306,8 @@ public class ExcelUtil<T>
         return importExcelNdkh(is, 0);
     }
 
+
+
     /**
      * 对excel表单默认第一个索引名转换成list
      *
@@ -322,6 +332,188 @@ public class ExcelUtil<T>
         return importExcelNdkh(StringUtils.EMPTY, is, titleNum);
     }
 
+
+    /**
+     * 对excel表单指定表格索引名转换成list
+     *
+     * @param sheetName 表格索引名
+     * @param titleNum 标题占用行数
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importExceltoRow(String sheetName, InputStream is, int titleNum,int rownum) throws Exception
+    {
+        this.type = Type.IMPORT;
+        this.wb = WorkbookFactory.create(is);
+        List<T> list = new ArrayList<T>();
+        // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
+        Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
+        if (sheet == null)
+        {
+            throw new IOException("文件sheet不存在");
+        }
+        boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);
+        Map<String, PictureData> pictures;
+        if (isXSSFWorkbook)
+        {
+            pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
+        }
+        else
+        {
+            pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);
+        }
+        // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
+        int rows = sheet.getLastRowNum();
+
+        if (rows > 0)
+        {
+            // 定义一个map用于存放excel列的序号和field.
+            Map<String, Integer> cellMap = new HashMap<String, Integer>();
+            // 获取表头
+            Row heard = sheet.getRow(titleNum);
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
+            {
+                Cell cell = heard.getCell(i);
+                if (StringUtils.isNotNull(cell))
+                {
+                    String value = this.getCellValue(heard, i).toString();
+                    cellMap.put(value, i);
+                }
+                else
+                {
+                    cellMap.put(null, i);
+                }
+            }
+            // 有数据时才处理 得到类的所有field.
+            List<Object[]> fields = this.getFields();
+            Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
+            for (Object[] objects : fields)
+            {
+                Excel attr = (Excel) objects[1];
+                Integer column = cellMap.get(attr.name());
+                if (column != null)
+                {
+                    fieldsMap.put(column, objects);
+                }
+            }
+            for (int i = titleNum + 1+rownum; i <= rows; i++)
+            {
+                // 从第2行开始取数据,默认第一行是表头.
+                Row row = sheet.getRow(i);
+                // 判断当前行是否是空行
+                if (isRowEmpty(row))
+                {
+                    continue;
+                }
+                T entity = null;
+                for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet())
+                {
+                    Object val = this.getCellValue(row, entry.getKey());
+
+                    // 如果不存在实例则新建.
+                    entity = (entity == null ? clazz.newInstance() : entity);
+                    // 从map中得到对应列的field.
+                    Field field = (Field) entry.getValue()[0];
+                    Excel attr = (Excel) entry.getValue()[1];
+                    // 取得类型,并根据对象类型设置值.
+                    Class<?> fieldType = field.getType();
+                    if (String.class == fieldType)
+                    {
+                        String s = Convert.toStr(val);
+                        if (StringUtils.endsWith(s, ".0"))
+                        {
+                            val = StringUtils.substringBefore(s, ".0");
+                        }
+                        else
+                        {
+                            String dateFormat = field.getAnnotation(Excel.class).dateFormat();
+                            if (StringUtils.isNotEmpty(dateFormat))
+                            {
+                                val = parseDateToStr(dateFormat, val);
+                            }
+                            else
+                            {
+                                val = Convert.toStr(val);
+                            }
+                        }
+                    }
+                    else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
+                    {
+                        val = Convert.toInt(val);
+                    }
+                    else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
+                    {
+                        val = Convert.toLong(val);
+                    }
+                    else if (Double.TYPE == fieldType || Double.class == fieldType)
+                    {
+                        val = Convert.toDouble(val);
+                    }
+                    else if (Float.TYPE == fieldType || Float.class == fieldType)
+                    {
+                        val = Convert.toFloat(val);
+                    }
+                    else if (BigDecimal.class == fieldType)
+                    {
+                        val = Convert.toBigDecimal(val);
+                    }
+                    else if (Date.class == fieldType)
+                    {
+                        if (val instanceof String)
+                        {
+                            val = DateUtils.parseDate(val);
+                        }
+                        else if (val instanceof Double)
+                        {
+                            val = DateUtil.getJavaDate((Double) val);
+                        }
+                    }
+                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
+                    {
+                        val = Convert.toBool(val, false);
+                    }
+                    if (StringUtils.isNotNull(fieldType))
+                    {
+                        String propertyName = field.getName();
+                        if (StringUtils.isNotEmpty(attr.targetAttr()))
+                        {
+                            propertyName = field.getName() + "." + attr.targetAttr();
+                        }
+                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))
+                        {
+                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
+                        }
+                        else if (StringUtils.isNotEmpty(attr.dictType()))
+                        {
+                            val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
+                        }
+                        else if (!attr.handler().equals(ExcelHandlerAdapter.class))
+                        {
+                            val = dataFormatHandlerAdapter(val, attr);
+                        }
+                        else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))
+                        {
+                            PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());
+                            if (image == null)
+                            {
+                                val = "";
+                            }
+                            else
+                            {
+                                byte[] data = image.getData();
+                                val = FileUtils.writeImportBytes(data);
+                            }
+                        }
+                        ReflectUtils.invokeSetter(entity, propertyName, val);
+                    }
+                }
+                list.add(entity);
+            }
+        }
+        return list;
+    }
+
+
     /**
      * 对excel表单指定表格索引名转换成list
      *

ruoyi-ui/src/api/smartSchool/electronicArchives/basicInformation.js

@@ -50,3 +50,11 @@ export function exportInformation(data) {
     data: data,
   });
 }
+//学生照片导入
+export function filesUpload(files) {
+  return request({
+    url: "/teacher/basiclnformation/importTeacherPicture",
+    method: "post",
+    data: files,
+  });
+}

ruoyi-ui/src/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors.js

@@ -8,6 +8,14 @@ export function listHonors(query) {
     params: query,
   });
 }
+//查看综合荣誉列表（个人）
+export function listHonorsgr(query) {
+  return request({
+    url: "/system/honors/listGr",
+    method: "get",
+    params: query,
+  });
+}
 
 // 查询综合荣誉详细
 export function getHonors(id) {
@@ -42,3 +50,20 @@ export function delHonors(id) {
     method: "delete",
   });
 }
+
+//获取用户
+export function getUserList(data) {
+  return request({
+    url: "/system/achievements/getUserList",
+    method: "get",
+    params: data,
+  });
+}
+//审核
+export function audit(data) {
+  return request({
+    url: "/system/honors/audit",
+    method: "post",
+    data: data,
+  });
+}

ruoyi-ui/src/api/smartSchool/electronicArchives/professionalDevelopment/essaysWritings.js

@@ -42,3 +42,11 @@ export function delWorks(id) {
     method: "delete",
   });
 }
+//审核
+export function audit(data) {
+  return request({
+    url: "/system/works/audit",
+    method: "post",
+    data: data,
+  });
+}

ruoyi-ui/src/api/smartSchool/electronicArchives/professionalDevelopment/lectureAwards.js

@@ -42,3 +42,11 @@ export function delAwards(id) {
     method: "delete",
   });
 }
+//审核
+export function audit(data) {
+  return request({
+    url: "/system/awards/audit",
+    method: "post",
+    data: data,
+  });
+}

ruoyi-ui/src/api/smartSchool/electronicArchives/professionalDevelopment/teacherAwards.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 // 查询教师获奖列表
 export function listAwards(query) {
   return request({
-    url: "/system/awards/list",
+    url: "/school/teacherAwards/list",
     method: "get",
     params: query,
   });
@@ -12,7 +12,7 @@ export function listAwards(query) {
 // 查询教师获奖详细
 export function getAwards(id) {
   return request({
-    url: "/system/awards/" + id,
+    url: "/school/teacherAwards/" + id,
     method: "get",
   });
 }
@@ -20,7 +20,7 @@ export function getAwards(id) {
 // 新增教师获奖
 export function addAwards(data) {
   return request({
-    url: "/system/awards",
+    url: "/school/teacherAwards",
     method: "post",
     data: data,
   });
@@ -29,7 +29,7 @@ export function addAwards(data) {
 // 修改教师获奖
 export function updateAwards(data) {
   return request({
-    url: "/system/awards",
+    url: "/school/teacherAwards",
     method: "put",
     data: data,
   });
@@ -38,7 +38,15 @@ export function updateAwards(data) {
 // 删除教师获奖
 export function delAwards(id) {
   return request({
-    url: "/system/awards/" + id,
+    url: "/school/teacherAwards/" + id,
     method: "delete",
   });
 }
+//审核
+export function audit(data) {
+  return request({
+    url: "/school/teacherAwards/audit",
+    method: "post",
+    data: data,
+  });
+}

ruoyi-ui/src/api/smartSchool/electronicArchives/teacherAssessment.js

+import request from "@/utils/request";
+
+// 查询班主任考核列表
+export function listAssessment(query) {
+  return request({
+    url: "/assessment/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询班主任考核详细
+export function getAssessment(id) {
+  return request({
+    url: "/assessment/" + id,
+    method: "get",
+  });
+}
+
+// 新增班主任考核
+export function addAssessment(data) {
+  return request({
+    url: "/assessment",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改班主任考核
+export function updateAssessment(data) {
+  return request({
+    url: "/assessment",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除班主任考核
+export function delAssessment(id) {
+  return request({
+    url: "/assessment/" + id,
+    method: "delete",
+  });
+}

ruoyi-ui/src/api/smartSchool/electronicArchives/workloadInformation.js

+import request from "@/utils/request";
+
+// 查询工作量信息列表
+export function listAworkload(query) {
+  return request({
+    url: "/aworkload/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询工作量信息详细
+export function getAworkload(id) {
+  return request({
+    url: "/aworkload/" + id,
+    method: "get",
+  });
+}
+
+// 新增工作量信息
+export function addAworkload(data) {
+  return request({
+    url: "/aworkload",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改工作量信息
+export function updateAworkload(data) {
+  return request({
+    url: "/aworkload",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除工作量信息
+export function delAworkload(id) {
+  return request({
+    url: "/aworkload/" + id,
+    method: "delete",
+  });
+}

ruoyi-ui/src/components/ExportTable/index.vue

@@ -82,6 +82,7 @@ export default {
 
     // 添加选中导出判断
     isSelectedData(path) {
+      console.log('path', path)
       if (this.exportType === ExportType.SELECT) {
         const params = path.slice(path.lastIndexOf("/") + 1);
         if (!params) {

ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue

@@ -105,7 +105,7 @@
                 </el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete"
                     v-hasPermi="['system:student:remove']">删除
                 </el-button>
             </el-col>
@@ -847,7 +847,8 @@
             </div>
         </el-dialog>
         <!-- 导出对话框 -->
-        <ExportTable :open-export.sync="exportOptions.open" :title="exportOptions.title" @export="exportFile"></ExportTable>
+        <ExportTableNew :open-export.sync="exportOptions.open" :title="exportOptions.title" @export="exportFile">
+        </ExportTableNew>
     </div>
 </template>
 
@@ -857,6 +858,7 @@ import {
     getInformation,
     delInformation,
     addInformation,
+    filesUpload,
     updateInformation,
 } from "@/api/smartSchool/electronicArchives/basicInformation";
 import { uploadImage as commonUpload } from "@/api/common";
@@ -903,6 +905,7 @@ export default {
             },
             uploadForm: {},
             baseUrl: [process.env.VUE_APP_BASE_API],
+            uploadLoading: false,
             uploadFileLoading: false,
             // 遮罩层
             loading: true,
@@ -1258,8 +1261,9 @@ export default {
         handleSelectionChange(selection) {
             this.selection = selection;
             this.ids = selection.map(item => item.id);
-            this.single = selection.length !== 1;
-            this.multiple = !selection.length;
+            this.single = selection.length == 1;
+            this.multiple = selection.length > 1;
+
             // 先定义 isMultiple 变量为 false
             let isMultiple = false;
             if (this.selection.length === 1) {
@@ -1291,6 +1295,7 @@ export default {
             const id = row.id || this.ids;
             getInformation(id).then((response) => {
                 this.form = response.data;
+                this.pictureUrl = this.pev + response.url;
                 console.log(this.form, "this.form ");
                 this.title = "修改教师基础信息";
             });
@@ -1303,7 +1308,7 @@ export default {
                         updateInformation(this.form).then((response) => {
                             console.log(this.form, 'this.form');
                             this.$modal.msgSuccess("修改成功");
-                            this.open = false;
+                            this.look = false;
                             this.getList();
                         });
                     } else {
@@ -1333,36 +1338,44 @@ export default {
         },
         /** 导出按钮操作 */
         handleExport() {
-            this.exportOptions.open = true;
+            this.download('teacher/basiclnformation/export', {
+                ...this.queryParams
+            }, `data_${Date.now()}.xlsx`)
+            // this.exportOptions.open = true;
             // this.download('/teacher/basiclnformation/export', {
             //     ...this.queryParams
             // }, `information_${new Date().getTime()}.xlsx`)
         },
         /** 导出 */
         exportFile(callback) {
-            // 获取当前选中的多选项的 ids 和单选项的 id
-            const ids = this.ids;
-            const id = this.id;
-            console.log(ids, id);
-            const options = [
-                {
-                    type: ExportType.TOTAL,
-                    path: "/teacher/basiclnformation/export",
-                    params: {},
-                },
-                {
-                    type: ExportType.SELECT,
-                    path: "/teacher/basiclnformation/export/",
-                    params: { ids, id },
-                },
-                {
-                    type: ExportType.QUERY,
-                    path: "/teacher/basiclnformation/export",
-                    params: this.queryParams,
-                },
-            ];
 
-            callback(options, `教师基础信息${Date.now()}.xlsx`);
+            // let exportId = ''
+            // if (this.multiple == true) {
+            //     exportId = this.ids
+            // } else {
+            //     exportId = this.id
+            // }
+            // console.log('exportId', exportId);
+            // const options = [
+            //     {
+            //         type: ExportType.TOTAL,
+            //         path: "/teacher/basiclnformation/export",
+            //         params: {},
+            //     },
+            //     {
+            //         type: ExportType.SELECT,
+            //         path: "/teacher/basiclnformation/export/",
+            //         params: { exportId },
+            //     },
+            //     {
+            //         type: ExportType.QUERY,
+            //         path: "/teacher/basiclnformation/export",
+            //         params: this.queryParams,
+            //     },
+            // ];
+
+            // callback(options, `教师基础信息${Date.now()}.xlsx`);
+
         },
 
 

ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue

+<template>
+    <div>
+        <h2>教师个人信息汇总</h2>
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/academicAchievement/index.vue

+<template>
+    <div>
+        <h2></h2>
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/components/SelectUser.vue

+<template>
+    <el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
+        <!--  模糊查询-->
+        <el-form :model="form" ref="form" size="small" inline>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
+                    @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
+                <el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!--  列表数据-->
+        <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
+            @row-click="rowClick">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
+            <el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
+        </el-table>
+        <!--  分页-->
+        <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
+            @pagination="search"></pagination>
+        <!--  底部-->
+        <div slot="footer">
+            <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
+            <el-button @click="quit" size="small">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
+export default {
+    name: "SelectUser",
+    dicts: ['sys_user_sex'],
+    props: {
+        open: {
+            type: Boolean,
+            require: true
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        width: {
+            type: [Number, String],
+            default: '50%'
+        },
+        execute: {
+            type: [String]
+        },
+        // 选择级部、处室主任
+        id: {
+            type: [Number, String]
+        }
+    },
+    data() {
+        return {
+            baseURL: process.env.VUE_APP_BASE_API,
+            form: {
+                userName: '',
+                phone: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            total: 0,
+            loading: false,
+            userList: [],
+            selectUser: null
+        }
+    },
+    computed: {
+        openDialog: {
+            get() {
+                return this.open;
+            },
+            set(value) {
+                this.$emit('update:open', value);
+            }
+        }
+    },
+    watch: {
+        open(value) {
+            if (value) {
+                this.$nextTick(() => {
+                    this.reset();
+                })
+            }
+        }
+    },
+
+    methods: {
+        /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
+        async search() {
+            if (isNaN(Number(this.id))) {
+                console.error('Invalid ID');
+                return;
+            }
+
+            try {
+                this.loading = true;
+                const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
+                this.userList = response.rows || [];
+                this.total = response.total;
+                this.loading = false;
+            } catch (exception) {
+                this.loading = false;
+                throw new Error(exception);
+            }
+        },
+
+        /** 重置表单 */
+        reset() {
+            this.form = {
+                teacherName: '',
+                teacherTel: '',
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm('form');
+            this.search();
+        },
+        /** 选项选中发生变化 */
+        selectionChange(selections) {
+            this.selectUser = selections[0];
+        },
+        /** 点击选中、取消 */
+        rowClick(row, column) {
+            console.log('row', row);
+            this.$refs['tableList'].clearSelection();
+            this.$refs['tableList'].toggleRowSelection(row, true);
+        },
+        /** 提交选中 */
+        submit() {
+            this.$emit('select', {
+                id: this.selectUser.userId,
+                name: this.selectUser.userName,
+                tel: this.selectUser.phone
+            });
+            this.quit();
+        },
+        /** 取消 */
+        quit() {
+            this.openDialog = false;
+        },
+
+
+
+        /** 分管领导、主要领导 */
+        leaderList(form) {
+            return getUserList(form);
+        },
+        dialogClose() {
+            this.userList = []
+        }
+    }
+}
+</script>
+
+<style scoped>
+.footer {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+}
+
+.radius-image {
+    border-radius: 40px;
+}
+</style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/components/SelectUser.vue

+<template>
+    <el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
+        <!--  模糊查询-->
+        <el-form :model="form" ref="form" size="small" inline>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
+                    @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
+                <el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!--  列表数据-->
+        <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
+            @row-click="rowClick">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
+            <el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
+        </el-table>
+        <!--  分页-->
+        <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
+            @pagination="search"></pagination>
+        <!--  底部-->
+        <div slot="footer">
+            <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
+            <el-button @click="quit" size="small">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
+export default {
+    name: "SelectUser",
+    dicts: ['sys_user_sex'],
+    props: {
+        open: {
+            type: Boolean,
+            require: true
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        width: {
+            type: [Number, String],
+            default: '50%'
+        },
+        execute: {
+            type: [String]
+        },
+        // 选择级部、处室主任
+        id: {
+            type: [Number, String]
+        }
+    },
+    data() {
+        return {
+            baseURL: process.env.VUE_APP_BASE_API,
+            form: {
+                userName: '',
+                phone: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            total: 0,
+            loading: false,
+            userList: [],
+            selectUser: null
+        }
+    },
+    computed: {
+        openDialog: {
+            get() {
+                return this.open;
+            },
+            set(value) {
+                this.$emit('update:open', value);
+            }
+        }
+    },
+    watch: {
+        open(value) {
+            if (value) {
+                this.$nextTick(() => {
+                    this.reset();
+                })
+            }
+        }
+    },
+
+    methods: {
+        /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
+        async search() {
+            if (isNaN(Number(this.id))) {
+                console.error('Invalid ID');
+                return;
+            }
+
+            try {
+                this.loading = true;
+                const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
+                this.userList = response.rows || [];
+                this.total = response.total;
+                this.loading = false;
+            } catch (exception) {
+                this.loading = false;
+                throw new Error(exception);
+            }
+        },
+
+        /** 重置表单 */
+        reset() {
+            this.form = {
+                teacherName: '',
+                teacherTel: '',
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm('form');
+            this.search();
+        },
+        /** 选项选中发生变化 */
+        selectionChange(selections) {
+            this.selectUser = selections[0];
+        },
+        /** 点击选中、取消 */
+        rowClick(row, column) {
+            console.log('row', row);
+            this.$refs['tableList'].clearSelection();
+            this.$refs['tableList'].toggleRowSelection(row, true);
+        },
+        /** 提交选中 */
+        submit() {
+            this.$emit('select', {
+                id: this.selectUser.userId,
+                name: this.selectUser.userName,
+                tel: this.selectUser.phone
+            });
+            this.quit();
+        },
+        /** 取消 */
+        quit() {
+            this.openDialog = false;
+        },
+
+
+
+        /** 分管领导、主要领导 */
+        leaderList(form) {
+            return getUserList(form);
+        },
+        dialogClose() {
+            this.userList = []
+        }
+    }
+}
+</script>
+
+<style scoped>
+.footer {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+}
+
+.radius-image {
+    border-radius: 40px;
+}
+</style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/components/SelectUser.vue

+<template>
+    <el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
+        <!--  模糊查询-->
+        <el-form :model="form" ref="form" size="small" inline>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
+                    @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
+                <el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!--  列表数据-->
+        <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
+            @row-click="rowClick">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
+            <el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
+        </el-table>
+        <!--  分页-->
+        <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
+            @pagination="search"></pagination>
+        <!--  底部-->
+        <div slot="footer">
+            <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
+            <el-button @click="quit" size="small">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
+export default {
+    name: "SelectUser",
+    dicts: ['sys_user_sex'],
+    props: {
+        open: {
+            type: Boolean,
+            require: true
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        width: {
+            type: [Number, String],
+            default: '50%'
+        },
+        execute: {
+            type: [String]
+        },
+        // 选择级部、处室主任
+        id: {
+            type: [Number, String]
+        }
+    },
+    data() {
+        return {
+            baseURL: process.env.VUE_APP_BASE_API,
+            form: {
+                userName: '',
+                phone: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            total: 0,
+            loading: false,
+            userList: [],
+            selectUser: null
+        }
+    },
+    computed: {
+        openDialog: {
+            get() {
+                return this.open;
+            },
+            set(value) {
+                this.$emit('update:open', value);
+            }
+        }
+    },
+    watch: {
+        open(value) {
+            if (value) {
+                this.$nextTick(() => {
+                    this.reset();
+                })
+            }
+        }
+    },
+
+    methods: {
+        /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
+        async search() {
+            if (isNaN(Number(this.id))) {
+                console.error('Invalid ID');
+                return;
+            }
+
+            try {
+                this.loading = true;
+                const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
+                this.userList = response.rows || [];
+                this.total = response.total;
+                this.loading = false;
+            } catch (exception) {
+                this.loading = false;
+                throw new Error(exception);
+            }
+        },
+
+        /** 重置表单 */
+        reset() {
+            this.form = {
+                teacherName: '',
+                teacherTel: '',
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm('form');
+            this.search();
+        },
+        /** 选项选中发生变化 */
+        selectionChange(selections) {
+            this.selectUser = selections[0];
+        },
+        /** 点击选中、取消 */
+        rowClick(row, column) {
+            console.log('row', row);
+            this.$refs['tableList'].clearSelection();
+            this.$refs['tableList'].toggleRowSelection(row, true);
+        },
+        /** 提交选中 */
+        submit() {
+            this.$emit('select', {
+                id: this.selectUser.userId,
+                name: this.selectUser.userName,
+                tel: this.selectUser.phone
+            });
+            this.quit();
+        },
+        /** 取消 */
+        quit() {
+            this.openDialog = false;
+        },
+
+
+
+        /** 分管领导、主要领导 */
+        leaderList(form) {
+            return getUserList(form);
+        },
+        dialogClose() {
+            this.userList = []
+        }
+    }
+}
+</script>
+
+<style scoped>
+.footer {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+}
+
+.radius-image {
+    border-radius: 40px;
+}
+</style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/components/SelectUser.vue

+<template>
+    <el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
+        <!--  模糊查询-->
+        <el-form :model="form" ref="form" size="small" inline>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
+                    @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
+                <el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!--  列表数据-->
+        <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
+            @row-click="rowClick">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
+            <el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
+        </el-table>
+        <!--  分页-->
+        <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
+            @pagination="search"></pagination>
+        <!--  底部-->
+        <div slot="footer">
+            <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
+            <el-button @click="quit" size="small">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
+export default {
+    name: "SelectUser",
+    dicts: ['sys_user_sex'],
+    props: {
+        open: {
+            type: Boolean,
+            require: true
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        width: {
+            type: [Number, String],
+            default: '50%'
+        },
+        execute: {
+            type: [String]
+        },
+        // 选择级部、处室主任
+        id: {
+            type: [Number, String]
+        }
+    },
+    data() {
+        return {
+            baseURL: process.env.VUE_APP_BASE_API,
+            form: {
+                userName: '',
+                phone: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            total: 0,
+            loading: false,
+            userList: [],
+            selectUser: null
+        }
+    },
+    computed: {
+        openDialog: {
+            get() {
+                return this.open;
+            },
+            set(value) {
+                this.$emit('update:open', value);
+            }
+        }
+    },
+    watch: {
+        open(value) {
+            if (value) {
+                this.$nextTick(() => {
+                    this.reset();
+                })
+            }
+        }
+    },
+
+    methods: {
+        /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
+        async search() {
+            if (isNaN(Number(this.id))) {
+                console.error('Invalid ID');
+                return;
+            }
+
+            try {
+                this.loading = true;
+                const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
+                this.userList = response.rows || [];
+                this.total = response.total;
+                this.loading = false;
+            } catch (exception) {
+                this.loading = false;
+                throw new Error(exception);
+            }
+        },
+
+        /** 重置表单 */
+        reset() {
+            this.form = {
+                teacherName: '',
+                teacherTel: '',
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm('form');
+            this.search();
+        },
+        /** 选项选中发生变化 */
+        selectionChange(selections) {
+            this.selectUser = selections[0];
+        },
+        /** 点击选中、取消 */
+        rowClick(row, column) {
+            console.log('row', row);
+            this.$refs['tableList'].clearSelection();
+            this.$refs['tableList'].toggleRowSelection(row, true);
+        },
+        /** 提交选中 */
+        submit() {
+            this.$emit('select', {
+                id: this.selectUser.userId,
+                name: this.selectUser.userName,
+                tel: this.selectUser.phone
+            });
+            this.quit();
+        },
+        /** 取消 */
+        quit() {
+            this.openDialog = false;
+        },
+
+
+
+        /** 分管领导、主要领导 */
+        leaderList(form) {
+            return getUserList(form);
+        },
+        dialogClose() {
+            this.userList = []
+        }
+    }
+}
+</script>
+
+<style scoped>
+.footer {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+}
+
+.radius-image {
+    border-radius: 40px;
+}
+</style>

ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/components/SelectUser.vue

+<template>
+    <el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
+        <!--  模糊查询-->
+        <el-form :model="form" ref="form" size="small" inline>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
+                    @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
+                <el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!--  列表数据-->
+        <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
+            @row-click="rowClick">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
+            <el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
+        </el-table>
+        <!--  分页-->
+        <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
+            @pagination="search"></pagination>
+        <!--  底部-->
+        <div slot="footer">
+            <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
+            <el-button @click="quit" size="small">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
+export default {
+    name: "SelectUser",
+    dicts: ['sys_user_sex'],
+    props: {
+        open: {
+            type: Boolean,
+            require: true
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        width: {
+            type: [Number, String],
+            default: '50%'
+        },
+        execute: {
+            type: [String]
+        },
+        // 选择级部、处室主任
+        id: {
+            type: [Number, String]
+        }
+    },
+    data() {
+        return {
+            baseURL: process.env.VUE_APP_BASE_API,
+            form: {
+                userName: '',
+                phone: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            total: 0,
+            loading: false,
+            userList: [],
+            selectUser: null
+        }
+    },
+    computed: {
+        openDialog: {
+            get() {
+                return this.open;
+            },
+            set(value) {
+                this.$emit('update:open', value);
+            }
+        }
+    },
+    watch: {
+        open(value) {
+            if (value) {
+                this.$nextTick(() => {
+                    this.reset();
+                })
+            }
+        }
+    },
+
+    methods: {
+        /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
+        async search() {
+            if (isNaN(Number(this.id))) {
+                console.error('Invalid ID');
+                return;
+            }
+
+            try {
+                this.loading = true;
+                const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
+                this.userList = response.rows || [];
+                this.total = response.total;
+                this.loading = false;
+            } catch (exception) {
+                this.loading = false;
+                throw new Error(exception);
+            }
+        },
+
+        /** 重置表单 */
+        reset() {
+            this.form = {
+                teacherName: '',
+                teacherTel: '',
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm('form');
+            this.search();
+        },
+        /** 选项选中发生变化 */
+        selectionChange(selections) {
+            this.selectUser = selections[0];
+        },
+        /** 点击选中、取消 */
+        rowClick(row, column) {
+            console.log('row', row);
+            this.$refs['tableList'].clearSelection();
+            this.$refs['tableList'].toggleRowSelection(row, true);
+        },
+        /** 提交选中 */
+        submit() {
+            this.$emit('select', {
+                id: this.selectUser.userId,
+                name: this.selectUser.userName,
+                tel: this.selectUser.phone
+            });
+            this.quit();
+        },
+        /** 取消 */
+        quit() {
+            this.openDialog = false;
+        },
+
+
+
+        /** 分管领导、主要领导 */
+        leaderList(form) {
+            return getUserList(form);
+        },
+        dialogClose() {
+            this.userList = []
+        }
+    }
+}
+</script>
+
+<style scoped>
+.footer {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+}
+
+.radius-image {
+    border-radius: 40px;
+}
+</style>

ruoyi-ui/src/views/smartSchool/personWork/essaysWritings/components/SelectUser.vue

+<template>
+    <el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
+        <!--  模糊查询-->
+        <el-form :model="form" ref="form" size="small" inline>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
+                    @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
+                <el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!--  列表数据-->
+        <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
+            @row-click="rowClick">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
+            <el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
+        </el-table>
+        <!--  分页-->
+        <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
+            @pagination="search"></pagination>
+        <!--  底部-->
+        <div slot="footer">
+            <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
+            <el-button @click="quit" size="small">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
+export default {
+    name: "SelectUser",
+    dicts: ['sys_user_sex'],
+    props: {
+        open: {
+            type: Boolean,
+            require: true
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        width: {
+            type: [Number, String],
+            default: '50%'
+        },
+        execute: {
+            type: [String]
+        },
+        // 选择级部、处室主任
+        id: {
+            type: [Number, String]
+        }
+    },
+    data() {
+        return {
+            baseURL: process.env.VUE_APP_BASE_API,
+            form: {
+                userName: '',
+                phone: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            total: 0,
+            loading: false,
+            userList: [],
+            selectUser: null
+        }
+    },
+    computed: {
+        openDialog: {
+            get() {
+                return this.open;
+            },
+            set(value) {
+                this.$emit('update:open', value);
+            }
+        }
+    },
+    watch: {
+        open(value) {
+            if (value) {
+                this.$nextTick(() => {
+                    this.reset();
+                })
+            }
+        }
+    },
+
+    methods: {
+        /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
+        async search() {
+            if (isNaN(Number(this.id))) {
+                console.error('Invalid ID');
+                return;
+            }
+
+            try {
+                this.loading = true;
+                const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
+                this.userList = response.rows || [];
+                this.total = response.total;
+                this.loading = false;
+            } catch (exception) {
+                this.loading = false;
+                throw new Error(exception);
+            }
+        },
+
+        /** 重置表单 */
+        reset() {
+            this.form = {
+                teacherName: '',
+                teacherTel: '',
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm('form');
+            this.search();
+        },
+        /** 选项选中发生变化 */
+        selectionChange(selections) {
+            this.selectUser = selections[0];
+        },
+        /** 点击选中、取消 */
+        rowClick(row, column) {
+            console.log('row', row);
+            this.$refs['tableList'].clearSelection();
+            this.$refs['tableList'].toggleRowSelection(row, true);
+        },
+        /** 提交选中 */
+        submit() {
+            this.$emit('select', {
+                id: this.selectUser.userId,
+                name: this.selectUser.userName,
+                tel: this.selectUser.phone
+            });
+            this.quit();
+        },
+        /** 取消 */
+        quit() {
+            this.openDialog = false;
+        },
+
+
+
+        /** 分管领导、主要领导 */
+        leaderList(form) {
+            return getUserList(form);
+        },
+        dialogClose() {
+            this.userList = []
+        }
+    }
+}
+</script>
+
+<style scoped>
+.footer {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+}
+
+.radius-image {
+    border-radius: 40px;
+}
+</style>

ruoyi-ui/src/views/smartSchool/personWork/lectureAwards/components/SelectUser.vue

+<template>
+    <el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
+        <!--  模糊查询-->
+        <el-form :model="form" ref="form" size="small" inline>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
+                    @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
+                <el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!--  列表数据-->
+        <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
+            @row-click="rowClick">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
+            <el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
+        </el-table>
+        <!--  分页-->
+        <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
+            @pagination="search"></pagination>
+        <!--  底部-->
+        <div slot="footer">
+            <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
+            <el-button @click="quit" size="small">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
+export default {
+    name: "SelectUser",
+    dicts: ['sys_user_sex'],
+    props: {
+        open: {
+            type: Boolean,
+            require: true
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        width: {
+            type: [Number, String],
+            default: '50%'
+        },
+        execute: {
+            type: [String]
+        },
+        // 选择级部、处室主任
+        id: {
+            type: [Number, String]
+        }
+    },
+    data() {
+        return {
+            baseURL: process.env.VUE_APP_BASE_API,
+            form: {
+                userName: '',
+                phone: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            total: 0,
+            loading: false,
+            userList: [],
+            selectUser: null
+        }
+    },
+    computed: {
+        openDialog: {
+            get() {
+                return this.open;
+            },
+            set(value) {
+                this.$emit('update:open', value);
+            }
+        }
+    },
+    watch: {
+        open(value) {
+            if (value) {
+                this.$nextTick(() => {
+                    this.reset();
+                })
+            }
+        }
+    },
+
+    methods: {
+        /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
+        async search() {
+            if (isNaN(Number(this.id))) {
+                console.error('Invalid ID');
+                return;
+            }
+
+            try {
+                this.loading = true;
+                const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
+                this.userList = response.rows || [];
+                this.total = response.total;
+                this.loading = false;
+            } catch (exception) {
+                this.loading = false;
+                throw new Error(exception);
+            }
+        },
+
+        /** 重置表单 */
+        reset() {
+            this.form = {
+                teacherName: '',
+                teacherTel: '',
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm('form');
+            this.search();
+        },
+        /** 选项选中发生变化 */
+        selectionChange(selections) {
+            this.selectUser = selections[0];
+        },
+        /** 点击选中、取消 */
+        rowClick(row, column) {
+            console.log('row', row);
+            this.$refs['tableList'].clearSelection();
+            this.$refs['tableList'].toggleRowSelection(row, true);
+        },
+        /** 提交选中 */
+        submit() {
+            this.$emit('select', {
+                id: this.selectUser.userId,
+                name: this.selectUser.userName,
+                tel: this.selectUser.phone
+            });
+            this.quit();
+        },
+        /** 取消 */
+        quit() {
+            this.openDialog = false;
+        },
+
+
+
+        /** 分管领导、主要领导 */
+        leaderList(form) {
+            return getUserList(form);
+        },
+        dialogClose() {
+            this.userList = []
+        }
+    }
+}
+</script>
+
+<style scoped>
+.footer {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+}
+
+.radius-image {
+    border-radius: 40px;
+}
+</style>

ruoyi-ui/src/views/smartSchool/personWork/teacherAwards/components/SelectUser.vue

+<template>
+    <el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
+        <!--  模糊查询-->
+        <el-form :model="form" ref="form" size="small" inline>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable
+                    @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model.trim="form.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
+                <el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!--  列表数据-->
+        <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
+            @row-click="rowClick">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column key="userName" prop="userName" label="姓名" align="center"></el-table-column>
+            <el-table-column key="phone" prop="phone" label="联系电话" align="center"></el-table-column>
+        </el-table>
+        <!--  分页-->
+        <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
+            @pagination="search"></pagination>
+        <!--  底部-->
+        <div slot="footer">
+            <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
+            <el-button @click="quit" size="small">取 消</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import { getUserList } from "@/api/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors";
+export default {
+    name: "SelectUser",
+    dicts: ['sys_user_sex'],
+    props: {
+        open: {
+            type: Boolean,
+            require: true
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+        width: {
+            type: [Number, String],
+            default: '50%'
+        },
+        execute: {
+            type: [String]
+        },
+        // 选择级部、处室主任
+        id: {
+            type: [Number, String]
+        }
+    },
+    data() {
+        return {
+            baseURL: process.env.VUE_APP_BASE_API,
+            form: {
+                userName: '',
+                phone: '',
+                pageNum: 1,
+                pageSize: 10
+            },
+            total: 0,
+            loading: false,
+            userList: [],
+            selectUser: null
+        }
+    },
+    computed: {
+        openDialog: {
+            get() {
+                return this.open;
+            },
+            set(value) {
+                this.$emit('update:open', value);
+            }
+        }
+    },
+    watch: {
+        open(value) {
+            if (value) {
+                this.$nextTick(() => {
+                    this.reset();
+                })
+            }
+        }
+    },
+
+    methods: {
+        /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
+        async search() {
+            if (isNaN(Number(this.id))) {
+                console.error('Invalid ID');
+                return;
+            }
+
+            try {
+                this.loading = true;
+                const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
+                this.userList = response.rows || [];
+                this.total = response.total;
+                this.loading = false;
+            } catch (exception) {
+                this.loading = false;
+                throw new Error(exception);
+            }
+        },
+
+        /** 重置表单 */
+        reset() {
+            this.form = {
+                teacherName: '',
+                teacherTel: '',
+                pageNum: 1,
+                pageSize: 10
+            };
+            this.resetForm('form');
+            this.search();
+        },
+        /** 选项选中发生变化 */
+        selectionChange(selections) {
+            this.selectUser = selections[0];
+        },
+        /** 点击选中、取消 */
+        rowClick(row, column) {
+            console.log('row', row);
+            this.$refs['tableList'].clearSelection();
+            this.$refs['tableList'].toggleRowSelection(row, true);
+        },
+        /** 提交选中 */
+        submit() {
+            this.$emit('select', {
+                id: this.selectUser.userId,
+                name: this.selectUser.userName,
+                tel: this.selectUser.phone
+            });
+            this.quit();
+        },
+        /** 取消 */
+        quit() {
+            this.openDialog = false;
+        },
+
+
+
+        /** 分管领导、主要领导 */
+        leaderList(form) {
+            return getUserList(form);
+        },
+        dialogClose() {
+            this.userList = []
+        }
+    }
+}
+</script>
+
+<style scoped>
+.footer {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+}
+
+.radius-image {
+    border-radius: 40px;
+}
+</style>

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAnnualAssessment/SchoolAnnualAssessmentController.java

@@ -5,22 +5,15 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
-import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessmentExport;
-import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasiclnExport;
 import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
-import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentController.java

+package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 班主任考核Controller
+ * 
+ * @author ruoyi
+ * @date 2023-12-12
+ */
+@RestController
+@RequestMapping("/assessment")
+public class SchoolAclassTeacherAssessmentController extends BaseController
+{
+    @Autowired
+    private ISchoolAclassTeacherAssessmentService schoolAclassTeacherAssessmentService;
+    private Logger log = LoggerFactory.getLogger(SchoolAworkloadController.class);
+
+    /**
+     * 查询班主任考核列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolAclassTeacherAssessmentReq req)
+    {
+        startPage();
+        List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取班主任考核详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentById(id));
+    }
+
+    /**
+     * 新增班主任考核
+     */
+    @Log(title = "班主任考核", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolAclassTeacherAssessment schoolAclassTeacherAssessment)
+    {
+        return toAjax(schoolAclassTeacherAssessmentService.insertSchoolAclassTeacherAssessment(schoolAclassTeacherAssessment));
+    }
+
+    /**
+     * 修改班主任考核
+     */
+    @Log(title = "班主任考核", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolAclassTeacherAssessment schoolAclassTeacherAssessment)
+    {
+        return toAjax(schoolAclassTeacherAssessmentService.updateSchoolAclassTeacherAssessment(schoolAclassTeacherAssessment));
+    }
+
+    /**
+     * 删除班主任考核
+     */
+    @Log(title = "班主任考核", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolAclassTeacherAssessmentService.deleteSchoolAclassTeacherAssessmentByIds(ids));
+    }
+
+    /**
+     * 末班下载
+     * @param response
+     * @throws Exception
+     */
+    @PostMapping(value = "/download")
+    public void downloadFile(HttpServletResponse response) throws Exception {
+        // 以流的形式下载文件。
+        try {
+            //读取文件
+            InputStream resourceAsStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("file/班主任任职导入模板.xlsx");
+            InputStream fis = new BufferedInputStream(resourceAsStream);
+            byte[] buffer = new byte[fis.available()];
+            fis.read(buffer);
+            fis.close();
+            // 清空response
+            response.reset();
+            // 设置response的Header
+            response.setHeader("Content-Disposition", "attachment;filename="+java.net.URLEncoder.encode("班主任导入模板.xlsx", "utf-8"));
+            //response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes()));
+            response.addHeader("Content-Length", "" + buffer.length);
+            OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
+            response.setContentType("application/octet-stream");
+            toClient.write(buffer);
+            toClient.flush();
+            toClient.close();
+        } catch (IOException e) {
+            log.info(e.getMessage());
+        }
+    }
+
+    /**
+     * 导入
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        List<SchoolAclassTeacherAssessment> list = new ArrayList<>();
+        ExcelUtil<SchoolAclassTeacherAssessment> util = new ExcelUtil<SchoolAclassTeacherAssessment>(SchoolAclassTeacherAssessment.class);
+        List<SchoolAclassTeacherAssessment> detailList = util.importExceltoRow(file.getInputStream(),1);
+        //1.导入
+        boolean b = schoolAclassTeacherAssessmentService.saveBatch(detailList);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 导出
+     * @param
+     * @return
+     */
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolAclassTeacherAssessmentReq req ) throws Exception{
+        List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
+        ExcelUtil<SchoolAclassTeacherAssessment> util = new ExcelUtil<>(SchoolAclassTeacherAssessment.class);
+        util.exportExcel(response, schoolAclassTeacherAssessmentVos, "老师考核");
+    }
+
+
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAworkloadController.java

+package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService;
+
+/**
+ * 工作量信息Controller
+ * 
+ * @author ruoyi
+ * @date 2023-12-11
+ */
+@RestController
+@RequestMapping("/aworkload")
+public class SchoolAworkloadController extends BaseController
+{
+    @Autowired
+    private ISchoolAworkloadService schoolAworkloadService;
+    private Logger log = LoggerFactory.getLogger(SchoolAworkloadController.class);
+
+    /**
+     * 查询工作量信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolAworkload schoolAworkload)
+    {
+        startPage();
+        List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkload);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取工作量信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolAworkloadService.selectSchoolAworkloadById(id));
+    }
+
+    /**
+     * 新增工作量信息
+     */
+    @Log(title = "工作量信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolAworkload schoolAworkload)
+    {
+        return toAjax(schoolAworkloadService.insertSchoolAworkload(schoolAworkload));
+    }
+
+    /**
+     * 修改工作量信息
+     */
+    @Log(title = "工作量信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolAworkload schoolAworkload)
+    {
+        return toAjax(schoolAworkloadService.updateSchoolAworkload(schoolAworkload));
+    }
+
+    /**
+     * 删除工作量信息
+     */
+    @Log(title = "工作量信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolAworkloadService.deleteSchoolAworkloadByIds(ids));
+    }
+
+    @PostMapping(value = "/download")
+    public void downloadFile(HttpServletResponse response) throws Exception {
+        // 以流的形式下载文件。
+        try {
+            //读取文件
+            InputStream resourceAsStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("file/工作量信息导入模板.xlsx");
+            InputStream fis = new BufferedInputStream(resourceAsStream);
+            byte[] buffer = new byte[fis.available()];
+            fis.read(buffer);
+            fis.close();
+            // 清空response
+            response.reset();
+            // 设置response的Header
+            response.setHeader("Content-Disposition", "attachment;filename="+java.net.URLEncoder.encode("工作量信息导入模板.xlsx", "utf-8"));
+            //response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes()));
+            response.addHeader("Content-Length", "" + buffer.length);
+            OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
+            response.setContentType("application/octet-stream");
+            toClient.write(buffer);
+            toClient.flush();
+            toClient.close();
+        } catch (IOException e) {
+            log.info(e.getMessage());
+        }
+    }
+
+    /**
+     * 导入
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        List<SchoolAworkload> list = new ArrayList<>();
+        ExcelUtil<SchoolAworkloadExport> util = new ExcelUtil<SchoolAworkloadExport>(SchoolAworkloadExport.class);
+        List<SchoolAworkloadExport> detailList = util.importExceltoRow(file.getInputStream(),1);
+        //1.导入
+        for (SchoolAworkloadExport date :detailList){
+            SchoolAworkload schoolAworkload = new SchoolAworkload();
+            BeanUtils.copyProperties(date,schoolAworkload);
+            list.add(schoolAworkload);
+        }
+        boolean b = schoolAworkloadService.saveBatch(list);
+        return AjaxResult.success(b);
+    }
+
+    /**
+     * 导出
+     * @param
+     * @return
+     */
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolAworkload schoolAworkload ) throws Exception{
+        List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkload);
+        ExcelUtil<SchoolAworkloadExport> util = new ExcelUtil<>(SchoolAworkloadExport.class);
+        util.exportExcel(response, schoolAworkloadVos, "工作量内容");
+    }
+
+
+
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/SchoolTeacherBasiclnformationController.java → smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java

-package yangtz.cs.liu.campus.controller.teacherFiles;
+package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
 
-import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.core.controller.BaseController;
@@ -14,16 +13,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
-import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
-import yangtz.cs.liu.campus.domain.student.SchoolStudentEvaluate;
-import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasicInformation;
-import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasiclnExport;
-import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasiclnExport;
 import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils;
-import yangtz.cs.liu.campus.service.teacherFiles.SchoolTeacherBasichlnformationService;
-import yangtz.cs.liu.campus.vo.schoolClass.SchoolClassDrVo;
-import yangtz.cs.liu.wechat.controller.api.WxApiController;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
+
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -48,9 +43,9 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
      * @return
      */
     @GetMapping("/list")
-    public TableDataInfo list(SchoolTeacherBasicInformation information) throws  Exception{
+    public TableDataInfo list(SchoolTeacherBasicInformationVo information) throws  Exception{
         startPage();
-        List<SchoolTeacherBasicInformation> list = basichlnformationService.list(information);
+        List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
         return getDataTable(list);
     }
 
@@ -59,7 +54,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
      */
     @GetMapping("/{id}")
     public AjaxResult getById(@PathVariable("id") Long id ) throws Exception{
-        return AjaxResult.success(basichlnformationService.getById(id));
+        return AjaxResult.success(basichlnformationService.getByIds(id));
     }
 
     /**
@@ -87,6 +82,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
      */
     @PutMapping("/update")
     public AjaxResult update(@RequestBody SchoolTeacherBasicInformation information){
+
         return AjaxResult.success(basichlnformationService.updateById(information));
     }
 
@@ -160,8 +156,8 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
      * @param
      * @return
      */
-    @PostMapping("/export")
-    public void export(HttpServletResponse response,@RequestBody SchoolTeacherBasiclnExport export ) throws Exception{
+   @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolTeacherBasiclnExport export ) throws Exception{
         List<SchoolTeacherBasicInformation> list = new ArrayList<>();
         List<SchoolTeacherBasiclnExport> exportList = new ArrayList<>();
         ExcelUtil<SchoolTeacherBasiclnExport> util = new ExcelUtil<>(SchoolTeacherBasiclnExport.class);
@@ -217,6 +213,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
                         .or()
                         .like(SchoolTeacherBasicInformation::getLastDegree,export.getFirstDegree()));
             }
+            wrapper.eq(SchoolTeacherBasicInformation::getDelFlag,"0");
             //查询出来结果复制
             List<SchoolTeacherBasicInformation> list1 = basichlnformationService.list(wrapper);
             list1.forEach(date->{
@@ -227,4 +224,14 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
             util.exportExcel(response, exportList, "教师基本信息");
         }
     }
+
+
+    /*
+     * 批量导入老师照片
+     * */
+    @PostMapping("/importTeacherPicture")
+    public AjaxResult importTeacherPicture(MultipartFile file){
+        return AjaxResult.success(basichlnformationService.importTeacherPicture(file));
+    }
+
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +22,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXacademicWorksService;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
 
 /**
  * 论文著作Controller
@@ -37,29 +40,71 @@ public class SchoolXacademicWorksController extends BaseController
     /**
      * 查询论文著作列表
      */
+//    @PreAuthorize("@ss.hasPermi('system:works:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SchoolXacademicWorks schoolXacademicWorks)
+    public TableDataInfo list(SchoolXacademicWorksVo schoolXacademicWorksVo)
+    {
+        startPage();
+        List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询论文著作列表(个人)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:works:listGr')")
+    @GetMapping("/listGr")
+    public TableDataInfo listGr(SchoolXacademicWorksVo schoolXacademicWorksVo)
     {
+        schoolXacademicWorksVo.setUserId(SecurityUtils.getUserId());
         startPage();
-        List<SchoolXacademicWorks> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorks);
+        List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
         return getDataTable(list);
     }
 
     /**
+     * 导出论文著作列表(个人)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:works:exportGr')")
+    @Log(title = "论文著作", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportGr")
+    public void exportGr(HttpServletResponse response, @RequestBody SchoolXacademicWorksVo schoolXacademicWorksVo)
+    {
+        int i = 0;
+        schoolXacademicWorksVo.setUserId(SecurityUtils.getUserId());
+        List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
+        for (SchoolXacademicWorksVo xacademicWorksVo : list) {
+            i ++;
+            xacademicWorksVo.setXh(i);
+            xacademicWorksVo.setGrowthType("论文论著");
+        }
+        ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
+        util.exportExcel(response, list, "论文著作数据");
+    }
+
+    /**
      * 导出论文著作列表
      */
+//    @PreAuthorize("@ss.hasPermi('system:works:export')")
     @Log(title = "论文著作", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SchoolXacademicWorks schoolXacademicWorks)
+    public void export(HttpServletResponse response, @RequestBody SchoolXacademicWorksVo schoolXacademicWorksVo)
     {
-        List<SchoolXacademicWorks> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorks);
-        ExcelUtil<SchoolXacademicWorks> util = new ExcelUtil<SchoolXacademicWorks>(SchoolXacademicWorks.class);
+        int i = 0;
+        List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
+        for (SchoolXacademicWorksVo xacademicWorksVo : list) {
+            i ++;
+            xacademicWorksVo.setXh(i);
+            xacademicWorksVo.setGrowthType("论文论著");
+        }
+        ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
         util.exportExcel(response, list, "论文著作数据");
     }
 
     /**
      * 获取论文著作详细信息
      */
+//    @PreAuthorize("@ss.hasPermi('system:works:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -69,6 +114,7 @@ public class SchoolXacademicWorksController extends BaseController
     /**
      * 新增论文著作
      */
+//    @PreAuthorize("@ss.hasPermi('system:works:add')")
     @Log(title = "论文著作", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SchoolXacademicWorks schoolXacademicWorks)
@@ -79,6 +125,7 @@ public class SchoolXacademicWorksController extends BaseController
     /**
      * 修改论文著作
      */
+//    @PreAuthorize("@ss.hasPermi('system:works:edit')")
     @Log(title = "论文著作", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SchoolXacademicWorks schoolXacademicWorks)
@@ -89,10 +136,20 @@ public class SchoolXacademicWorksController extends BaseController
     /**
      * 删除论文著作
      */
+//    @PreAuthorize("@ss.hasPermi('system:works:remove')")
     @Log(title = "论文著作", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(schoolXacademicWorksService.deleteSchoolXacademicWorksByIds(ids));
     }
+
+    /**
+     * 审核
+     */
+//    @PreAuthorize("@ss.hasPermi('system:works:audit')")
+    @PostMapping("/audit")
+    public AjaxResult audit(@RequestBody SchoolXacademicWorks schoolXacademicWorks){
+        return toAjax(schoolXacademicWorksService.audit(schoolXacademicWorks));
+    }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +22,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXcomprehensiveHonors;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXcomprehensiveHonorsService;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
 
 /**
  * 综合荣誉Controller
@@ -37,29 +40,71 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
     /**
      * 查询综合荣誉列表
      */
+//    @PreAuthorize("@ss.hasPermi('system:honors:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    public TableDataInfo list(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
+    {
+        startPage();
+        List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询综合荣誉列表(个人)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:honors:listGr')")
+    @GetMapping("/listGr")
+    public TableDataInfo listGr(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
     {
+        schoolXcomprehensiveHonorsVo.setUserId(SecurityUtils.getUserId());
         startPage();
-        List<SchoolXcomprehensiveHonors> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonors);
+        List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
         return getDataTable(list);
     }
 
     /**
+     * 导出综合荣誉列表(个人)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:honors:exportGr')")
+    @Log(title = "综合荣誉", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportGr")
+    public void exportGr(HttpServletResponse response, @RequestBody SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
+    {
+        int i = 0;
+        schoolXcomprehensiveHonorsVo.setUserId(SecurityUtils.getUserId());
+        List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
+        for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
+            i ++;
+            xcomprehensiveHonorsVo.setXh(i);
+            xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
+        }
+        ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
+        util.exportExcel(response, list, "综合荣誉数据");
+    }
+
+    /**
      * 导出综合荣誉列表
      */
+//    @PreAuthorize("@ss.hasPermi('system:honors:export')")
     @Log(title = "综合荣誉", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    public void export(HttpServletResponse response, @RequestBody SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
     {
-        List<SchoolXcomprehensiveHonors> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonors);
-        ExcelUtil<SchoolXcomprehensiveHonors> util = new ExcelUtil<SchoolXcomprehensiveHonors>(SchoolXcomprehensiveHonors.class);
+        int i = 0;
+        List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
+        for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
+            i ++;
+            xcomprehensiveHonorsVo.setXh(i);
+            xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
+        }
+        ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
         util.exportExcel(response, list, "综合荣誉数据");
     }
 
     /**
      * 获取综合荣誉详细信息
      */
+//    @PreAuthorize("@ss.hasPermi('system:honors:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -69,6 +114,7 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
     /**
      * 新增综合荣誉
      */
+//    @PreAuthorize("@ss.hasPermi('system:honors:add')")
     @Log(title = "综合荣誉", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
@@ -79,6 +125,7 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
     /**
      * 修改综合荣誉
      */
+//    @PreAuthorize("@ss.hasPermi('system:honors:edit')")
     @Log(title = "综合荣誉", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
@@ -89,10 +136,20 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
     /**
      * 删除综合荣誉
      */
+//    @PreAuthorize("@ss.hasPermi('system:honors:remove')")
     @Log(title = "综合荣誉", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(schoolXcomprehensiveHonorsService.deleteSchoolXcomprehensiveHonorsByIds(ids));
     }
+
+    /**
+     * 审核
+     */
+//    @PreAuthorize("@ss.hasPermi('system:honors:audit')")
+    @PostMapping("/audit")
+    public AjaxResult audit(@RequestBody SchoolXcomprehensiveHonors schoolXcomprehensiveHonors){
+        return toAjax(schoolXcomprehensiveHonorsService.audit(schoolXcomprehensiveHonors));
+    }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +22,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXlectureAwardsService;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
 
 /**
  * 讲课获奖Controller
@@ -37,32 +40,71 @@ public class SchoolXlectureAwardsController extends BaseController
     /**
      * 查询讲课获奖列表
      */
-    @PreAuthorize("@ss.hasPermi('system:awards:list')")
+//    @PreAuthorize("@ss.hasPermi('system:awards:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SchoolXlectureAwards schoolXlectureAwards)
+    public TableDataInfo list(SchoolXlectureAwardsVo schoolXlectureAwardsVo)
+    {
+        startPage();
+        List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询讲课获奖列表(个人)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:awards:listGr')")
+    @GetMapping("/listGr")
+    public TableDataInfo listGr(SchoolXlectureAwardsVo schoolXlectureAwardsVo)
     {
+        schoolXlectureAwardsVo.setUserId(SecurityUtils.getUserId());
         startPage();
-        List<SchoolXlectureAwards> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwards);
+        List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
         return getDataTable(list);
     }
 
     /**
+     * 导出讲课获奖列表(个人)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:awards:exportGr')")
+    @Log(title = "讲课获奖", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportGr")
+    public void exportGr(HttpServletResponse response, @RequestBody SchoolXlectureAwardsVo schoolXlectureAwardsVo)
+    {
+        int i = 0;
+        schoolXlectureAwardsVo.setUserId(SecurityUtils.getUserId());
+        List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
+        for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
+            i ++;
+            xlectureAwardsVo.setXh(i);
+            xlectureAwardsVo.setGrowthType("讲课获奖");
+        }
+        ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
+        util.exportExcel(response, list, "讲课获奖数据");
+    }
+
+    /**
      * 导出讲课获奖列表
      */
-    @PreAuthorize("@ss.hasPermi('system:awards:export')")
+//    @PreAuthorize("@ss.hasPermi('system:awards:export')")
     @Log(title = "讲课获奖", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SchoolXlectureAwards schoolXlectureAwards)
+    public void export(HttpServletResponse response, @RequestBody SchoolXlectureAwardsVo schoolXlectureAwardsVo)
     {
-        List<SchoolXlectureAwards> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwards);
-        ExcelUtil<SchoolXlectureAwards> util = new ExcelUtil<SchoolXlectureAwards>(SchoolXlectureAwards.class);
+        int i = 0;
+        List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
+        for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
+            i ++;
+            xlectureAwardsVo.setXh(i);
+            xlectureAwardsVo.setGrowthType("讲课获奖");
+        }
+        ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
         util.exportExcel(response, list, "讲课获奖数据");
     }
 
     /**
      * 获取讲课获奖详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:awards:query')")
+//    @PreAuthorize("@ss.hasPermi('system:awards:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +114,7 @@ public class SchoolXlectureAwardsController extends BaseController
     /**
      * 新增讲课获奖
      */
-    @PreAuthorize("@ss.hasPermi('system:awards:add')")
+//    @PreAuthorize("@ss.hasPermi('system:awards:add')")
     @Log(title = "讲课获奖", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SchoolXlectureAwards schoolXlectureAwards)
@@ -83,7 +125,7 @@ public class SchoolXlectureAwardsController extends BaseController
     /**
      * 修改讲课获奖
      */
-    @PreAuthorize("@ss.hasPermi('system:awards:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:awards:edit')")
     @Log(title = "讲课获奖", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SchoolXlectureAwards schoolXlectureAwards)
@@ -94,11 +136,20 @@ public class SchoolXlectureAwardsController extends BaseController
     /**
      * 删除讲课获奖
      */
-    @PreAuthorize("@ss.hasPermi('system:awards:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:awards:remove')")
     @Log(title = "讲课获奖", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(schoolXlectureAwardsService.deleteSchoolXlectureAwardsByIds(ids));
     }
+
+    /**
+     * 审核
+     */
+//    @PreAuthorize("@ss.hasPermi('system:awards:audit')")
+    @PostMapping("/audit")
+    public AjaxResult audit(@RequestBody SchoolXlectureAwards schoolXlectureAwards){
+        return toAjax(schoolXlectureAwardsService.audit(schoolXlectureAwards));
+    }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java

@@ -2,7 +2,10 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -19,6 +22,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteacherAwardsService;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
 
 /**
  * 教师获奖Controller
@@ -36,29 +40,71 @@ public class SchoolXteacherAwardsController extends BaseController
     /**
      * 查询教师获奖列表
      */
+//    @PreAuthorize("@ss.hasPermi('system:awards:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SchoolXteacherAwards schoolXteacherAwards)
+    public TableDataInfo list(SchoolXteacherAwardsVo schoolXteacherAwardsVo)
+    {
+        startPage();
+        List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询教师获奖列表(个人)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:awards:listGr')")
+    @GetMapping("/listGr")
+    public TableDataInfo listGr(SchoolXteacherAwardsVo schoolXteacherAwardsVo)
     {
+        schoolXteacherAwardsVo.setUserId(SecurityUtils.getUserId());
         startPage();
-        List<SchoolXteacherAwards> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwards);
+        List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
         return getDataTable(list);
     }
 
     /**
+     * 导出教师获奖列表(个人)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:awards:exportGr')")
+    @Log(title = "教师获奖", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportGr")
+    public void exportGr(HttpServletResponse response,@RequestBody SchoolXteacherAwardsVo schoolXteacherAwardsVo)
+    {
+        int i = 0;
+        schoolXteacherAwardsVo.setUserId(SecurityUtils.getUserId());
+        List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
+        for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
+            i ++;
+            xteacherAwardsVo.setXh(i);
+            xteacherAwardsVo.setGrowthType("教学获奖");
+        }
+        ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
+        util.exportExcel(response, list, "教师获奖数据");
+    }
+
+    /**
      * 导出教师获奖列表
      */
+//    @PreAuthorize("@ss.hasPermi('system:awards:export')")
     @Log(title = "教师获奖", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SchoolXteacherAwards schoolXteacherAwards)
+    public void export(HttpServletResponse response,@RequestBody SchoolXteacherAwardsVo schoolXteacherAwardsVo)
     {
-        List<SchoolXteacherAwards> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwards);
-        ExcelUtil<SchoolXteacherAwards> util = new ExcelUtil<SchoolXteacherAwards>(SchoolXteacherAwards.class);
+        int i = 0;
+        List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
+        for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
+            i ++;
+            xteacherAwardsVo.setXh(i);
+            xteacherAwardsVo.setGrowthType("教学获奖");
+        }
+        ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
         util.exportExcel(response, list, "教师获奖数据");
     }
 
     /**
      * 获取教师获奖详细信息
      */
+//    @PreAuthorize("@ss.hasPermi('system:awards:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -68,6 +114,7 @@ public class SchoolXteacherAwardsController extends BaseController
     /**
      * 新增教师获奖
      */
+//    @PreAuthorize("@ss.hasPermi('system:awards:add')")
     @Log(title = "教师获奖", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SchoolXteacherAwards schoolXteacherAwards)
@@ -78,6 +125,7 @@ public class SchoolXteacherAwardsController extends BaseController
     /**
      * 修改教师获奖
      */
+//    @PreAuthorize("@ss.hasPermi('system:awards:edit')")
     @Log(title = "教师获奖", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SchoolXteacherAwards schoolXteacherAwards)
@@ -88,10 +136,20 @@ public class SchoolXteacherAwardsController extends BaseController
     /**
      * 删除教师获奖
      */
+//    @PreAuthorize("@ss.hasPermi('system:awards:remove')")
     @Log(title = "教师获奖", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(schoolXteacherAwardsService.deleteSchoolXteacherAwardsByIds(ids));
     }
+
+    /**
+     * 审核
+     */
+//    @PreAuthorize("@ss.hasPermi('system:awards:audit')")
+    @PostMapping("/audit")
+    public AjaxResult audit(@RequestBody SchoolXteacherAwards schoolXteacherAwards){
+        return toAjax(schoolXteacherAwardsService.audit(schoolXteacherAwards));
+    }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java

 package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
 
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -18,8 +22,11 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
 
 /**
  * 教学成绩Controller
@@ -37,29 +44,61 @@ public class SchoolXteachingAchievementsController extends BaseController
     /**
      * 查询教学成绩列表
      */
+//    @PreAuthorize("@ss.hasPermi('system:achievements:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SchoolXteachingAchievements schoolXteachingAchievements)
+    public TableDataInfo list(SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
     {
         startPage();
-        List<SchoolXteachingAchievements> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievements);
+        List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
         return getDataTable(list);
     }
 
     /**
      * 导出教学成绩列表
      */
+//    @PreAuthorize("@ss.hasPermi('system:achievements:export')")
     @Log(title = "教学成绩", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SchoolXteachingAchievements schoolXteachingAchievements)
+    public void export(HttpServletResponse response, @RequestBody SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
     {
-        List<SchoolXteachingAchievements> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievements);
-        ExcelUtil<SchoolXteachingAchievements> util = new ExcelUtil<SchoolXteachingAchievements>(SchoolXteachingAchievements.class);
+        int i = 0;
+        List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
+        for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
+            i ++;
+            schoolXteachingAchievementsVo1.setXh(i);
+        }
+        ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
         util.exportExcel(response, list, "教学成绩数据");
     }
 
+    /*
+     * 下载模板
+     * */
+    @PostMapping("/importTemplate")
+    public void importTemplate (HttpServletResponse response) {
+        schoolXteachingAchievementsService.importTemplate(response);
+    }
+
+    /**
+     * 导入教学成绩
+     */
+//    @PreAuthorize("@ss.hasPermi('system:achievements:importData')")
+    @PostMapping("/importData")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        ExcelUtil<SchoolXteachingAchievements> util = new ExcelUtil<SchoolXteachingAchievements>(SchoolXteachingAchievements.class);
+        List<SchoolXteachingAchievements> list = util.importExcelNdkh(file.getInputStream());
+        //先校验
+        schoolXteachingAchievementsService.checkImport(list);
+        //数据导入
+        String message = schoolXteachingAchievementsService.importData(list);
+        return AjaxResult.success(message);
+    }
+
     /**
      * 获取教学成绩详细信息
      */
+//    @PreAuthorize("@ss.hasPermi('system:achievements:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -69,6 +108,7 @@ public class SchoolXteachingAchievementsController extends BaseController
     /**
      * 新增教学成绩
      */
+//    @PreAuthorize("@ss.hasPermi('system:achievements:add')")
     @Log(title = "教学成绩", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SchoolXteachingAchievements schoolXteachingAchievements)
@@ -79,6 +119,7 @@ public class SchoolXteachingAchievementsController extends BaseController
     /**
      * 修改教学成绩
      */
+//    @PreAuthorize("@ss.hasPermi('system:achievements:edit')")
     @Log(title = "教学成绩", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SchoolXteachingAchievements schoolXteachingAchievements)
@@ -89,10 +130,21 @@ public class SchoolXteachingAchievementsController extends BaseController
     /**
      * 删除教学成绩
      */
+//    @PreAuthorize("@ss.hasPermi('system:achievements:remove')")
     @Log(title = "教学成绩", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(schoolXteachingAchievementsService.deleteSchoolXteachingAchievementsByIds(ids));
     }
+
+    /**
+     * 获取所有用户
+     */
+    @GetMapping("/getUserList")
+    public TableDataInfo getUserList(SysUser sysUser){
+        startPage();
+        List<Map<String, Object>> list = schoolXteachingAchievementsService.getUserList(sysUser);
+        return getDataTable(list);
+    }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/curricula/CurriclaStudentVo.java

@@ -40,7 +40,6 @@ public class CurriclaStudentVo {
   /** 结束时间 */
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date endTime;
-
   /**
    * 是否超过选课时间： true超过选课时间，false没有
    */

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessment.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 班主任考核对象 school_aclass_teacher_assessment
+ * 
+ * @author ruoyi
+ * @date 2023-12-12
+ */
+@Data
+public class SchoolAclassTeacherAssessment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /** 学期(下拉框) */
+    @Excel(name = "学期",dictType = "semester_jsdzda")
+    private String semester;
+
+    /** 届别(下拉框) */
+    @Excel(name = "届别",dictType = "rankda")
+    private String year;
+
+    /** 学年(下拉框) */
+    @Excel(name = "学年",dictType = "yearda")
+    private String schoolYear;
+
+    /** 年级(下拉框) */
+    @Excel(name = "年级",dictType = "grade_da")
+    private String grade;
+
+    /** 班级(下拉框) */
+    @Excel(name = "班级",readConverterExp="1=1,2=2,3=3,4=4,5=5,6=6,7=7,8=8,9=9,10=10,11=11,12=12,13=13,14=14,15=15,16=16,17=17,18=18,19=19,20=20,21=21,22=22,23=23,24=24,25=25,26=26,27=27,28=28,29=29,30=30,31=31,32=32,33=33,34=34,35=35,36=36,37=37,38=38,39=39,40=40")
+    private String className;
+
+    /** 教师姓名 */
+    @Excel(name = "教师姓名")
+    private String teacherName;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 德育考核成绩 */
+    @Excel(name = "德育考核成绩")
+    private BigDecimal moralEduCheckAchievement;
+
+    /** 智育考核成绩 */
+    @Excel(name = "智育考核成绩")
+    private BigDecimal intellEduCheckAchievement;
+
+    /** 总考核成绩 */
+    @Excel(name = "总考核成绩")
+    private BigDecimal totalCheckAchievement;
+
+    /** 班级类型(下拉框) */
+    @Excel(name = "班级类型",dictType = "class_type")
+    private String classType;
+
+    /** 学科(下拉框) */
+    @Excel(name = "学科",dictType = "teaching_subjects")
+    private String sub;
+
+    /** 备注*/
+    @Excel(name = "备注")
+    private String remark;
+
+
+    /** 删除状态 */
+    private String delFlag;
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentReq.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 请求对象
+ * 
+ * @author ruoyi
+ * @date 2023-12-12
+ */
+@Data
+public class SchoolAclassTeacherAssessmentReq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 教师姓名 */
+    private String teacherName;
+
+    /** 学年(下拉框) */
+    private String schoolYear;
+
+    /** 届别(下拉框) */
+    private String year;
+
+    /** 学期(下拉框) */
+    private String semester;
+
+    /** 年级(下拉框) */
+    private String grade;
+
+    /** 学科(下拉框) */
+    private String sub;
+
+    /** 班级(下拉框) */
+    private String className;
+
+    /** 班级类型(下拉框) */
+    private String classType;
+
+    /** 德育考核成绩 =*/
+    private String moralEduCheckAchievement;
+    //大于
+    private BigDecimal moralEduCheckAchievementgt;
+    //大于等于
+    private BigDecimal moralEduCheckAchievementgtd;
+    //小于
+    private BigDecimal moralEduCheckAchievementlt;
+    //小于等于
+    private BigDecimal moralEduCheckAchievementltd;
+
+
+    /** 智育考核成绩= */
+    private String intellEduCheckAchievement;
+    //大于
+    private BigDecimal intellEduCheckAchievementgt;
+    //大于等于
+    private BigDecimal intellEduCheckAchievementgtd;
+    //小于
+    private BigDecimal intellEduCheckAchievementlt;
+    //小于等于
+    private BigDecimal intellEduCheckAchievementltd;
+
+
+
+
+    /** 删除状态 */
+    private String delFlag;
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentVo.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 班主任考核对象 school_aclass_teacher_assessment
+ * 
+ * @author ruoyi
+ * @date 2023-12-12
+ */
+@Data
+public class SchoolAclassTeacherAssessmentVo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /** 学期(下拉框) */
+    private String semester;
+
+    /** 届别(下拉框) */
+    private String year;
+
+    /** 学年(下拉框) */
+    private String schoolYear;
+
+    /** 年级(下拉框) */
+    private String grade;
+
+    /** 班级(下拉框) */
+    @Excel(name = "班级",readConverterExp="1=1,2=2,3=3,4=4,5=5,6=6,7=7,8=8,9=9,10=10,11=11,12=12,13=13,14=14,15=15,16=16,17=17,18=18,19=19,20=20,21=21,22=22,23=23,24=24,25=25,26=26,27=27,28=28,29=29,30=30,31=31,32=32,33=33,34=34,35=35,36=36,37=37,38=38,39=39,40=40")
+    private String className;
+
+    /** 班级类型(下拉框) */
+    private String classType;
+
+    /** 教师姓名 */
+    private String teacherName;
+
+    /** 学科(下拉框) */
+    private String sub;
+
+    /** 德育考核成绩 */
+    private BigDecimal moralEduCheckAchievement;
+
+    /** 智育考核成绩 */
+    private BigDecimal intellEduCheckAchievement;
+
+    /** 删除状态 */
+    private String delFlag;
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkload.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工作量信息对象 school_aworkload
+ * 
+ * @author ruoyi
+ * @date 2023-12-11
+ */
+@Data
+public class SchoolAworkload extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /** 学年(下拉框) */
+    private String schoolYear;
+
+    /** 学期(下拉框) */
+    private String semester;
+
+    /** 届别(下拉框) */
+    private String year;
+
+    /** 年级(下拉框) */
+    private String grade;
+
+    /** 姓名 */
+    private String name;
+
+    /** 学科(下拉框) */
+    private String sub;
+
+    /** 身份证号 */
+    private String idCard;
+
+    /** 聘任岗位(下拉框) */
+    private String appointmentPost;
+
+    /** 聘任职务 */
+    private String appointmentPosition;
+
+    /** 聘任情况(下拉框) */
+    private String appointmentSituation;
+
+    /** 班级 */
+    private String className;
+
+    /** 班级类型 */
+    private String classType;
+
+    /** 早读 */
+    private Long earlyReading;
+
+    /** 正课 */
+    private Long requiredCourses;
+
+    /** 晚自习 */
+    private Long eveningSelfStudy;
+
+    /** 证明人id */
+    private Long userId;
+
+    /** 证明人 */
+    private String userName;
+
+    /** 删除状态 */
+    private String delFlag;
+
+    /**合计*/
+    private Long amountTo;
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadExport.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 工作量信息对象 school_aworkload
+ * 
+ * @author ruoyi
+ * @date 2023-12-11
+ */
+@Data
+public class SchoolAworkloadExport extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 学年(下拉框) */
+    @Excel(name = "学年",dictType="yearda")
+    private String schoolYear;
+
+    /** 学期(下拉框) */
+    @Excel(name = "学期",dictType="semester_jsdzda")
+    private String semester;
+
+    /** 届别(下拉框) */
+    @Excel(name = "届别",dictType = "rankda")
+    private String year;
+
+    /** 年级(下拉框) */
+    @Excel(name = "年级",dictType="grade_da")
+    private String grade;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 学科(下拉框) */
+    @Excel(name = "学科",dictType = "teaching_subjects")
+    private String sub;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 聘任岗位(下拉框) */
+    @Excel(name = "聘任岗位",dictType = "appointment_positions")
+    private String appointmentPost;
+
+    /** 聘任职务 */
+    @Excel(name = "聘任职务")
+    private String appointmentPosition;
+
+    /** 聘任情况(下拉框) */
+    @Excel(name = "聘任情况",dictType = "appointment_situation")
+    private String appointmentSituation;
+
+    /** 班级 */
+    @Excel(name = "班级",prompt="多个，中间用英文“,”间隔")
+    private String className;
+
+    /** 班级类型 */
+    @Excel(name = "班级类型")
+    private String classType;
+
+    /** 早读 */
+    @Excel(name = "早读")
+    private Long earlyReading;
+
+    /** 正课 */
+    @Excel(name = "正课")
+    private Long requiredCourses;
+
+    /** 晚自习 */
+    @Excel(name = "晚自习")
+    private Long eveningSelfStudy;
+
+    /**合计*/
+    @Excel(name = "合计")
+    private Long amountTo;
+
+    /** 证明人id */
+    private Long userId;
+
+    /** 证明人 */
+    @Excel(name = "证明人")
+    private String userName;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 删除状态 */
+    private String delFlag;
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadVo.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 工作量信息对象 school_aworkload
+ * 
+ * @author ruoyi
+ * @date 2023-12-11
+ */
+@Data
+public class SchoolAworkloadVo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 学年(下拉框) */
+    private String schoolYear;
+
+    /** 学期(下拉框) */
+    private String semester;
+
+    /** 届别(下拉框) */
+    private String year;
+
+    /** 年级(下拉框) */
+    private String grade;
+
+    /** 姓名 */
+    private String name;
+
+    /** 学科(下拉框) */
+    private String sub;
+
+
+    /** 聘任岗位(下拉框) */
+    private String appointmentPost;
+
+    /** 聘任职务 */
+    private String appointmentPosition;
+
+    /** 聘任情况(下拉框) */
+    private String appointmentSituation;
+
+    /** 班级 */
+    private String className;
+
+    /** 班级类型 */
+    private String classType;
+
+    /** 早读 */
+    private Long earlyReading;
+
+    /** 正课 */
+    private Long requiredCourses;
+
+    /** 晚自习 */
+    private Long eveningSelfStudy;
+
+    /**合计*/
+    private Long amountTo;
+
+    /** 证明人id */
+    private Long userId;
+
+    /** 证明人 */
+    private String userName;
+
+    /** 删除状态 */
+    private String delFlag;
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NonNull;
+
+import java.util.Date;
+
+/**
+ * 教师电子档案 老师基础信息
+ */
+@Data
+public class SchoolTeacherBasicInformation extends BaseEntity {
+//    @Excel(name = "年级",combo = {"一年级","二年级","三年级"},readConverterExp = "1=一年级,2=二年级,3=三年级")
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 年龄  。动态查询
+     */
+//    private Integer age;
+
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 档案出生日期 (年月)
+     */
+    @JsonFormat(pattern = "yyyy-MM")
+    private Date fileBirthDate;
+
+
+    /**
+     * 档案年龄
+     */
+//    private Integer fileAge;
+
+
+    /**
+     * 出生年月
+     */
+    private String birthDate;
+
+    /**
+     * 籍贯
+     */
+    private String hometown;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 政治面貌(1中共党员、2共青团员、3群众、4民主党派成员、5无党派人士)
+     */
+    private String politicalLandscape;
+
+    /**
+     * 入党时间（年月）
+     */
+    @JsonFormat(pattern = "yyyy-MM")
+    private Date partyMembershipTime;
+
+    /**
+     * 任教学科(1语文、2数学、3英语、4物理、5化学、6生物、7政治、8历史、9地理、10音乐、11体育、12美术、13技术、14心理、15书法)
+     */
+    private String teachingSubject;
+
+    /**
+     * 现职称(1无、2初级、3中级、4副高、5正高)
+     */
+    private String currentProfessionalTitle;
+
+    /**
+     * 现职称取得资格时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date currentProfessionalTitleTime;
+
+    /**
+     * 现聘职称(1无、2初级、3中级、4副高、5正高)
+     */
+    private String currentHiringProfessionalTitle;
+
+    /**
+     * 现职称聘任时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date currentHiringProfessionalTitleTime;
+
+    /**
+     * 现聘岗位(1专业技术岗、2管理岗、3工勤岗)
+     */
+    private String currentPosition;
+
+    /**
+     * 现岗位等级(见习（三个现聘岗位都有见习这个等级 下拉框联动）、专业技术三级-专业技术十三级、
+     * 管理五级-管理九级、技术工二级-技术工五级)
+     */
+    private String currentJobLevel;
+
+    /**
+     * 现岗位等级聘任时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date currentJobLevelAppointmentTime;
+
+    /**
+     * 职务
+     */
+    private String duties;
+
+    /**
+     * 教师资格种类
+     */
+    private String teacherQualificationType;
+
+    /**
+     * 教师资格证号码
+     */
+    private String teacherQualificationCertificateNum;
+
+    /**
+     * 参加工作时间
+     */
+    private String workingHours;
+
+    /**
+     * 到二中工作时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date toSecondMiddleSchoolTime;
+
+    /**
+     * 二中工作年龄 动态查询
+     */
+//    private Integer toSecondAge;
+
+    /**
+     * 教龄起算时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lengthOfTeacherTime;
+
+    /**
+     * 工龄起算时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lengthOfServiceTime;
+
+    /**
+     * 工龄年限
+     */
+//    private Integer seniority;
+
+    /**
+     * 在岗情况(1教学岗位、2教辅岗、3后勤岗、4管理岗、5其他岗、6退休、7行政、8内退岗、9待退岗)
+     */
+    private String onDutySituation;
+
+    /**
+     * 在编情况 1在编 2合同制
+     */
+    private String currentSituation;
+
+    /**
+     * 毕业院校1
+     */
+    private String graduationInstitution1;
+
+    /**
+     * 专业1
+     */
+    private String major1;
+
+    /**
+     * 毕业时间1 年月
+     */
+    @JsonFormat(pattern = "yyyy-MM")
+    private Date graduationTime1;
+
+    /**
+     * 毕业院校2
+     */
+    private String graduationInstitution2;
+
+    /**
+     * 专业2
+     */
+    private String major2;
+
+    /**
+     * 毕业时间2年月
+     */
+    @JsonFormat(pattern = "yyyy-MM")
+     private Date graduationTime2;
+
+    /**
+     * 毕业院校3
+     */
+    private String graduationInstitution3;
+
+    /**
+     * 专业3
+     */
+    private String major3;
+
+    /**
+     * 毕业时间3 年月
+     */
+    @JsonFormat(pattern = "yyyy-MM")
+    private Date graduationTime3;
+
+    /**
+     * 第一学历
+     */
+    private String firstDegree;
+
+    /**
+     * 最后学历
+     */
+    private String lastDegree;
+
+    /**
+     *  学位
+     */
+    private String degree;
+
+    /**
+     * 工作经历
+     */
+    private String  workExperience;
+
+    /**
+     * 照片名称
+     */
+    private String photoName;
+
+    /**
+     * 照片地址
+     */
+    private String photoUrl;
+
+    /**
+     * 钉钉手机号
+     */
+    private String ddPhone;
+//
+//    /**
+//     *  出生日期临时查询参数
+//     */
+//    private String birthDategt;
+//    private String birthDategtd;
+//    private String birthDatelt;
+//    private String birthDateltd;
+//
+//    /**
+//     *  参加工作临时查询参数
+//     */
+//    private String workingHoursgt;
+//    private String workingHoursgtd;
+//    private String workingHourslt;
+//    private String workingHoursltd;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/SchoolTeacherBasicInformation.java → smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java

-package yangtz.cs.liu.campus.domain.teacherFiles;
+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NonNull;
 
 import java.util.Date;
 
@@ -15,7 +12,7 @@ import java.util.Date;
  * 教师电子档案 老师基础信息
  */
 @Data
-public class SchoolTeacherBasicInformation extends BaseEntity {
+public class SchoolTeacherBasicInformationVo extends BaseEntity {
 //    @Excel(name = "年级",combo = {"一年级","二年级","三年级"},readConverterExp = "1=一年级,2=二年级,3=三年级")
 
     @TableId(value = "id", type = IdType.AUTO)

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/SchoolTeacherBasiclnExport.java → smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasiclnExport.java

-package yangtz.cs.liu.campus.domain.teacherFiles;
+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
 
 import com.ruoyi.common.annotation.Excel;
 import lombok.Data;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXacademicWorks.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
@@ -18,22 +20,25 @@ public class SchoolXacademicWorks
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /** 学科 */
-    @Excel(name = "学科")
+    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
+            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
     private String sub;
 
     /** 获奖类别 */
-    @Excel(name = "获奖类别")
+    @Excel(name = "获奖类别",combo = {"论著-独著","论文-公开发表","论著-合著(编者）","论文-核心期刊","论著-合著(主编）","论著-合著(副主编）","其他"},
+            readConverterExp = "1=论著-独著,2=论文-公开发表,3=论著-合著(编者）,4=论文-核心期刊,5=论著-合著(主编）,6=论著-合著(副主编）,7=其他")
     private String awardType;
 
     /** 获奖级别 */
-    @Excel(name = "获奖级别")
+    @Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
     private String awardRank;
 
     /** 获奖等级 */
-    @Excel(name = "获奖等级")
+    @Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
     private String awardLevel;
 
     /** 成果名称 */
@@ -44,7 +49,7 @@ public class SchoolXacademicWorks
     private Long userId;
 
     /** 获奖人 */
-    @Excel(name = "获奖人")
+    @Excel(name = "获奖者")
     private String userName;
 
     /** 主办单位 */
@@ -66,6 +71,9 @@ public class SchoolXacademicWorks
     /** 证书图片地址 */
     private String pictureUrl;
 
+    /** 审核状态（0未提交，1审核中，2通过，3驳回） */
+    private String auditState;
+
     /** 创建者 */
     private String createBy;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXcomprehensiveHonors.java

 package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
@@ -17,10 +20,12 @@ public class SchoolXcomprehensiveHonors
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /** 学科（下拉框） */
-    @Excel(name = "学科")
+    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
+            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
     private String sub;
 
     /** 获奖类别 */
@@ -28,11 +33,11 @@ public class SchoolXcomprehensiveHonors
     private String awardType;
 
     /** 获奖级别（下拉框） */
-    @Excel(name = "获奖级别")
+    @Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
     private String awardRank;
 
     /** 获奖等级（下拉框） */
-    @Excel(name = "获奖等级")
+    @Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
     private String awardLevel;
 
     /** 成果名称 */
@@ -43,7 +48,7 @@ public class SchoolXcomprehensiveHonors
     private Long userId;
 
     /** 获奖人 */
-    @Excel(name = "获奖人")
+    @Excel(name = "获奖者")
     private String userName;
 
     /** 主办单位 */
@@ -51,7 +56,8 @@ public class SchoolXcomprehensiveHonors
     private String org;
 
     /** 获奖时间（年月日） */
-    @Excel(name = "获奖时间", readConverterExp = "年=月日")
+    @Excel(name = "获奖时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date awardTime;
 
     /** 备注 */
@@ -64,6 +70,9 @@ public class SchoolXcomprehensiveHonors
     /** 证书图片地址 */
     private String pictureUrl;
 
+    /** 审核状态（0未提交，1审核中，2通过，3驳回） */
+    private String auditState;
+
     /** 创建者 */
     private String createBy;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXlectureAwards.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
@@ -18,22 +20,24 @@ public class SchoolXlectureAwards
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /** 学科 */
-    @Excel(name = "学科")
+    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
+            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
     private String sub;
 
     /** 获奖类别 */
-    @Excel(name = "获奖类别")
+    @Excel(name = "获奖类别",combo = {"优质课","公开课","优课","其他","说课","经验介绍","示范课"},readConverterExp = "1=优质课,2=公开课,3=优课,4=其他,5=说课,6=经验介绍,7=示范课")
     private String awardType;
 
     /** 获奖级别 */
-    @Excel(name = "获奖级别")
+    @Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
     private String awardRank;
 
     /** 获奖等级 */
-    @Excel(name = "获奖等级")
+    @Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
     private String awardLevel;
 
     /** 成果名称 */
@@ -41,11 +45,10 @@ public class SchoolXlectureAwards
     private String resultName;
 
     /** 获奖人id */
-    @Excel(name = "获奖人id")
     private Long userId;
 
     /** 获奖人 */
-    @Excel(name = "获奖人")
+    @Excel(name = "获奖者")
     private String userName;
 
     /** 主办单位 */
@@ -67,6 +70,9 @@ public class SchoolXlectureAwards
     /** 证书图片地址 */
     private String pictureUrl;
 
+    /** 审核状态（0未提交，1审核中，2通过，3驳回） */
+    private String auditState;
+
     /** 创建者 */
     private String createBy;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteacherAwards.java

@@ -2,7 +2,9 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -22,22 +24,26 @@ public class SchoolXteacherAwards
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /** 学科 */
-    @Excel(name = "学科")
+    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
+            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
     private String sub;
 
     /** 获奖类别 */
-    @Excel(name = "获奖类别")
+    @Excel(name = "获奖类别",combo = {"学科带头人","教学能手","教学科研专家","教学科研成果","增量优秀班主任","高考功勋班主任","教学资源","其他","高考功勋教师",
+            "增量优秀教师","市高考评奖"},readConverterExp = "1=学科带头人,2=教学能手,3=教学科研专家,4=教学科研成果,5=增量优秀班主任,6=高考功勋班主任,7=教学资源," +
+            "8=其他,9=高考功勋教师,10=增量优秀教师,11=市高考评奖")
     private String awardType;
 
     /** 获奖级别 */
-    @Excel(name = "获奖级别")
+    @Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
     private String awardRank;
 
     /** 获奖等级 */
-    @Excel(name = "获奖等级")
+    @Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
     private String awardLevel;
 
     /** 成果名称 */
@@ -48,7 +54,7 @@ public class SchoolXteacherAwards
     private Long userId;
 
     /** 获奖人 */
-    @Excel(name = "获奖人")
+    @Excel(name = "获奖者")
     private String userName;
 
     /** 主办单位 */
@@ -70,6 +76,9 @@ public class SchoolXteacherAwards
     /** 证书图片地址 */
     private String pictureUrl;
 
+    /** 审核状态（0未提交，1审核中，2通过，3驳回） */
+    private String auditState;
+
     /** 创建者 */
     private String createBy;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteachingAchievements.java

@@ -3,13 +3,11 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 教学成绩对象 school_xteaching_achievements
@@ -23,14 +21,16 @@ public class SchoolXteachingAchievements
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /** 学年(下拉框) */
-    @Excel(name = "学年(下拉框)")
+    @Excel(name = "学年",combo = {"2018-2019","2019-2020","2020-2021","2021-2022","2022-2023","2023-2024","2024-2025","2025-2026",
+            "2026-2027","2027-2028","2028-2029","2029-2030","2030-2031","2031-2032","2032-2033"})
     private String schoolYear;
 
     /** 学期（下拉框） */
-    @Excel(name = "学期")
+    @Excel(name = "学期",combo = {"第一学期","第二学期"}, readConverterExp = "1=第一学期,2=第二学期")
     private String semester;
 
     /** 考试时间（年月日） */
@@ -39,23 +39,23 @@ public class SchoolXteachingAchievements
     private Date examTime;
 
     /** 考试类型（下拉框） */
-    @Excel(name = "考试类型")
+    @Excel(name = "考试类型",combo = {"月考","期中","期末","一模","二模","三模","高考","其它"},
+            readConverterExp = "1=月考,2=期中,3=期末,4=一模,5=二模,6=三模,7=高考,8=其它")
     private String examType;
 
     /** 届别(下拉框) */
-    @Excel(name = "届别(下拉框)")
+    @Excel(name = "届别", combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
     private String year;
 
     /** 年级（下拉框） */
-    @Excel(name = "年级")
+    @Excel(name = "年级", combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
     private String grade;
 
     /** 用户id */
-    @Excel(name = "用户id")
     private Long userId;
 
     /** 用户姓名 */
-    @Excel(name = "用户姓名")
+    @Excel(name = "姓名")
     private String userName;
 
     /** 身份证号 */
@@ -63,7 +63,8 @@ public class SchoolXteachingAchievements
     private String idCard;
 
     /** 学科 */
-    @Excel(name = "学科")
+    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
+            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
     private String sub;
 
     /** 班级 */
@@ -93,7 +94,6 @@ public class SchoolXteachingAchievements
     private Date updateTime;
 
     /** 备注 */
-    @Excel(name = "备注")
     private String remark;
 
     /** 删除状态 */

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentMapper.java

+package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
+
+import java.util.List;
+
+/**
+ * 班主任考核Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-12-12
+ */
+public interface SchoolAclassTeacherAssessmentMapper extends BaseMapper<SchoolAclassTeacherAssessment>
+{
+    /**
+     * 查询班主任考核
+     * 
+     * @param id 班主任考核主键
+     * @return 班主任考核
+     */
+    public SchoolAclassTeacherAssessment selectSchoolAclassTeacherAssessmentById(Long id);
+
+    /**
+     * 查询班主任考核列表
+     * 
+     * @param schoolAclassTeacherAssessment 班主任考核
+     * @return 班主任考核集合
+     */
+    public List<SchoolAclassTeacherAssessmentVo> selectSchoolAclassTeacherAssessmentList(SchoolAclassTeacherAssessmentReq req);
+
+
+    public List<SchoolAclassTeacherAssessment> selectSchoolList(SchoolAclassTeacherAssessmentReq req);
+
+    /**
+     * 新增班主任考核
+     * 
+     * @param schoolAclassTeacherAssessment 班主任考核
+     * @return 结果
+     */
+    public int insertSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment);
+
+    /**
+     * 修改班主任考核
+     * 
+     * @param schoolAclassTeacherAssessment 班主任考核
+     * @return 结果
+     */
+    public int updateSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment);
+
+    /**
+     * 删除班主任考核
+     * 
+     * @param id 班主任考核主键
+     * @return 结果
+     */
+    public int deleteSchoolAclassTeacherAssessmentById(Long id);
+
+    /**
+     * 批量删除班主任考核
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolAclassTeacherAssessmentByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.java

+package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
+
+import java.util.List;
+
+/**
+ * 工作量信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-12-11
+ */
+public interface SchoolAworkloadMapper  extends BaseMapper<SchoolAworkload>
+{
+    /**
+     * 查询工作量信息
+     * 
+     * @param id 工作量信息主键
+     * @return 工作量信息
+     */
+    public SchoolAworkload selectSchoolAworkloadById(Long id);
+
+    /**
+     * 查询工作量信息列表
+     * 
+     * @param schoolAworkload 工作量信息
+     * @return 工作量信息集合
+     */
+    public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload);
+
+    public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload);
+
+    /**
+     * 新增工作量信息
+     * 
+     * @param schoolAworkload 工作量信息
+     * @return 结果
+     */
+    public int insertSchoolAworkload(SchoolAworkload schoolAworkload);
+
+    /**
+     * 修改工作量信息
+     * 
+     * @param schoolAworkload 工作量信息
+     * @return 结果
+     */
+    public int updateSchoolAworkload(SchoolAworkload schoolAworkload);
+
+    /**
+     * 删除工作量信息
+     * 
+     * @param id 工作量信息主键
+     * @return 结果
+     */
+    public int deleteSchoolAworkloadById(Long id);
+
+    /**
+     * 批量删除工作量信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolAworkloadByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationMapper.java

+package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo;
+
+import java.util.List;
+
+public interface SchoolTeacherBasichlnformationMapper extends BaseMapper<SchoolTeacherBasicInformation> {
+
+
+    List<SchoolTeacherBasicInformationVo> list(SchoolTeacherBasicInformationVo information);
+
+    SchoolTeacherBasicInformationVo selectById(Long id);
+
+    int updateInformationById(SchoolTeacherBasicInformation information);
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXacademicWorksMapper.java

 package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
 
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
+
 import java.util.List;
 
 /**
@@ -17,15 +19,15 @@ public interface SchoolXacademicWorksMapper
      * @param id 论文著作主键
      * @return 论文著作
      */
-    public SchoolXacademicWorks selectSchoolXacademicWorksById(Long id);
+    public SchoolXacademicWorksVo selectSchoolXacademicWorksById(Long id);
 
     /**
      * 查询论文著作列表
      *
-     * @param schoolXacademicWorks 论文著作
+     * @param schoolXacademicWorksVo 论文著作
      * @return 论文著作集合
      */
-    public List<SchoolXacademicWorks> selectSchoolXacademicWorksList(SchoolXacademicWorks schoolXacademicWorks);
+    public List<SchoolXacademicWorksVo> selectSchoolXacademicWorksList(SchoolXacademicWorksVo schoolXacademicWorksVo);
 
     /**
      * 新增论文著作

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsMapper.java

 package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
 
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXcomprehensiveHonors;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
+
 import java.util.List;
 
 /**
@@ -17,15 +19,15 @@ public interface SchoolXcomprehensiveHonorsMapper
      * @param id 综合荣誉主键
      * @return 综合荣誉
      */
-    public SchoolXcomprehensiveHonors selectSchoolXcomprehensiveHonorsById(Long id);
+    public SchoolXcomprehensiveHonorsVo selectSchoolXcomprehensiveHonorsById(Long id);
 
     /**
      * 查询综合荣誉列表
      *
-     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @param schoolXcomprehensiveHonorsVo 综合荣誉
      * @return 综合荣誉集合
      */
-    public List<SchoolXcomprehensiveHonors> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
+    public List<SchoolXcomprehensiveHonorsVo> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo);
 
     /**
      * 新增综合荣誉

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXlectureAwardsMapper.java

 package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
 
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
 
 import java.util.List;
 
@@ -18,15 +19,15 @@ public interface SchoolXlectureAwardsMapper
      * @param id 讲课获奖主键
      * @return 讲课获奖
      */
-    public SchoolXlectureAwards selectSchoolXlectureAwardsById(Long id);
+    public SchoolXlectureAwardsVo selectSchoolXlectureAwardsById(Long id);
 
     /**
      * 查询讲课获奖列表
      *
-     * @param schoolXlectureAwards 讲课获奖
+     * @param schoolXlectureAwardsVo 讲课获奖
      * @return 讲课获奖集合
      */
-    public List<SchoolXlectureAwards> selectSchoolXlectureAwardsList(SchoolXlectureAwards schoolXlectureAwards);
+    public List<SchoolXlectureAwardsVo> selectSchoolXlectureAwardsList(SchoolXlectureAwardsVo schoolXlectureAwardsVo);
 
     /**
      * 新增讲课获奖

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteacherAwardsMapper.java

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
 
 
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
 
 import java.util.List;
 
@@ -19,15 +20,15 @@ public interface SchoolXteacherAwardsMapper
      * @param id 教师获奖主键
      * @return 教师获奖
      */
-    public SchoolXteacherAwards selectSchoolXteacherAwardsById(Long id);
+    public SchoolXteacherAwardsVo selectSchoolXteacherAwardsById(Long id);
 
     /**
      * 查询教师获奖列表
      *
-     * @param schoolXteacherAwards 教师获奖
+     * @param schoolXteacherAwardsVo 教师获奖
      * @return 教师获奖集合
      */
-    public List<SchoolXteacherAwards> selectSchoolXteacherAwardsList(SchoolXteacherAwards schoolXteacherAwards);
+    public List<SchoolXteacherAwardsVo> selectSchoolXteacherAwardsList(SchoolXteacherAwardsVo schoolXteacherAwardsVo);
 
     /**
      * 新增教师获奖

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.java

 package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 教学成绩Mapper接口
@@ -10,7 +14,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-12-06
  */
-public interface SchoolXteachingAchievementsMapper
+public interface SchoolXteachingAchievementsMapper extends BaseMapper<SchoolXteachingAchievements>
 {
     /**
      * 查询教学成绩
@@ -18,15 +22,15 @@ public interface SchoolXteachingAchievementsMapper
      * @param id 教学成绩主键
      * @return 教学成绩
      */
-    public SchoolXteachingAchievements selectSchoolXteachingAchievementsById(Long id);
+    public SchoolXteachingAchievementsVo selectSchoolXteachingAchievementsById(Long id);
 
     /**
      * 查询教学成绩列表
      *
-     * @param schoolXteachingAchievements 教学成绩
+     * @param schoolXteachingAchievementsVo 教学成绩
      * @return 教学成绩集合
      */
-    public List<SchoolXteachingAchievements> selectSchoolXteachingAchievementsList(SchoolXteachingAchievements schoolXteachingAchievements);
+    public List<SchoolXteachingAchievementsVo> selectSchoolXteachingAchievementsList(SchoolXteachingAchievementsVo schoolXteachingAchievementsVo);
 
     /**
      * 新增教学成绩
@@ -59,4 +63,7 @@ public interface SchoolXteachingAchievementsMapper
      * @return 结果
      */
     public int deleteSchoolXteachingAchievementsByIds(Long[] ids);
+
+    List<Map<String, Object>> getUserList(SysUser sysUser);
+
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/SchoolTeacherBasichlnformationMapper.java

-package yangtz.cs.liu.campus.mapper.teacherFiles;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasicInformation;
-
-import java.util.List;
-
-public interface SchoolTeacherBasichlnformationMapper extends BaseMapper<SchoolTeacherBasicInformation> {
-
-
-    List<SchoolTeacherBasicInformation>  list(SchoolTeacherBasicInformation information);
-    SchoolTeacherBasicInformation  selectById(Long id);
-}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAnnualAssessment/SchoolAnnualAssessmentServiceImpl.java

 package yangtz.cs.liu.campus.service.impl.schoolAnnualAssessment;
 
-import cn.hutool.core.io.resource.ClassPathResource;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.exception.ServiceException;
@@ -12,15 +11,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import yangtz.cs.liu.campus.controller.teacherFiles.SchoolTeacherBasiclnformationController;
 import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
 import yangtz.cs.liu.campus.mapper.schoolAnnualAssessment.SchoolAnnualAssessmentMapper;
 import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.net.URLEncoder;
 import java.util.List;
 
 /**

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
+import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentMapper;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService;
+
+/**
+ * 班主任考核Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-12-12
+ */
+@Service
+public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<SchoolAclassTeacherAssessmentMapper, SchoolAclassTeacherAssessment> implements ISchoolAclassTeacherAssessmentService
+{
+    @Autowired
+    private SchoolAclassTeacherAssessmentMapper schoolAclassTeacherAssessmentMapper;
+
+    /**
+     * 查询班主任考核
+     * 
+     * @param id 班主任考核主键
+     * @return 班主任考核
+     */
+    @Override
+    public SchoolAclassTeacherAssessment selectSchoolAclassTeacherAssessmentById(Long id)
+    {
+        return schoolAclassTeacherAssessmentMapper.selectSchoolAclassTeacherAssessmentById(id);
+    }
+
+    /**
+     * 查询班主任考核列表
+     * 
+     * @param
+     * @return 班主任考核
+     */
+    @Override
+    public List<SchoolAclassTeacherAssessmentVo> selectSchoolAclassTeacherAssessmentList(SchoolAclassTeacherAssessmentReq req)
+    {
+        //查询条件状
+        // 智育考核成绩
+        String intellEduCheckAchievement = req.getIntellEduCheckAchievement();
+        if (StringUtils.isNotEmpty(intellEduCheckAchievement)){
+            this.symbolConversion(req);
+        }
+        //德育考核成绩
+        String moralEduCheckAchievement = req.getMoralEduCheckAchievement();
+        if (StringUtils.isNotEmpty(moralEduCheckAchievement)){
+            this.wordDateConversion(req);
+        }
+        return schoolAclassTeacherAssessmentMapper.selectSchoolAclassTeacherAssessmentList(req);
+    }
+
+
+    @Override
+    public List<SchoolAclassTeacherAssessment> selectSchoolList(SchoolAclassTeacherAssessmentReq req)
+    {
+        //查询条件状
+        // 智育考核成绩
+        String intellEduCheckAchievement = req.getIntellEduCheckAchievement();
+        if (StringUtils.isNotEmpty(intellEduCheckAchievement)){
+            this.symbolConversion(req);
+        }
+        //德育考核成绩
+        String moralEduCheckAchievement = req.getMoralEduCheckAchievement();
+        if (StringUtils.isNotEmpty(moralEduCheckAchievement)){
+            this.wordDateConversion(req);
+        }
+        return schoolAclassTeacherAssessmentMapper.selectSchoolList(req);
+    }
+
+
+
+    /**
+     * 新增班主任考核
+     * 
+     * @param schoolAclassTeacherAssessment 班主任考核
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment)
+    {
+        schoolAclassTeacherAssessment.setCreateTime(DateUtils.getNowDate());
+        return schoolAclassTeacherAssessmentMapper.insertSchoolAclassTeacherAssessment(schoolAclassTeacherAssessment);
+    }
+
+    /**
+     * 修改班主任考核
+     * 
+     * @param schoolAclassTeacherAssessment 班主任考核
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolAclassTeacherAssessment(SchoolAclassTeacherAssessment schoolAclassTeacherAssessment)
+    {
+        schoolAclassTeacherAssessment.setUpdateTime(DateUtils.getNowDate());
+        return schoolAclassTeacherAssessmentMapper.updateSchoolAclassTeacherAssessment(schoolAclassTeacherAssessment);
+    }
+
+    /**
+     * 批量删除班主任考核
+     * 
+     * @param ids 需要删除的班主任考核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolAclassTeacherAssessmentByIds(Long[] ids)
+    {
+        return schoolAclassTeacherAssessmentMapper.deleteSchoolAclassTeacherAssessmentByIds(ids);
+    }
+
+    /**
+     * 删除班主任考核信息
+     * 
+     * @param id 班主任考核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolAclassTeacherAssessmentById(Long id)
+    {
+        return schoolAclassTeacherAssessmentMapper.deleteSchoolAclassTeacherAssessmentById(id);
+    }
+
+    /**
+     * 智育考核成绩
+     * @param
+     */
+    private void symbolConversion(SchoolAclassTeacherAssessmentReq req){
+        //智育考核成绩
+        String intellEduCheckAchievement = req.getIntellEduCheckAchievement();
+        if (intellEduCheckAchievement.contains(">=")) {
+            String substring = intellEduCheckAchievement.substring(2, intellEduCheckAchievement.length());
+            req.setIntellEduCheckAchievementgtd(new BigDecimal(substring));
+            req.setIntellEduCheckAchievement(null);
+        } else if (intellEduCheckAchievement.contains("<=")) {
+            String substring = intellEduCheckAchievement.substring(2, intellEduCheckAchievement.length());
+            req.setIntellEduCheckAchievementltd(new BigDecimal(substring));
+            req.setIntellEduCheckAchievement(null);
+        } else if (intellEduCheckAchievement.contains("<")) {
+            String substring = intellEduCheckAchievement.substring(1, intellEduCheckAchievement.length());
+            req.setIntellEduCheckAchievementlt(new BigDecimal(substring));
+            req.setIntellEduCheckAchievement(null);
+        } else if (intellEduCheckAchievement.contains(">")) {
+            String substring = intellEduCheckAchievement.substring(1, intellEduCheckAchievement.length());
+            req.setIntellEduCheckAchievementgt(new BigDecimal(substring));
+            req.setIntellEduCheckAchievement(null);
+        } else if (intellEduCheckAchievement.contains("=")) {
+            String substring = intellEduCheckAchievement.substring(1, intellEduCheckAchievement.length());
+            req.setIntellEduCheckAchievement(substring);
+        }
+    }
+    /**
+     * 参加工作调整
+     */
+
+    private void wordDateConversion(SchoolAclassTeacherAssessmentReq req) {
+        String moralEduCheckAchievement = req.getMoralEduCheckAchievement();
+        if (moralEduCheckAchievement.contains(">=")) {
+            String substring = moralEduCheckAchievement.substring(2, moralEduCheckAchievement.length());
+            req.setMoralEduCheckAchievementgtd(new BigDecimal(substring));
+            req.setMoralEduCheckAchievement(null);
+        } else if (moralEduCheckAchievement.contains("<=")) {
+            String substring = moralEduCheckAchievement.substring(2, moralEduCheckAchievement.length());
+            req.setMoralEduCheckAchievementltd(new BigDecimal(substring));
+            req.setMoralEduCheckAchievement(null);
+        } else if (moralEduCheckAchievement.contains("<")) {
+            String substring = moralEduCheckAchievement.substring(1, moralEduCheckAchievement.length());
+            req.setMoralEduCheckAchievementlt(new BigDecimal(substring));
+            req.setMoralEduCheckAchievement(null);
+        } else if (moralEduCheckAchievement.contains(">")) {
+            String substring = moralEduCheckAchievement.substring(1, moralEduCheckAchievement.length());
+            req.setMoralEduCheckAchievementgt(new BigDecimal(substring));
+            req.setMoralEduCheckAchievement(null);
+        } else if (moralEduCheckAchievement.contains("=")) {
+            String substring = moralEduCheckAchievement.substring(1, moralEduCheckAchievement.length());
+            req.setMoralEduCheckAchievement(substring);
+        }
+
+
+    }
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
+import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAworkloadMapper;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService;
+
+/**
+ * 工作量信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-12-11
+ */
+@Service
+public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapper, SchoolAworkload> implements ISchoolAworkloadService
+{
+    @Autowired
+    private SchoolAworkloadMapper schoolAworkloadMapper;
+
+    /**
+     * 查询工作量信息
+     * 
+     * @param id 工作量信息主键
+     * @return 工作量信息
+     */
+    @Override
+    public SchoolAworkload selectSchoolAworkloadById(Long id)
+    {
+        SchoolAworkload date = schoolAworkloadMapper.selectSchoolAworkloadById(id);
+        date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy());
+        return date;
+    }
+
+    /**
+     * 查询工作量信息列表
+     * 
+     * @param schoolAworkload 工作量信息
+     * @return 工作量信息
+     */
+    @Override
+    public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload)
+    {
+        List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkload);
+        //计算合计
+        for (SchoolAworkloadVo date : schoolAworkloadVos){
+            date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy());
+        }
+        return schoolAworkloadVos;
+    }
+
+
+    @Override
+    public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload)
+    {
+        List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkload);
+        //计算合计
+        for (SchoolAworkloadExport date : schoolAworkloadVos){
+            date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy());
+        }
+        return schoolAworkloadVos;
+    }
+
+
+    /**
+     * 新增工作量信息
+     * 
+     * @param schoolAworkload 工作量信息
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolAworkload(SchoolAworkload schoolAworkload)
+    {
+        schoolAworkload.setCreateTime(DateUtils.getNowDate());
+        return schoolAworkloadMapper.insertSchoolAworkload(schoolAworkload);
+    }
+
+    /**
+     * 修改工作量信息
+     * 
+     * @param schoolAworkload 工作量信息
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolAworkload(SchoolAworkload schoolAworkload)
+    {
+        schoolAworkload.setUpdateTime(DateUtils.getNowDate());
+        return schoolAworkloadMapper.updateSchoolAworkload(schoolAworkload);
+    }
+
+    /**
+     * 批量删除工作量信息
+     * 
+     * @param ids 需要删除的工作量信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolAworkloadByIds(Long[] ids)
+    {
+        return schoolAworkloadMapper.deleteSchoolAworkloadByIds(ids);
+    }
+
+    /**
+     * 删除工作量信息信息
+     * 
+     * @param id 工作量信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolAworkloadById(Long id)
+    {
+        return schoolAworkloadMapper.deleteSchoolAworkloadById(id);
+    }
+}