Merge branch 'master' of http://49.232.152.146:6688/xhxy/smart_school

ruoyi-ui/src/api/smartSchool/InstrumentDrugAdministration/instrumentBorrowManagement/teacherBorrowing.js

+import request from "@/utils/request";
+
+//教师借用
+
+//借用明细列表
+export function getTeacherBorrow(query) {
+  return request({
+    url: "/schoolTeacherBorrow/selectInstrumentList",
+    method: "get",
+    params: query,
+  });
+}
+
+//新增教师借用
+export function addTeacherBorrow(data) {
+  return request({
+    url: "/schoolTeacherBorrow/add",
+    method: "post",
+    data,
+  });
+}
+//查看教师借用列表
+export function getTeacherBorrowlist(query) {
+  return request({
+    url: "/schoolTeacherBorrow/list",
+    method: "get",
+    params: query,
+  });
+}
+// 查看教师借用详情
+export function getTeacherBorrowlxq(id) {
+  return request({
+    url: "/schoolTeacherBorrow/" + id,
+    method: "get",
+  });
+}
+
+//删除教师借用
+export function deleteTeacherBorrow(ids) {
+  return request({
+    url: "/schoolTeacherBorrow/" + ids,
+    method: "delete",
+    data: ids,
+  });
+}
+
+

ruoyi-ui/src/api/smartSchool/InstrumentDrugAdministration/instrumentBorrowManagement/warehouseEquipmentLoan.js

+import request from "@/utils/request";
+
+//仓库仪器借用管理
+
+//仓库仪器管理列表
+export function getTeacherBorrow(query) {
+  return request({
+    url: "/schoolTeacherBorrow/selectBorrowInstrumentList",
+    method: "get",
+    params: query,
+  });
+}
+// 查看详情
+export function getTeacherBorrowlxq(id) {
+  return request({
+    url: "/schoolTeacherBorrow/" + id,
+    method: "get",
+  });
+}
+
+//办理教师借用信息
+export function teacherBorrow(data) {
+  return request({
+    url: "/schoolTeacherBorrow/edit",
+    method: "put",
+    data,
+  });
+}
+//归还教师借用仪器
+export function getReturnInstrument(data) {
+  return request({
+    url: "/schoolTeacherBorrow/returnInstrument",
+    method: "post",
+    data,
+  });
+}

ruoyi-ui/src/api/smartSchool/InstrumentDrugAdministration/instrumentClassification.js

+import request from "@/utils/request";
+
+//新增仪器药品分类
+export function addInst(data) {
+  return request({
+    url: "/schoolInstrumentClassify/add",
+    method: "post",
+    data,
+  });
+}
+//修改仪器药品分类
+export function editInst(data) {
+  return request({
+    url: "/schoolInstrumentClassify/edit",
+    method: "put",
+    data,
+  });
+}
+//查询仪器药品分类列表
+export function getList(query) {
+  return request({
+    url: "/schoolInstrumentClassify/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查看仪器药品分类详情
+export function getInstxq(id) {
+  return request({
+    url: "/schoolInstrumentClassify/" + id,
+    method: "get",
+  });
+}
+
+//删除仪器药品分类
+export function deleteInst(ids) {
+  return request({
+    url: "/schoolInstrumentClassify/" + ids,
+    method: "post",
+    data: ids,
+  });
+}
+

ruoyi-ui/src/api/smartSchool/InstrumentDrugAdministration/instrumentManagement.js

+import request from "@/utils/request";
+
+//新增仪器
+export function addInst(data) {
+  return request({
+    url: "/schoolInstrument/add",
+    method: "post",
+    data,
+  });
+}
+//修改仪器
+export function editInst(data) {
+  return request({
+    url: "/schoolInstrument/edit",
+    method: "put",
+    data,
+  });
+}
+//查看仪器列表
+export function getList(query) {
+  return request({
+    url: "/schoolInstrument/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询详情
+export function getInstxq(id) {
+  return request({
+    url: "/schoolInstrument/" + id,
+    method: "get",
+  });
+}
+
+//删除仪器
+export function deleteInst(ids) {
+  return request({
+    url: "/schoolInstrument/" + ids,
+    method: "delete",
+    data: ids,
+  });
+}
+
+//查看出入库明细列表
+export function getListrk(query) {
+  return request({
+    url: "/schoolInstrumentDetail/list",
+    method: "get",
+    params: query,
+  });
+}
+
+//仪器库存修改
+export function getInstrumentDetail(data) {
+  return request({
+    url: "/schoolInstrumentDetail/add",
+    method: "post",
+    data,
+  });
+}

ruoyi-ui/src/api/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp.js

@@ -15,7 +15,13 @@ export function getGrade() {
     method: "get",
     method: "get",
   });
   });
 }
 }
-
+//获取级部下拉框(搜索条件);
+export function getGradelist() {
+  return request({
+    url: "/experimentPlan/getGradeList",
+    method: "get",
+  });
+}
 //新增个人实验申请
 //新增个人实验申请
 export function addExperimentPlan(data) {
 export function addExperimentPlan(data) {
   return request({
   return request({
@@ -39,13 +45,7 @@ export function deleteExperimentPlan(id) {
     method: "post",
     method: "post",
   });
   });
 }
 }
-// 查询实验计划列表
-export function getExperimentPlan(query) {
-  return request({
-    url: "/experimentPlan/list",
-    params: query,
-  });
-}
+
 // 查询个人实验申请列表
 // 查询个人实验申请列表
 export function getApplylist(query) {
 export function getApplylist(query) {
   return request({
   return request({
@@ -55,7 +55,6 @@ export function getApplylist(query) {
   });
   });
 }
 }
 
 
-
 //查看详情
 //查看详情
 export function getListxq(id) {
 export function getListxq(id) {
   return request({
   return request({
@@ -63,3 +62,11 @@ export function getListxq(id) {
     method: "get",
     method: "get",
   });
   });
 }
 }
+//查看详情
+export function getResult(data) {
+  return request({
+    url: "/schoolTeacherExperimentApply/experimentResult",
+    method: "post",
+    data,
+  });
+}

ruoyi-ui/src/api/smartSchool/gradeWork/laboratoryManagement/classDetails.js

+import request from "@/utils/request";
+
+// 查看列表
+export function getList(query) {
+  return request({
+    url: "/experimentPlan/gradeCountClass",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查看班级完成详情
+export function getClassDetailsxq(query) {
+  return request({
+    url: "/experimentPlan/getGradeClassDetails",
+    method: "get",
+    params: query,
+  });
+}
+
+//获取当前学年+学期
+export function getSemester() {
+  return request({
+    url: "/experimentPlan/getSemester",
+    method: "get",
+  });
+}
+//获取级部下拉框(搜索条件);
+export function getGradelist() {
+  return request({
+    url: "/experimentPlan/getGradeList",
+    method: "get",
+  });
+}

ruoyi-ui/src/api/smartSchool/gradeWork/laboratoryManagement/laboratoryDetails.js

+import request from "@/utils/request";
+
+// 查看列表
+export function getList(query) {
+  return request({
+    url: "/experimentPlan/gradeCountExperiment",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查看班级完成详情
+export function getClassDetailsxq(query) {
+  return request({
+    url: "/experimentPlan/getClassDetails",
+    method: "get",
+    params: query,
+  });
+}
+
+//获取当前学年+学期
+export function getSemester() {
+  return request({
+    url: "/experimentPlan/getSemester",
+    method: "get",
+  });
+}
+//获取级部下拉框(搜索条件);
+export function getGradelist() {
+  return request({
+    url: "/experimentPlan/getGradeList",
+    method: "get",
+  });
+}
\ No newline at end of file

ruoyi-ui/src/api/smartSchool/laboratoryManagement/experimentalPlan.js

@@ -15,3 +15,10 @@ export function getExperimentPlaxq(id) {
     method: "get",
     method: "get",
   });
   });
 }
 }
+//获取当前学年+学期
+export function getSemester() {
+  return request({
+    url: "/experimentPlan/getSemester",
+    method: "get",
+  });
+}
\ No newline at end of file

ruoyi-ui/src/api/smartSchool/laboratoryManagement/laboratoryCompetition.js

@@ -39,3 +39,10 @@ export function deleteCompetition(id) {
     method: "post",
     method: "post",
   });
   });
 }
 }
+//老师下拉框
+export function getTeacher() {
+  return request({
+    url: "/schoolLabCompetition/getTeacher",
+    method: "get",
+  });
+}

ruoyi-ui/src/api/smartSchool/laboratoryManagement/leadlaboratoryCompletion.js

@@ -26,3 +26,10 @@ export function getSemester() {
   });
   });
 }
 }
 
 
+//获取级部下拉框(搜索条件);
+export function getGradelist() {
+  return request({
+    url: "/experimentPlan/getGradeList",
+    method: "get",
+  });
+}

ruoyi-ui/src/api/smartSchool/laboratoryManagement/leadlaboratoryRecords.js

@@ -3,9 +3,15 @@ import request from "@/utils/request";
 // 查看列表
 // 查看列表
 export function getList(query) {
 export function getList(query) {
   return request({
   return request({
-    url: "/experimentPlan/getExperimentRecord",
+    url: "/experimentPlan/getCountTeacher",
     method: "get",
     method: "get",
     params: query,
     params: query,
   });
   });
 }
 }
-
+//获取当前学年+学期
+export function getSemester() {
+  return request({
+    url: "/experimentPlan/getSemester",
+    method: "get",
+  });
+}

ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentClassification/index.vue

 <template>
 <template>
     <div>
     <div>
         <!-- 搜索条件 -->
         <!-- 搜索条件 -->
-        <el-form
-            :model="queryForm"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            label-width="68px"
-        >
+        <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
             <el-form-item label="仪器名称">
             <el-form-item label="仪器名称">
-                <el-input
-                    v-model="queryForm.name"
-                    placeholder="请输入"
-                    clearable
-                ></el-input>
+                <el-input v-model="queryForm.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
             </el-form-item>
             <el-form-item label="仪器分类">
             <el-form-item label="仪器分类">
-                <el-select
-                    v-model="queryForm.name"
-                    placeholder="请选择"
-                    clearable
-                >
+                <el-select v-model="queryForm.name" placeholder="请选择" clearable>
                     <el-option> </el-option>
                     <el-option> </el-option>
                 </el-select>
                 </el-select>
             </el-form-item>
             </el-form-item>
 
 
             <el-form-item>
             <el-form-item>
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="getList"
-                    >搜索</el-button
-                >
-                <el-button
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                    >重置</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
             </el-form-item>
         </el-form>
         </el-form>
         <!-- 操作按钮 -->
         <!-- 操作按钮 -->
         <el-row :gutter="10" class="mb8">
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
             <el-col :span="1.5">
-                <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handAdd()"
-                    v-hasPermi="['system:student:add']"
-                    >新增
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handAdd()"
+                    v-hasPermi="['system:student:add']">新增
                 </el-button>
                 </el-button>
             </el-col>
             </el-col>
             <el-col :span="1.5">
             <el-col :span="1.5">
-                <el-button
-                    type="success"
-                    plain
-                    icon="el-icon-edit"
-                    size="mini"
-                    :disabled="single"
-                    @click="handleUpdate"
-                    v-hasPermi="['system:student:edit']"
-                    >编辑
+                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+                    v-hasPermi="['system:student:edit']">编辑
                 </el-button>
                 </el-button>
             </el-col>
             </el-col>
             <el-col :span="1.5">
             <el-col :span="1.5">
-                <el-button
-                    type="danger"
-                    size="mini"
-                    icon="el-icon-view"
-                    :disabled="single"
-                    @click="handleDelete"
-                    >删除
+                <el-button type="danger" size="mini" icon="el-icon-view" :disabled="single" @click="handleDelete">删除
                 </el-button>
                 </el-button>
             </el-col>
             </el-col>
         </el-row>
         </el-row>
 
 
         <!-- 表格 -->
         <!-- 表格 -->
-        <el-table
-            :data="tableData"
-            style="width: 100%"
-            row-key="name"
-            border
-            lazy
-            :load="load"
-            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-            v-model="selectedRows"
-            @selection-change="handleSelectionChange"
-        >
+        <el-table :data="tableData" style="width: 100%" row-key="name" border lazy :load="load"
+            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-model="selectedRows"
+            @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column type="selection" width="55"></el-table-column>
 
 
-            <el-table-column
-                align="center"
-                type="index"
-                label="序号"
-                width="55"
-            />
+            <el-table-column align="center" type="index" label="序号" width="55" />
             <el-table-column prop="name" label="仪器名称" width="180" />
             <el-table-column prop="name" label="仪器名称" width="180" />
             <el-table-column prop="name" label="排序" width="180" />
             <el-table-column prop="name" label="排序" width="180" />
             <el-table-column prop="name" label="是否为消耗品" />
             <el-table-column prop="name" label="是否为消耗品" />
@@ -105,50 +48,27 @@
 
 
             <el-table-column align="center" fixed="right" label="操作">
             <el-table-column align="center" fixed="right" label="操作">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
-                    <el-button
-                        @click="handleUpdate(scope.row)"
-                        type="text"
-                        size="small"
-                        >编辑</el-button
-                    >
+                    <el-button @click="handleUpdate(scope.row)" type="text" size="small">编辑</el-button>
 
 
-                    <el-button
-                        @click="handleDelete(scope.row)"
-                        type="text"
-                        size="small"
-                        >删除</el-button
-                    >
+                    <el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
         </el-table>
         </el-table>
 
 
         <!-- 弹窗 -->
         <!-- 弹窗 -->
-        <el-dialog
-            :title="title"
-            :visible.sync="dialogTableVisible"
-            width="30%"
-            show-close
-        >
+        <el-dialog :title="title" :visible.sync="dialogTableVisible" width="30%" show-close>
             <el-form :model="form" ref="form" size="small" label-width="108px">
             <el-form :model="form" ref="form" size="small" label-width="108px">
                 <el-row>
                 <el-row>
                     <el-col :span="20">
                     <el-col :span="20">
                         <el-form-item label="上级分类">
                         <el-form-item label="上级分类">
-                            <el-input
-                                v-model="form.name"
-                                placeholder="请输入"
-                                clearable
-                            ></el-input>
+                            <el-input v-model="form.name" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
                 <el-row>
                 <el-row>
                     <el-col :span="20">
                     <el-col :span="20">
                         <el-form-item label="仪器名称">
                         <el-form-item label="仪器名称">
-                            <el-input
-                                v-model="form.name"
-                                placeholder="请输入"
-                                clearable
-                            >
+                            <el-input v-model="form.name" placeholder="请输入" clearable>
                             </el-input>
                             </el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -156,11 +76,7 @@
                 <el-row>
                 <el-row>
                     <el-col :span="20">
                     <el-col :span="20">
                         <el-form-item label="排序">
                         <el-form-item label="排序">
-                            <el-input
-                                v-model="form.name"
-                                placeholder="请输入"
-                                clearable
-                            ></el-input>
+                            <el-input v-model="form.name" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
@@ -177,33 +93,21 @@
                 <el-row>
                 <el-row>
                     <el-col :span="20">
                     <el-col :span="20">
                         <el-form-item label="备注">
                         <el-form-item label="备注">
-                            <el-input
-                                v-model="form.name"
-                                placeholder="请输入"
-                                type="textarea"
-                                clearable
-                            ></el-input>
+                            <el-input v-model="form.name" placeholder="请输入" type="textarea" clearable></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
             </el-form>
             </el-form>
 
 
             <div slot="footer">
             <div slot="footer">
-                <el-button type="primary" @click="submitparentForm"
-                    >确定</el-button
-                >
+                <el-button type="primary" @click="submitparentForm">确定</el-button>
                 <el-button @click="cancel">取 消</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
             </div>
         </el-dialog>
         </el-dialog>
 
 
         <!-- 分页 -->
         <!-- 分页 -->
-        <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryForm.pageNum"
-            :limit.sync="queryForm.pageSize"
-            @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
+            @pagination="getList" />
     </div>
     </div>
 </template>
 </template>
 
 
@@ -247,9 +151,9 @@ export default {
     },
     },
     methods: {
     methods: {
         // 搜索
         // 搜索
-        getList() {},
+        getList() { },
         // 重置
         // 重置
-        resetQuery() {},
+        resetQuery() { },
         //
         //
         load(tree, treeNode, resolve) {
         load(tree, treeNode, resolve) {
             setTimeout(() => {
             setTimeout(() => {
@@ -274,7 +178,7 @@ export default {
             this.title = '仪器药品编辑'
             this.title = '仪器药品编辑'
         },
         },
         // 删除
         // 删除
-        handleDelete() {},
+        handleDelete() { },
 
 
         // 确定
         // 确定
         submitparentForm() {
         submitparentForm() {
@@ -299,6 +203,7 @@ export default {
     margin-top: 15px;
     margin-top: 15px;
     margin-left: 10px;
     margin-left: 10px;
 }
 }
+
 .el-table {
 .el-table {
     margin-left: 10px;
     margin-left: 10px;
 }
 }

ruoyi-ui/src/views/smartSchool/classTeacherWork/laboratoryManagement/laboratoryApplicationrecords/index.vue

@@ -4,17 +4,12 @@
             <el-form-item label="实验名称">
             <el-form-item label="实验名称">
                 <el-input v-model="queryForm.experimentName" placeholder="请输入"></el-input>
                 <el-input v-model="queryForm.experimentName" placeholder="请输入"></el-input>
             </el-form-item>
             </el-form-item>
-
-            <el-form-item label="计划开始时间" prop="plannedStartTime">
-                <el-date-picker v-model="form.startTime" type="month" placeholder="选择月" value-format="yyyy-MM">
+            <el-form-item label="计划开始时间">
+                <el-date-picker v-model="queryForm.startTime" type="date" placeholder="选择" value-format="yyyy-MM-dd">
                 </el-date-picker>
                 </el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="计划结束时间" prop="plannedEndTime">
-                <el-date-picker v-model="form.endTime" type="month" placeholder="选择月" value-format="yyyy-MM">
+                <el-date-picker v-model="queryForm.endTime" type="date" placeholder="选择月" value-format="yyyy-MM-dd">
                 </el-date-picker>
                 </el-date-picker>
             </el-form-item>
             </el-form-item>
-
             <el-form-item label="申报状态">
             <el-form-item label="申报状态">
                 <el-select v-model="queryForm.applyState" placeholder="请选择" clearable>
                 <el-select v-model="queryForm.applyState" placeholder="请选择" clearable>
                     <el-option v-for="dict in dict.type.declare_state" :key="dict.value" :label="dict.label"
                     <el-option v-for="dict in dict.type.declare_state" :key="dict.value" :label="dict.label"
@@ -28,7 +23,11 @@
         </el-form>
         </el-form>
         <el-table :data="tableData" border style="width: 100%">
         <el-table :data="tableData" border style="width: 100%">
             <el-table-column align="center" type="index" label="序号" width="55" />
             <el-table-column align="center" type="index" label="序号" width="55" />
-            <el-table-column align="center" prop="sub" label="学科" />
+            <el-table-column align="center" prop="sub" label="学科">
+                <template slot-scope="{ row }">
+                    <div>{{ selectDictLabel(dict.type.lab_sub, row.sub) }}</div>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="schoolYearSemester" label="学年" />
             <el-table-column align="center" prop="schoolYearSemester" label="学年" />
             <el-table-column align="center" prop="className" label="班级" />
             <el-table-column align="center" prop="className" label="班级" />
             <el-table-column align="center" prop="experimentTime" label="实验时间" />
             <el-table-column align="center" prop="experimentTime" label="实验时间" />
@@ -49,22 +48,41 @@
                 </template>
                 </template>
 
 
             </el-table-column>
             </el-table-column>
-            <el-table-column align="center" prop="applyState" label="申报状态" />
+            <el-table-column align="center" prop="applyState" label="申报状态">
+                <template slot-scope="{ row }">
+                    <div v-if="row.applyState === '1'">已确认</div>
+                    <div v-else-if="row.applyState === '0'">未确认</div>
+                </template>
+            </el-table-column>
             <el-table-column align="center" fixed="right" label="操作" width="150">
             <el-table-column align="center" fixed="right" label="操作" width="150">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
-                    <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
-                    <el-button size="small" type="text" @click="upload.open = true">导入</el-button>
+                    <template v-if="scope.row.applyState === '0'">
+                        <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
+                    </template>
+                    <template v-else-if="scope.row.applyState === '1' && scope.row.state === '0'">
+                        <div>
+                            <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
+                            <el-button size="small" type="text" @click="upload.open = true">上传附件</el-button>
+                        </div>
+                    </template>
+                    <template v-else>
+                        <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
+                    </template>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
 
 
+
         </el-table>
         </el-table>
         <!-- 查看弹窗 -->
         <!-- 查看弹窗 -->
         <el-dialog title="申请信息" :visible.sync="dialogTableVisible" width="60%">
         <el-dialog title="申请信息" :visible.sync="dialogTableVisible" width="60%">
-            <el-form :model="form" ref="form" size="small" label-width="110px">
+            <el-form :model="form" ref="form" size="small" label-width="110px" :disabled="isEdit">
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="学科">
                         <el-form-item label="学科">
-                            <el-input v-model="form.sub" placeholder="请输入" clearable />
+                            <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;">
+                                <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+                            </el-select>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="10">
@@ -105,7 +123,10 @@
                     </el-col>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="实验分类">
                         <el-form-item label="实验分类">
-                            <el-input v-model="form.experimentClassify" placeholder="请输入" clearable />
+                            <el-select v-model="form.experimentClassify" placeholder="请选择" clearable>
+                                <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
+                                    :label="dict.label" :value="dict.value" />
+                            </el-select>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
@@ -134,7 +155,7 @@
                     </el-col>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="申报状态">
                         <el-form-item label="申报状态">
-                            <el-input v-model="form.state" placeholder="请输入" clearable />
+                            <el-input :value="getStatusText(form.applyState)" disabled placeholder="请输入" clearable />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
@@ -180,7 +201,12 @@ export default {
         return {
         return {
             baseUrl: process.env.VUE_APP_BASE_API,
             baseUrl: process.env.VUE_APP_BASE_API,
             queryForm: {
             queryForm: {
-
+                pageNum: 1,
+                pageSize: 10,
+                experimentName: "",
+                applyState: "",
+                startTime: "",
+                endTime: "",
             },
             },
             accessoryUrl: '',
             accessoryUrl: '',
             accessoryName: '',
             accessoryName: '',
@@ -212,6 +238,8 @@ export default {
                 url:
                 url:
                     process.env.VUE_APP_BASE_API + "/common/upload",
                     process.env.VUE_APP_BASE_API + "/common/upload",
             },
             },
+            applyState: '',            // 表单是否可以修改、
+            isEdit: true,
             total: 0,
             total: 0,
             dialogTableVisible: false,
             dialogTableVisible: false,
         }
         }
@@ -220,11 +248,19 @@ export default {
         this.getList();
         this.getList();
     },
     },
     methods: {
     methods: {
+        getStatusText(applyState) {
+            if (applyState === '0') {
+                return "未确认";
+            } else if (applyState === '1') {
+                return "已确认";
+            }
+        },
         //表单查询
         //表单查询
         getList() {
         getList() {
-            getTeacherlabList().then(res => {
+            getTeacherlabList(this.queryForm).then(res => {
                 if (res.code == 200) {
                 if (res.code == 200) {
                     this.tableData = res.rows;
                     this.tableData = res.rows;
+                    this.total = res.total;
                     this.tableData = res.rows.map(item => {
                     this.tableData = res.rows.map(item => {
                         item.accessoryList = item.schoolAccessoryList; // 将附件信息赋值给accessoryList属性
                         item.accessoryList = item.schoolAccessoryList; // 将附件信息赋值给accessoryList属性
                         return item;
                         return item;
@@ -241,11 +277,20 @@ export default {
             getTeacherLab(id).then(response => {
             getTeacherLab(id).then(response => {
                 this.form = response.data;
                 this.form = response.data;
                 this.fileList = response.data.schoolAccessoryList;
                 this.fileList = response.data.schoolAccessoryList;
+                this.isEdit = true;
             })
             })
 
 
         },
         },
         resetQuery() {
         resetQuery() {
-            this.getList();
+            this.queryForm = {
+                pageNum: 1,
+                pageSize: 10,
+                experimentName: "",
+                applyState: "",
+                startTime: "",
+                endTime: "",
+            },
+                this.getList();
         },
         },
         //提交按钮
         //提交按钮
         submitFileForm(data) {
         submitFileForm(data) {

ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/classDetails/index.vue

 <template>
 <template>
     <div class="app-container">
     <div class="app-container">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
-            <el-form-item label="教师">
-                <el-input v-model="queryForm.teacher" placeholder="请输入教师" clearable></el-input>
+            <el-form-item label="实验级部">
+                <el-select v-model="queryForm.gradeId" placeholder="请选择级部" clearable>
+                    <el-option v-for="(item, index) in gradeLists" :key="index" :label="item.gradeName"
+                        :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="班级">
+                <el-input v-model="queryForm.className" placeholder="请选择级部" clearable></el-input>
             </el-form-item>
             </el-form-item>
             <el-form-item label="学期">
             <el-form-item label="学期">
-                <el-date-picker v-model="queryForm.semester" type="year" value-format="yyyy" placeholder="选择年">
+                <el-date-picker v-model="queryForm.schoolYear" type="year" value-format="yyyy" placeholder="选择年">
                 </el-date-picker>
                 </el-date-picker>
+                <el-select v-model="queryForm.semester" placeholder="请选择学期">
+                    <el-option label="上学期" value="1"></el-option>
+                    <el-option label="下学期" value="2"></el-option>
+                </el-select>
+
             </el-form-item>
             </el-form-item>
             <el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
@@ -14,18 +25,45 @@
             </el-form-item>
             </el-form-item>
         </el-form>
         </el-form>
         <el-table :data="tableData" border style="width: 100%">
         <el-table :data="tableData" border style="width: 100%">
-            <el-table-column align="center" prop="applyName" label="教师" />
-            <el-table-column align="center" prop="schoolYear" label="学年" />
-            <el-table-column align="center" prop="fzcount" label="分组实验" />
-            <el-table-column align="center" prop="sycount" label="演示实验" />
-            <el-table-column align="center" prop="sjcount" label="探究实验" />
-            <el-table-column align="center" prop="ywccount" label="已完成实验数" />
+            <el-table-column align="center" type="index" label="序号" width="55" />
+            <el-table-column align="center" prop="grade" label="级部" />
+            <el-table-column align="center" prop="schoolYearSemester" label="学期" />
+            <el-table-column align="center" prop="className" label="班级" />
+            <el-table-column align="center" prop="jhsys" label="计划实验数" />
+            <el-table-column align="center" prop="ywcsys" label="已完成实验数" />
+            <el-table-column align="center" prop="ratio" label="完成比列" />
+            <el-table-column align="center" fixed="right" label="操作" width="150">
+                <template slot-scope="scope">
+                    <el-button @click="handleLook(scope.row)" type="text" size="small">查看班级完成详情</el-button>
+                </template>
+            </el-table-column>
 
 
         </el-table>
         </el-table>
         <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
         <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
             @pagination="getList" />
             @pagination="getList" />
+        <!-- 查看弹窗 -->
+        <el-dialog title="实验名称:物理研究" :visible.sync="dialogTableVisible" width="80%" height="1000px">
+            <el-table :data="ExperimentalData" border>
+                <el-table-column align="center" type="index" label="序号" width="55" />
+                <el-table-column align="center" prop="experimentClassify" label="实验分类">
+                    <template slot-scope="{ row }">
+                        <div>{{ selectDictLabel(dict.type.experiment_classify, row.experimentClassify) }}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="className" label="学期" />
+                <el-table-column align="center" prop="className" label="级部" />
+                <el-table-column align="center" prop="className" label="班级" />
+                <el-table-column align="center" prop="experimentTime" label="实验时间" />
+                <el-table-column align="center" prop="section" label="节次" />
+                <el-table-column align="center" prop="className" label="实验名称" />
+                <el-table-column align="center" prop="className" label="实验分类" />
+                <el-table-column align="center" prop="section" label="章节内容" />
+
+            </el-table>
 
 
 
 
+        </el-dialog>
+
 
 
     </div>
     </div>
 </template>
 </template>
@@ -33,37 +71,47 @@
 <script>
 <script>
 import {
 import {
     getList,
     getList,
-    getTeacherxq,
-    getSemester
-} from '@/api/smartSchool/laboratoryManagement/leadlaboratoryRecords'
+    getSemester,
+    getGradelist,
+    getClassDetailsxq,
+} from '@/api/smartSchool/gradeWork/laboratoryManagement/classDetails'
 export default {
 export default {
+    dicts: ['experiment_classify', 'lab_sub'],
     name: 'index',
     name: 'index',
     data() {
     data() {
         return {
         return {
             queryForm: {
             queryForm: {
-
+                schoolYear: "",
+                semester: "",
+                gradeId: "",
+                className: "",
+                pageNum: 1,
+                pageSize: 10,
             },
             },
             //表格数据
             //表格数据
             tableData: [
             tableData: [
-                {
 
 
-                }
             ],
             ],
-
+            gradeLists: [],
+            ExperimentalData: [],
+            dialogTableVisible: false,
             total: 0,
             total: 0,
         }
         }
     },
     },
+    created() {
+        this.getSemesterAndList();
+        this.getGradelist();
+        this.getSemester();
+
+
+    },
     methods: {
     methods: {
         async getSemesterAndList() {
         async getSemesterAndList() {
             await this.getSemester(); // 等待获取学年信息
             await this.getSemester(); // 等待获取学年信息
             this.getList(); // 获取默认数据
             this.getList(); // 获取默认数据
         },
         },
         getList() {
         getList() {
-            const params = {
-                schoolYear: this.queryForm.schoolYear,
-                applyName: this.queryForm.applyName,
-            };
-            getList(params)
+            getList(this.queryForm)
                 .then(response => {
                 .then(response => {
                     this.tableData = response.rows;
                     this.tableData = response.rows;
                     console.log('response', response);
                     console.log('response', response);
@@ -79,6 +127,7 @@ export default {
             return new Promise((resolve, reject) => {
             return new Promise((resolve, reject) => {
                 getSemester()
                 getSemester()
                     .then(response => {
                     .then(response => {
+                        this.queryForm.semester = response.semester;
                         this.queryForm.schoolYear = response.schoolYear + '';
                         this.queryForm.schoolYear = response.schoolYear + '';
                         resolve(); // 成功获取学年信息
                         resolve(); // 成功获取学年信息
                     })
                     })
@@ -88,6 +137,35 @@ export default {
                     });
                     });
             });
             });
         },
         },
+        //查询级部搜索
+        getGradelist() {
+            getGradelist().then(response => {
+                this.loading = false;
+                this.gradeLists = response.data;
+
+            });
+        },
+        //查看按钮
+        handleLook(row) {
+            console.log(row);
+            // 设置 dialogTableVisible 为 true，显示弹窗
+            this.dialogTableVisible = true;
+            // 根据 row 的数据构建请求参数
+            const params = {
+                schoolYear: row.schoolYear,
+                semester: row.semester,
+                gradeId: row.gradeId,
+                classId: row.classId
+            };
+            console.log(params);
+            getClassDetailsxq(params).then(response => {
+                console.log(params);
+                this.ExperimentalData = response.rows;
+                this.loading = false;
+            }).catch(error => {
+
+            });
+        },
 
 
         resetQuery() {
         resetQuery() {
             this.queryForm = {
             this.queryForm = {

ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/experimentalPlan/index.vue

 <template>
 <template>
     <div class="app-container">
     <div class="app-container">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
-            <el-form-item label="学科分类">
-                <el-select v-model="queryForm.sub" placeholder="请选择" clearable>
-                    <el-option v-for="(item, index) in subList" :key="index" :label="item.dictLabel"
-                        :value="item.dictValue"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="实验级部">
-                <el-select v-model="queryForm.gradeId" placeholder="请选择">
-                    <el-option v-for="item in gradeList" :key="item.id" :label="item.gradeName" :value="item.id">
-                    </el-option>
+
+            <el-form-item label="学期">
+                <el-date-picker v-model="queryForm.schoolYear" type="year" value-format="yyyy" placeholder="选择年">
+                </el-date-picker>
+                <el-select v-model="queryForm.semester" placeholder="请选择学期">
+                    <el-option label="上学期" value="1"></el-option>
+                    <el-option label="下学期" value="2"></el-option>
                 </el-select>
                 </el-select>
+
             </el-form-item>
             </el-form-item>
             <el-form-item label="实验分类">
             <el-form-item label="实验分类">
                 <el-select v-model="queryForm.experimentClassify" placeholder="请选择" clearable>
                 <el-select v-model="queryForm.experimentClassify" placeholder="请选择" clearable>
@@ -19,6 +17,9 @@
                         :value="dict.value" />
                         :value="dict.value" />
                 </el-select>
                 </el-select>
             </el-form-item>
             </el-form-item>
+            <el-form-item label="实验名称">
+                <el-input v-model="queryForm.experimentName" placeholder="请输入实验名称" clearable></el-input>
+            </el-form-item>
             <el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -28,8 +29,6 @@
             <el-col :span="1.5">
             <el-col :span="1.5">
                 <el-button size="mini" type="primary" icon="el-icon-plus" @click="handleOption(0)"> 新增
                 <el-button size="mini" type="primary" icon="el-icon-plus" @click="handleOption(0)"> 新增
                 </el-button>
                 </el-button>
-                <el-button size="mini" type="success" icon="el-icon-download" @click="handleImport">导入
-                </el-button>
             </el-col>
             </el-col>
         </el-row>
         </el-row>
         <el-table :data="tableData" border style="width: 100%">
         <el-table :data="tableData" border style="width: 100%">
@@ -49,14 +48,24 @@
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
             <el-table-column align="center" prop="chapterContent" label="章节内容" />
             <el-table-column align="center" prop="chapterContent" label="章节内容" />
-            <el-table-column align="center" prop="isAppointment" label="是否已预约" />
+            <el-table-column align="center" prop="isAppointment" label="是否已预约">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.isAppointment === '0'">未预约</span>
+                    <span v-else-if="scope.row.isAppointment === '1'">已预约</span>
+                </template>
+            </el-table-column>
+
             <el-table-column align="center" fixed="right" label="操作" width="150">
             <el-table-column align="center" fixed="right" label="操作" width="150">
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">
-                    <div>
+                    <div v-if="row.isAppointment === '0'">
                         <el-button type="text" size="small" @click="handleOption(2, row)">查看</el-button>
                         <el-button type="text" size="small" @click="handleOption(2, row)">查看</el-button>
                         <el-button type="text" size="small" @click="handleOption(1, row)">修改</el-button>
                         <el-button type="text" size="small" @click="handleOption(1, row)">修改</el-button>
                         <el-button type="text" size="small" @click="handleDelete(row.id)">删除</el-button>
                         <el-button type="text" size="small" @click="handleDelete(row.id)">删除</el-button>
                     </div>
                     </div>
+                    <div v-else>
+                        <el-button type="text" size="small" @click="handleOption(2, row)">查看</el-button>
+
+                    </div>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
         </el-table>
         </el-table>
@@ -196,11 +205,12 @@ export default {
     data() {
     data() {
         return {
         return {
             queryForm: {
             queryForm: {
-                sub: '',
-                gradeId: '',
-                experimentClassify: '',
+                schoolYear: "",
+                semester: "",
+                experimentClassify: "",
                 pageNum: 1,
                 pageNum: 1,
                 pageSize: 10,
                 pageSize: 10,
+          
             },
             },
             classList: [], // 班级列表数据
             classList: [], // 班级列表数据
             subList: [],// 学科列表
             subList: [],// 学科列表
@@ -208,9 +218,7 @@ export default {
             gradeList: [],
             gradeList: [],
             //表格数据
             //表格数据
             tableData: [
             tableData: [
-                {
 
 
-                }
             ],
             ],
             //查看弹窗表格
             //查看弹窗表格
             ExperimentalData: [],
             ExperimentalData: [],
@@ -281,21 +289,40 @@ export default {
         }
         }
     },
     },
     created() {
     created() {
-        this.getList();
+        this.getListWithSemester();
         this.getGrade();
         this.getGrade();
 
 
 
 
     },
     },
 
 
     methods: {
     methods: {
+        getListWithSemester() {
+            this.getSemester(() => {
+                this.getList();
+            });
+        },
+        getSemester(callback) {
+            getSemester().then((res) => {
+                this.form.semester = res.semester;
+                this.form.schoolYear = res.schoolYear + '';
+                this.queryForm.semester = res.semester;
+                this.queryForm.schoolYear = res.schoolYear + '';
+                console.log(this.form.semester, typeof this.form.semester);
+
+                if (callback && typeof callback === 'function') {
+                    callback();
+                }
+            });
+        },
         getList() {
         getList() {
             getExperimentPlan(this.queryForm).then(response => {
             getExperimentPlan(this.queryForm).then(response => {
                 this.tableData = response.rows;
                 this.tableData = response.rows;
                 console.log('this.tableData', this.tableData);
                 console.log('this.tableData', this.tableData);
-                this.total = response.total
-                this.loading = false
-            })
+                this.total = response.total;
+                this.loading = false;
+            });
         },
         },
+
         //选择级部自动获取年级
         //选择级部自动获取年级
         onGradeChange() {
         onGradeChange() {
             const selectedGrade = this.gradeList.find(grade => grade.id === this.form.gradeId);
             const selectedGrade = this.gradeList.find(grade => grade.id === this.form.gradeId);
@@ -337,21 +364,8 @@ export default {
 
 
         },
         },
 
 
-        //获得当前年份
-        newYear() {
-            getNewYear().then((res) => {
-                this.form.schoolYear = res.schoolYear;
-                console.log(this.form.schoolYear, typeof this.form.schoolYear);
-            });
-        },
-        //获取当前学期
-        getSemester() {
-            getSemester().then((res) => {
-                this.form.semester = res.semester;
-                console.log(this.form.semester, typeof this.form.semester);
 
 
-            });
-        },
+
         //查询级部
         //查询级部
         getGrade() {
         getGrade() {
             getGrade().then(response => {
             getGrade().then(response => {
@@ -384,11 +398,14 @@ export default {
 
 
         //重置按钮
         //重置按钮
         resetQuery() {
         resetQuery() {
-            this.queryForm.sub = '';
-            this.queryForm.gradeId = '';
-            this.queryForm.experimentClassify = '';
-            // this.resetForm("queryForm");
-            this.getList();
+            this.queryForm = {
+                schoolYear: "",
+                semester: "",
+                experimentClassify: "",
+                pageNum: 1,
+                pageSize: 10,
+            },
+                this.getList();
         },
         },
 
 
         // 0新增、1修改、2查看
         // 0新增、1修改、2查看
@@ -411,7 +428,6 @@ export default {
                 schoolExperimentPlanClassList: [],
                 schoolExperimentPlanClassList: [],
             }
             }
             this.nowType = type;
             this.nowType = type;
-            this.newYear();
             this.getSemester();
             this.getSemester();
             if (type != 0) {
             if (type != 0) {
                 const id = row.id
                 const id = row.id

ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/laboratoryAppointment/index.vue

@@ -5,8 +5,8 @@
                 <el-date-picker v-model="queryForm.schoolYear" type="year" value-format="yyyy" placeholder="选择年" clearable>
                 <el-date-picker v-model="queryForm.schoolYear" type="year" value-format="yyyy" placeholder="选择年" clearable>
                 </el-date-picker>
                 </el-date-picker>
                 <el-select v-model="queryForm.semester" placeholder="请选择学期" clearable>
                 <el-select v-model="queryForm.semester" placeholder="请选择学期" clearable>
-                    <el-option label="上学期" value="0"></el-option>
-                    <el-option label="下学期" value="1"></el-option>
+                    <el-option label="上学期" value="1"></el-option>
+                    <el-option label="下学期" value="2"></el-option>
                 </el-select>
                 </el-select>
             </el-form-item>
             </el-form-item>
             <el-form-item label="实验分类">
             <el-form-item label="实验分类">
@@ -120,7 +120,7 @@
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="学科" prop="sub">
                         <el-form-item label="学科" prop="sub">
-                            <el-input v-model="form.sub" placeholder="请输入" clearable @input="handleChangeSub"
+                            <el-input v-model="form.sub" placeholder="请输入" clearable
                                 :disabled="nowType === 1 || nowType === 2 || nowType === 0" />
                                 :disabled="nowType === 1 || nowType === 2 || nowType === 0" />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
@@ -262,16 +262,12 @@ export default {
         }
         }
     },
     },
     created() {
     created() {
-        this.getList();
+        this.getSchholyear();
         this.getExperimentName();
         this.getExperimentName();
 
 
     },
     },
     methods: {
     methods: {
-        handleChangeSub() {
-            this.form.sub = this.selectDictLabel(this.dict.type.lab_sub, this.form.sub);
-            console.log('this.form.sub', this.form.sub);
 
 
-        },
         //表单查询
         //表单查询
         getList() {
         getList() {
             getLabplanlist(this.queryForm).then(response => {
             getLabplanlist(this.queryForm).then(response => {
@@ -286,7 +282,6 @@ export default {
             getLabplanxlk().then(response => {
             getLabplanxlk().then(response => {
                 this.tableList = response.data;
                 this.tableList = response.data;
                 console.log('this.tableList', this.tableList);
                 console.log('this.tableList', this.tableList);
-
                 this.loading = false
                 this.loading = false
             })
             })
 
 
@@ -321,12 +316,14 @@ export default {
         //获取当前学年+学期
         //获取当前学年+学期
         getSchholyear() {
         getSchholyear() {
             getSemester().then(response => {
             getSemester().then(response => {
-                console.log(this.form);
-                // this.form.schoolYear = response.schoolYear;
-                console.log(response.schoolYear);
+                this.form.schoolYear = response.schoolYear;
                 this.form.semester = response.semester;
                 this.form.semester = response.semester;
+                this.queryForm.schoolYear = response.schoolYear + '';
+                this.queryForm.semester = response.semester;
 
 
-            })
+                // 在获取到学年和学期后，调用getList方法进行表单查询
+                this.getList();
+            });
         },
         },
 
 
         //删除按钮操作
         //删除按钮操作
@@ -388,7 +385,15 @@ export default {
 
 
 
 
         resetQuery() {
         resetQuery() {
-            this.getList();
+            this.queryForm = {
+                pageNum: 1,
+                pageSize: 10,
+                schoolYear: '',
+                semester: '',
+                experimentClassify: '',
+                experimentName: '',
+            },
+                this.getList();
         },
         },
 
 
         // 保存按钮
         // 保存按钮

ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/laboratoryDetails/index.vue

 <template>
 <template>
     <div class="app-container">
     <div class="app-container">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
-            <el-form-item label="级部">
-                <el-input v-model="queryForm.grade" placeholder="请输入级部" clearable></el-input>
+            <el-form-item label="实验级部">
+                <el-select v-model="queryForm.gradeId" placeholder="请选择级部" clearable>
+                    <el-option v-for="(item, index) in gradeLists" :key="index" :label="item.gradeName"
+                        :value="item.id"></el-option>
+                </el-select>
             </el-form-item>
             </el-form-item>
             <el-form-item label="实验名称">
             <el-form-item label="实验名称">
-                <el-input v-model="queryForm.name" placeholder="请输入实验名称" clearable></el-input>
+                <el-input v-model="queryForm.experimentName" placeholder="请输入实验名称" clearable></el-input>
             </el-form-item>
             </el-form-item>
             <el-form-item label="学期">
             <el-form-item label="学期">
-                <el-date-picker v-model="queryForm.year" type="year" value-format="yyyy" placeholder="选择年">
+                <el-date-picker v-model="queryForm.schoolYear" type="year" value-format="yyyy" placeholder="选择年">
                 </el-date-picker>
                 </el-date-picker>
-                <el-select v-model="queryForm.semester"  placeholder="请选择学期">
-                    <el-option label="上学期" value="0"></el-option>
-                    <el-option label="下学期" value="1"></el-option>
+                <el-select v-model="queryForm.semester" placeholder="请选择学期">
+                    <el-option label="上学期" value="1"></el-option>
+                    <el-option label="下学期" value="2"></el-option>
                 </el-select>
                 </el-select>
 
 
             </el-form-item>
             </el-form-item>
@@ -41,12 +44,6 @@
         <!-- 查看弹窗 -->
         <!-- 查看弹窗 -->
         <el-dialog title="实验名称:物理研究" :visible.sync="dialogTableVisible" width="80%">
         <el-dialog title="实验名称:物理研究" :visible.sync="dialogTableVisible" width="80%">
             <el-form :model="form" ref="form" size="small" :inline="true" label-width="88px">
             <el-form :model="form" ref="form" size="small" :inline="true" label-width="88px">
-                <el-form-item label="实验分类">
-                    <el-select v-model="form.experimentClassify" placeholder="请选择" clearable>
-                        <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value" :label="dict.label"
-                            :value="dict.value" />
-                    </el-select>
-                </el-form-item>
                 <el-form-item label="班级">
                 <el-form-item label="班级">
                     <el-input v-model="form.className" placeholder="请输入班级" clearable></el-input>
                     <el-input v-model="form.className" placeholder="请输入班级" clearable></el-input>
                 </el-form-item>
                 </el-form-item>
@@ -94,36 +91,44 @@
 import {
 import {
     getList,
     getList,
     getSemester,
     getSemester,
-    getTeacherxq
-} from '@/api/smartSchool/laboratoryManagement/leadlaboratoryCompletion'
+    getGradelist,
+    getClassDetailsxq,
+} from '@/api/smartSchool/gradeWork/laboratoryManagement/laboratoryDetails'
 export default {
 export default {
     name: 'index',
     name: 'index',
     dicts: ['experiment_classify', 'lab_sub'],
     dicts: ['experiment_classify', 'lab_sub'],
     data() {
     data() {
         return {
         return {
             queryForm: {
             queryForm: {
-
+                pageNum: 1,
+                pageSize: 10,
+                schoolYear: "",
+                semester: "",
+                gradeId: "",
+                experimentName: "",
             },
             },
+            gradeLists: [],
             //表格数据
             //表格数据
             tableData: [
             tableData: [
-                {
 
 
-                }
             ],
             ],
             //查看弹窗表格
             //查看弹窗表格
             ExperimentalData: [],
             ExperimentalData: [],
             form: {
             form: {
 
 
             },
             },
-            //实验分类下拉框
-            options: {
-
-            },
             //弹窗
             //弹窗
             dialogTableVisible: false,
             dialogTableVisible: false,
             total: 0,
             total: 0,
         }
         }
     },
     },
+    created() {
+        this.getSemesterAndList();
+        this.getGradelist();
+        this.getSemester();
+
+
+    },
     methods: {
     methods: {
         async getSemesterAndList() {
         async getSemesterAndList() {
             await this.getSemester(); // 等待获取学年和学期信息
             await this.getSemester(); // 等待获取学年和学期信息
@@ -157,6 +162,15 @@ export default {
                     console.log(error);
                     console.log(error);
                 });
                 });
         },
         },
+        //查询级部搜索
+        getGradelist() {
+            getGradelist().then(response => {
+                this.loading = false;
+                this.gradeLists = response.data;
+                console.log("this.gradeList", this.gradeList);
+
+            });
+        },
         //查看按钮
         //查看按钮
         handleLook(row) {
         handleLook(row) {
             console.log(row);
             console.log(row);
@@ -166,14 +180,12 @@ export default {
             // 根据 row 的数据构建请求参数
             // 根据 row 的数据构建请求参数
             const params = {
             const params = {
                 experimentPlanId: row.id,
                 experimentPlanId: row.id,
-                experimentClassify: this.form.experimentClassify,
                 className: this.form.className,
                 className: this.form.className,
                 startTime: this.form.startTime,
                 startTime: this.form.startTime,
                 endTime: this.form.endTime,
                 endTime: this.form.endTime,
             };
             };
-            getTeacherxq(params).then(response => {
+            getClassDetailsxq(params).then(response => {
                 this.ExperimentalData = response.rows;
                 this.ExperimentalData = response.rows;
-                this.total = response.total;
                 this.loading = false;
                 this.loading = false;
             }).catch(error => {
             }).catch(error => {
 
 
@@ -187,22 +199,20 @@ export default {
                 pageSize: 10,
                 pageSize: 10,
                 schoolYear: "",
                 schoolYear: "",
                 semester: "",
                 semester: "",
-                sub: "",
-                grade: "",
+                gradeId: "",
                 experimentName: "",
                 experimentName: "",
-            };
-            this.getList();
+            },
+                this.getList();
         },
         },
         //弹窗获取表单
         //弹窗获取表单
         getListtc() {
         getListtc() {
             const params = {
             const params = {
                 experimentPlanId: this.form.id,
                 experimentPlanId: this.form.id,
-                experimentClassify: this.form.experimentClassify,
                 className: this.form.className,
                 className: this.form.className,
                 startTime: this.form.startTime,
                 startTime: this.form.startTime,
                 endTime: this.form.endTime,
                 endTime: this.form.endTime,
             };
             };
-            getTeacherxq(params).then(response => {
+            getClassDetailsxq(params).then(response => {
                 this.ExperimentalData = response.rows;
                 this.ExperimentalData = response.rows;
             }).catch(error => {
             }).catch(error => {
 
 
@@ -214,12 +224,9 @@ export default {
                 pageNum: 1,
                 pageNum: 1,
                 pageSize: 10,
                 pageSize: 10,
                 experimentPlanId: "",
                 experimentPlanId: "",
-                experimentClassify: "",
-                className: "",
                 startTime: "",
                 startTime: "",
                 endTime: "",
                 endTime: "",
             };
             };
-
             this.getListtc();
             this.getListtc();
         },
         },
 
 

ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/experimentalPlan/index.vue

@@ -123,6 +123,8 @@
 import {
 import {
     getExperimentPlan,
     getExperimentPlan,
     getExperimentPlaxq,
     getExperimentPlaxq,
+    getSemester
+
 } from '@/api/smartSchool/laboratoryManagement/experimentalPlan'
 } from '@/api/smartSchool/laboratoryManagement/experimentalPlan'
 export default {
 export default {
     name: 'index',
     name: 'index',
@@ -159,16 +161,43 @@ export default {
 
 
     created() {
     created() {
         this.getList();
         this.getList();
+        this.getSemesterAndList();
     },
     },
     methods: {
     methods: {
+
+        async getSemesterAndList() {
+            await this.getSemester(); // 等待获取学年和学期信息
+            this.getList(); // 获取数据列表
+        },
+        getSemester() {
+            return new Promise((resolve, reject) => {
+                getSemester()
+                    .then(response => {
+                        this.queryForm.semester = response.semester;
+                        this.queryForm.schoolYear = response.schoolYear + '';
+                        resolve(); // 成功获取学年和学期信息
+                    })
+                    .catch(error => {
+                        console.log(error);
+                        reject(error);
+                    });
+            });
+        },
         getList() {
         getList() {
-            getExperimentPlan(this.queryForm).then(response => {
-                this.tableData = response.rows;
-                console.log('response', response);
-                this.total = response.total
-                this.loading = false
-            })
+
+            getExperimentPlan(this.queryForm)
+                .then(response => {
+                    this.tableData = response.rows;
+                    console.log('response', response);
+                    this.total = response.total;
+                    this.loading = false;
+                })
+                .catch(error => {
+                    this.loading = false;
+                    console.log(error);
+                });
         },
         },
+
         resetQuery() {
         resetQuery() {
             this.queryForm = {
             this.queryForm = {
                 pageNum: 1,
                 pageNum: 1,

ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/experimentalRecords/index.vue

@@ -24,7 +24,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
-    <el-table v-loading="loading" :data="tableData" stripe>
+    <el-table border v-loading="loading" :data="tableData" stripe>
       <el-table-column fixed="left" label="序号" type="index" width="55" align="center" />
       <el-table-column fixed="left" label="序号" type="index" width="55" align="center" />
       <el-table-column label="学科" align="center" prop="sub">
       <el-table-column label="学科" align="center" prop="sub">
         <template slot-scope="{ row }">
         <template slot-scope="{ row }">
@@ -65,7 +65,7 @@
 <script>
 <script>
 import {
 import {
   getList,
   getList,
-} from '@/api/smartSchool/laboratoryManagement/leadlaboratoryRecords'
+} from '@/api/smartSchool/laboratoryManagement/experimentalRecords'
 export default {
 export default {
   dicts: ['experiment_classify', 'lab_sub'],
   dicts: ['experiment_classify', 'lab_sub'],
   data() {
   data() {

ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/gradeExperimentapp/index.vue

 <template>
 <template>
     <div class="app-container">
     <div class="app-container">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="88px">
         <el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="88px">
-            <el-form-item label="实验级部">
-                <el-input v-model="queryForm.grade" placeholder="请输入"></el-input>
+            <el-form-item label="学期">
+                <el-date-picker v-model="queryForm.schoolYear" type="year" value-format="yyyy" placeholder="选择年">
+                </el-date-picker>
+                <el-select v-model="queryForm.semester" placeholder="请选择学期">
+                    <el-option label="上学期" value="1"></el-option>
+                    <el-option label="下学期" value="2"></el-option>
+                </el-select>
             </el-form-item>
             </el-form-item>
             <el-form-item label="实验室名称">
             <el-form-item label="实验室名称">
                 <el-input v-model="queryForm.experimentName" placeholder="请输入"></el-input>
                 <el-input v-model="queryForm.experimentName" placeholder="请输入"></el-input>
             </el-form-item>
             </el-form-item>
-            <el-form-item label="预约时间段">
-                <el-date-picker v-model="queryForm.time" type="daterange" range-separator="至" start-placeholder="开始日期"
-                    end-placeholder="结束日期" value-format="yyyy-MM-dd"
-                    :value="[queryForm.plannedStartTime, queryForm.plannedEndTime]">
-                </el-date-picker>
+            <el-form-item label="实验分类">
+                <el-select v-model="queryForm.experimentClassify" placeholder="请选择" clearable>
+                    <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value" :label="dict.label"
+                        :value="dict.value" />
+                </el-select>
             </el-form-item>
             </el-form-item>
             <el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
@@ -59,7 +64,7 @@
         </el-table>
         </el-table>
         <!-- 查看 -->
         <!-- 查看 -->
         <el-dialog title="申请信息" :visible.sync="open" width="50%">
         <el-dialog title="申请信息" :visible.sync="open" width="50%">
-            <el-form :model="form" ref="form" size="small" label-width="100px">
+            <el-form :model="form" ref="form" size="small" label-width="100px" :disabled="isEdit">
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="申请老师">
                         <el-form-item label="申请老师">
@@ -165,13 +170,13 @@
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="申请老师">
                         <el-form-item label="申请老师">
-                            <el-input v-model="postForm.applyName" placeholder="请输入" clearable />
+                            <el-input v-model="postForm.applyName" placeholder="请输入" clearable :disabled="isEdit"/>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="实验分类">
                         <el-form-item label="实验分类">
                             <el-select v-model="postForm.experimentClassify" placeholder="请选择" clearable
                             <el-select v-model="postForm.experimentClassify" placeholder="请选择" clearable
-                                style="width: 100%;">
+                                style="width: 100%;" :disabled="isEdit">
                                 <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
                                 <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
                                     :label="dict.label" :value="dict.value" />
                                     :label="dict.label" :value="dict.value" />
                             </el-select>
                             </el-select>
@@ -182,12 +187,12 @@
                 <el-row :gutter="20">
                 <el-row :gutter="20">
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="实验名称">
                         <el-form-item label="实验名称">
-                            <el-input v-model="postForm.experimentName" placeholder="请输入" clearable />
+                            <el-input v-model="postForm.experimentName" placeholder="请输入" clearable  :disabled="isEdit"/>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="学科">
                         <el-form-item label="学科">
-                            <el-select v-model="postForm.sub" placeholder="请选择" clearable style="width: 100%;">
+                            <el-select v-model="postForm.sub" placeholder="请选择" clearable style="width: 100%;" :disabled="isEdit">
                                 <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
                                 <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
                                     :value="dict.value" />
                                     :value="dict.value" />
                             </el-select>
                             </el-select>
@@ -199,7 +204,7 @@
                 <el-row :gutter="20">
                 <el-row :gutter="20">
                     <el-col :span="20">
                     <el-col :span="20">
                         <el-form-item label="章节内容">
                         <el-form-item label="章节内容">
-                            <el-input v-model="postForm.chapterContent" placeholder="请输入" clearable></el-input>
+                            <el-input v-model="postForm.chapterContent" placeholder="请输入" clearable :disabled="isEdit"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
@@ -208,12 +213,12 @@
                 <el-row :gutter="20">
                 <el-row :gutter="20">
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="级部">
                         <el-form-item label="级部">
-                            <el-input v-model="postForm.grade" placeholder="请输入" clearable />
+                            <el-input v-model="postForm.grade" placeholder="请输入" clearable  :disabled="isEdit"/>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="学年">
                         <el-form-item label="学年">
-                            <el-input v-model="postForm.schoolYear" placeholder="请输入" clearable />
+                            <el-input v-model="postForm.schoolYear" placeholder="请输入" clearable  :disabled="isEdit"/>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
@@ -277,6 +282,11 @@ import {
     getLabClassYearxq,
     getLabClassYearxq,
 
 
 } from '@/api/smartSchool/laboratoryManagement/gradeExperimentapp'
 } from '@/api/smartSchool/laboratoryManagement/gradeExperimentapp'
+import {
+
+    getSemester
+
+} from '@/api/smartSchool/laboratoryManagement/experimentalPlan'
 export default {
 export default {
     name: 'index',
     name: 'index',
     dicts: ['experiment_classify', 'lab_sub', 'declare_state'],
     dicts: ['experiment_classify', 'lab_sub', 'declare_state'],
@@ -285,10 +295,10 @@ export default {
             queryForm: {
             queryForm: {
                 pageNum: 1,
                 pageNum: 1,
                 pageSize: 10,
                 pageSize: 10,
-                grade: '',
-                experimentName: '',
-                plannedStartTime: '',
-                plannedEndTime: '',
+                schoolYear: "",
+                semester: "",
+                experimentName: "",
+                experimentClassify: "",
 
 
             },
             },
             //实验室
             //实验室
@@ -298,10 +308,7 @@ export default {
             tableData: [
             tableData: [
 
 
             ],
             ],
-            //学科分类
-            options: {
-
-            },
+            isEdit: false,
             postForm: {
             postForm: {
                 applyName: '',
                 applyName: '',
                 experimentClassify: '',
                 experimentClassify: '',
@@ -334,17 +341,40 @@ export default {
         }
         }
     },
     },
     created() {
     created() {
-        this.getList();
+        this.getSemesterAndList();
     },
     },
     methods: {
     methods: {
-        //表单查询
-        getList() {
-            getLabClassYear(this.queryForm).then(response => {
-                this.tableData = response.rows
 
 
-                this.total = response.total
-                this.loading = false
-            })
+        async getSemesterAndList() {
+            await this.getSemester(); // 等待获取学年和学期信息
+            this.getList(); // 获取数据列表
+        },
+        getSemester() {
+            return new Promise((resolve, reject) => {
+                getSemester()
+                    .then(response => {
+                        this.queryForm.semester = response.semester;
+                        this.queryForm.schoolYear = response.schoolYear + '';
+                        resolve(); // 成功获取学年和学期信息
+                    })
+                    .catch(error => {
+                        console.log(error);
+                        reject(error);
+                    });
+            });
+        },
+        getList() {
+            getLabClassYear(this.queryForm)
+                .then(response => {
+                    this.tableData = response.rows;
+                    console.log('response', response);
+                    this.total = response.total;
+                    this.loading = false;
+                })
+                .catch(error => {
+                    this.loading = false;
+                    console.log(error);
+                });
         },
         },
 
 
         //分配实验室
         //分配实验室
@@ -405,12 +435,21 @@ export default {
                     console.log(this.form.schoolLabClassYearRelationList, '查看 ');
                     console.log(this.form.schoolLabClassYearRelationList, '查看 ');
                 }
                 }
                 console.log('this.form', this.form);
                 console.log('this.form', this.form);
+                this.isEdit = true;
                 this.loading = false
                 this.loading = false
             })
             })
         },
         },
         resetQuery() {
         resetQuery() {
-        
-            this.getList();
+            this.queryForm = {
+                pageNum: 1,
+                pageSize: 10,
+                schoolYear: "",
+                semester: "",
+                experimentName: "",
+                experimentClassify: "",
+
+            },
+                this.getList();
         },
         },
         // 保存按钮
         // 保存按钮
         save() {
         save() {

ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryExecution/index.vue

@@ -24,7 +24,6 @@
     </el-form>
     </el-form>
 
 
     <el-table v-loading="loading" :data="tableData" stripe>
     <el-table v-loading="loading" :data="tableData" stripe>
-      <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column fixed="left" label="序号" type="index" width="55" align="center" />
       <el-table-column fixed="left" label="序号" type="index" width="55" align="center" />
       <el-table-column label="级部" align="center" prop="grade" />
       <el-table-column label="级部" align="center" prop="grade" />
       <el-table-column label="实验名称" align="center" prop="experimentName" />
       <el-table-column label="实验名称" align="center" prop="experimentName" />
@@ -64,7 +63,6 @@
 
 
         <el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="getListtc">搜索</el-button>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="getListtc">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerytc">重置</el-button>
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
       <el-table :data="ExperimentalData" border style="width: 100%">
       <el-table :data="ExperimentalData" border style="width: 100%">

ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryManagementlist/index.vue

@@ -55,10 +55,17 @@
         <el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="60%">
         <el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="60%">
             <el-form :model="form" ref="form" size="small" :rules="rules" label-width="98px">
             <el-form :model="form" ref="form" size="small" :rules="rules" label-width="98px">
                 <el-row :gutter="30">
                 <el-row :gutter="30">
-                   
+                    <el-col :span="10">
+                        <el-form-item label="实验名称" prop="labName">
+                            <el-input v-model="form.labName" placeholder="请输入" clearable
+                                :disabled="nowType === 2"></el-input>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="10">
                     <el-col :span="10">
                         <el-form-item label="学科" prop="labSub">
                         <el-form-item label="学科" prop="labSub">
-                            <el-select v-model="form.labSub" placeholder="请选择" clearable style="width: 100%;">
+                            <el-select v-model="form.labSub" placeholder="请选择" clearable style="width: 100%;"
+                                :disabled="nowType === 2">
                                 <el-option v-for="(item, index) in subList" :key="index" :label="item.dictLabel"
                                 <el-option v-for="(item, index) in subList" :key="index" :label="item.dictLabel"
                                     :value="item.dictValue"></el-option>
                                     :value="item.dictValue"></el-option>
                             </el-select>
                             </el-select>
@@ -117,7 +124,7 @@
                     </el-select>
                     </el-select>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item label="班级">
                 <el-form-item label="班级">
-                    <el-input v-model="formlook.className" placeholder="请输入"></el-input>
+                    <el-input v-model="formlook.className" placeholder="请输入" clearable></el-input>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item label="开始时间" prop="startTime">
                 <el-form-item label="开始时间" prop="startTime">
                     <el-date-picker v-model="formlook.startTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"
                     <el-date-picker v-model="formlook.startTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"
@@ -131,7 +138,6 @@
                 </el-form-item>
                 </el-form-item>
                 <el-form-item>
                 <el-form-item>
                     <el-button type="primary" icon="el-icon-search" size="mini" @click="getListtc">搜索</el-button>
                     <el-button type="primary" icon="el-icon-search" size="mini" @click="getListtc">搜索</el-button>
-                    <el-button icon="el-icon-refresh" size="mini" @click="resetQuerytc">重置</el-button>
                 </el-form-item>
                 </el-form-item>
             </el-form>
             </el-form>
             <el-table :data="ExperimentalData" border style="width: 100%">
             <el-table :data="ExperimentalData" border style="width: 100%">
@@ -147,8 +153,7 @@
                 <el-table-column align="center" prop="experimentClassify" label="实验分类" />
                 <el-table-column align="center" prop="experimentClassify" label="实验分类" />
                 <el-table-column align="center" prop="experimentTime" label="实验时间" />
                 <el-table-column align="center" prop="experimentTime" label="实验时间" />
             </el-table>
             </el-table>
-            <pagination v-show="totaltc > 0" :total="totaltc" v-model="formlook.pageNum" :limit.sync="formlook.pageSize"
-                @pagination="getListtc" />
+
         </el-dialog>
         </el-dialog>
     </div>
     </div>
 </template>
 </template>
@@ -237,7 +242,6 @@ export default {
             //负责人下拉框
             //负责人下拉框
             adminList: [],
             adminList: [],
             total: 0,
             total: 0,
-            totaltc: 0,
             //级部
             //级部
             gradeList: [],
             gradeList: [],
         }
         }
@@ -298,7 +302,6 @@ export default {
             console.log('实验', params);
             console.log('实验', params);
             getClassDetails(params).then(response => {
             getClassDetails(params).then(response => {
                 this.ExperimentalData = response.rows;
                 this.ExperimentalData = response.rows;
-                this.totaltc = response.total;
                 this.loading = false;
                 this.loading = false;
             });
             });
         },
         },

ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/teacherApplication/index.vue

@@ -8,7 +8,10 @@
                 </el-date-picker>
                 </el-date-picker>
             </el-form-item>
             </el-form-item>
             <el-form-item label="实验级部">
             <el-form-item label="实验级部">
-                <el-input v-model="queryForm.gradeId" placeholder="请输入"></el-input>
+                <el-select v-model="queryForm.gradeId" placeholder="请选择级部" clearable>
+                    <el-option v-for="(item, index) in gradeLists" :key="index" :label="item.gradeName"
+                        :value="item.id"></el-option>
+                </el-select>
             </el-form-item>
             </el-form-item>
             <el-form-item label="申请老师">
             <el-form-item label="申请老师">
                 <el-input v-model="queryForm.applyName" placeholder="请输入"></el-input>
                 <el-input v-model="queryForm.applyName" placeholder="请输入"></el-input>
@@ -62,11 +65,14 @@
         </el-table>
         </el-table>
         <!-- 查看实验室记录 -->
         <!-- 查看实验室记录 -->
         <el-dialog title="申请信息" :visible.sync="dialogTableVisible" width="50%">
         <el-dialog title="申请信息" :visible.sync="dialogTableVisible" width="50%">
-            <el-form :model="form" ref="form" size="small" label-width="100px">
+            <el-form :model="form" ref="form" size="small" label-width="100px" :disabled="isEdit">
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="8">
                     <el-col :span="8">
-                        <el-form-item label="学科">
-                            <el-input v-model="form.sub" placeholder="请输入" clearable />
+                        <el-form-item label="学科" prop="sub">
+                            <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;">
+                                <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+                            </el-select>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
@@ -104,8 +110,11 @@
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
-                        <el-form-item label="实验分类">
-                            <el-input v-model="form.experimentClassify" placeholder="请输入" clearable />
+                        <el-form-item label="实验分类" prop="experimentClassify">
+                            <el-select v-model="form.experimentClassify" placeholder="请选择" clearable>
+                                <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
+                                    :label="dict.label" :value="dict.value" />
+                            </el-select>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
 
 
@@ -156,52 +165,59 @@
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="实验名称">
                         <el-form-item label="实验名称">
-                            <el-input v-model="form.experimentName" placeholder="请输入" clearable />
+                            <el-input v-model="form.experimentName" placeholder="请输入" clearable :disabled="isEdit" />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="章节内容">
                         <el-form-item label="章节内容">
-                            <el-input v-model="form.chapterContent" placeholder="请输入" clearable />
+                            <el-input v-model="form.chapterContent" placeholder="请输入" clearable :disabled="isEdit" />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
-                        <el-form-item label="实验分类">
-                            <el-input v-model="form.experimentClassify" placeholder="请输入" clearable />
+                        <el-form-item label="实验分类" prop="experimentClassify">
+                            <el-select v-model="form.experimentClassify" placeholder="请选择" clearable :disabled="isEdit">
+                                <el-option v-for="dict in dict.type.experiment_classify" :key="dict.value"
+                                    :label="dict.label" :value="dict.value" />
+                            </el-select>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="实验室">
                         <el-form-item label="实验室">
-                            <el-input v-model="form.labName" placeholder="请输入" clearable />
+                            <el-input v-model="form.labName" placeholder="请输入" clearable :disabled="isEdit" />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
-                        <el-form-item label="学科">
-                            <el-input v-model="form.sub" placeholder="请输入" clearable />
+                        <el-form-item label="学科" prop="sub">
+                            <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;"
+                                :disabled="isEdit">
+                                <el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+                            </el-select>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="级部">
                         <el-form-item label="级部">
-                            <el-input v-model="form.grade" placeholder="请输入" clearable />
+                            <el-input v-model="form.grade" placeholder="请输入" clearable :disabled="isEdit" />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="班级">
                         <el-form-item label="班级">
-                            <el-input v-model="form.className" placeholder="请输入" clearable />
+                            <el-input v-model="form.className" placeholder="请输入" clearable :disabled="isEdit" />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="学年">
                         <el-form-item label="学年">
-                            <el-input v-model="form.schoolYearSemester" placeholder="请输入" clearable />
+                            <el-input v-model="form.schoolYearSemester" placeholder="请输入" clearable :disabled="isEdit" />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
 
 
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="实验时间">
                         <el-form-item label="实验时间">
-                            <el-input v-model="form.experimentTime" placeholder="请输入" clearable />
+                            <el-input v-model="form.experimentTime" placeholder="请输入" clearable :disabled="isEdit" />
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
 
 
@@ -210,8 +226,8 @@
                 <el-row :gutter="30">
                 <el-row :gutter="30">
                     <el-col :span="24">
                     <el-col :span="24">
                         <el-form-item label="实验用品">
                         <el-form-item label="实验用品">
-                            <el-input v-model="form.experimentUseGoods" type="textarea" placeholder="请输入"
-                                clearable></el-input>
+                            <el-input v-model="form.experimentUseGoods" type="textarea" placeholder="请输入" clearable
+                                :disabled="isEdit"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
@@ -232,6 +248,9 @@ import {
     getTeacherxq,
     getTeacherxq,
     updateState,
     updateState,
 } from '@/api/smartSchool/laboratoryManagement/teacherApplication'
 } from '@/api/smartSchool/laboratoryManagement/teacherApplication'
+import {
+    getGradelist
+} from '@/api/smartSchool/gradeWork/laboratoryManagement/classDetails'
 export default {
 export default {
     name: 'index',
     name: 'index',
     dicts: ['experiment_classify', 'lab_sub'],
     dicts: ['experiment_classify', 'lab_sub'],
@@ -243,6 +262,7 @@ export default {
                 gradeId: "",
                 gradeId: "",
                 applyName: "",
                 applyName: "",
             },
             },
+            gradeLists: [],
             schoolAccessoryList: [],
             schoolAccessoryList: [],
             baseUrl: process.env.VUE_APP_BASE_API,
             baseUrl: process.env.VUE_APP_BASE_API,
             //表格数据
             //表格数据
@@ -257,6 +277,7 @@ export default {
 
 
             },
             },
             total: 0,
             total: 0,
+            isEdit: false,
             dialogTableVisible: false,
             dialogTableVisible: false,
             open: false,
             open: false,
             fileList: [],
             fileList: [],
@@ -264,6 +285,8 @@ export default {
     },
     },
     created() {
     created() {
         this.getList();
         this.getList();
+        this.getGradelist();
+
     },
     },
     methods: {
     methods: {
         //表单查询
         //表单查询
@@ -274,6 +297,14 @@ export default {
                 this.loading = false
                 this.loading = false
             })
             })
         },
         },
+        //查询级部搜索
+        getGradelist() {
+            getGradelist().then(response => {
+                this.loading = false;
+                this.gradeLists = response.data;
+
+            });
+        },
 
 
         //查看按钮操作
         //查看按钮操作
         handleLook(row) {
         handleLook(row) {
@@ -283,7 +314,8 @@ export default {
                 this.fileList = response.data.schoolAccessoryList;
                 this.fileList = response.data.schoolAccessoryList;
                 console.log('this.schoolAccessoryList', this.schoolAccessoryList);
                 console.log('this.schoolAccessoryList', this.schoolAccessoryList);
                 console.log('this.form', this.form);
                 console.log('this.form', this.form);
-                this.loading = false
+                this.isEdit = true;
+                this.loading = false;
             })
             })
             this.dialogTableVisible = true;
             this.dialogTableVisible = true;
         },
         },
@@ -302,6 +334,7 @@ export default {
             getTeacherxq(id).then(response => {
             getTeacherxq(id).then(response => {
                 this.form = response.data;
                 this.form = response.data;
                 this.fileList = response.data.schoolAccessoryList;
                 this.fileList = response.data.schoolAccessoryList;
+                this.isEdit = true;
                 console.log('this.schoolAccessoryList', this.schoolAccessoryList);
                 console.log('this.schoolAccessoryList', this.schoolAccessoryList);
                 console.log('this.form', this.form);
                 console.log('this.form', this.form);
                 this.loading = false
                 this.loading = false

ruoyi-ui/src/views/smartSchool/laboratoryManagement/leader/laboratoryCompletion/index.vue

@@ -7,8 +7,11 @@
                         :value="dict.value" />
                         :value="dict.value" />
                 </el-select>
                 </el-select>
             </el-form-item>
             </el-form-item>
-            <el-form-item label="级部">
-                <el-input v-model="queryForm.grade" placeholder="请输入级部" clearable></el-input>
+            <el-form-item label="实验级部">
+                <el-select v-model="queryForm.gradeId" placeholder="请选择级部" clearable>
+                    <el-option v-for="(item, index) in gradeLists" :key="index" :label="item.gradeName"
+                        :value="item.id"></el-option>
+                </el-select>
             </el-form-item>
             </el-form-item>
             <el-form-item label="实验名称">
             <el-form-item label="实验名称">
                 <el-input v-model="queryForm.experimentName" placeholder="请输入实验名称" clearable></el-input>
                 <el-input v-model="queryForm.experimentName" placeholder="请输入实验名称" clearable></el-input>
@@ -100,7 +103,8 @@
 import {
 import {
     getList,
     getList,
     getSemester,
     getSemester,
-    getTeacherxq
+    getTeacherxq,
+    getGradelist
 } from '@/api/smartSchool/laboratoryManagement/leadlaboratoryCompletion'
 } from '@/api/smartSchool/laboratoryManagement/leadlaboratoryCompletion'
 export default {
 export default {
     name: 'index',
     name: 'index',
@@ -116,6 +120,7 @@ export default {
                 grade: "",
                 grade: "",
                 experimentName: "",
                 experimentName: "",
             },
             },
+            gradeLists: [],
             //表格数据
             //表格数据
             tableData: [
             tableData: [
 
 
@@ -131,10 +136,6 @@ export default {
                 startTime: "",
                 startTime: "",
                 endTime: "",
                 endTime: "",
             },
             },
-            //实验分类下拉框
-            options: {
-
-            },
             //弹窗
             //弹窗
             dialogTableVisible: false,
             dialogTableVisible: false,
             total: 0,
             total: 0,
@@ -143,6 +144,7 @@ export default {
     created() {
     created() {
         this.getSemesterAndList();
         this.getSemesterAndList();
         this.getListtc();
         this.getListtc();
+        this.getGradelist();
     },
     },
 
 
     methods: {
     methods: {
@@ -178,6 +180,15 @@ export default {
                     console.log(error);
                     console.log(error);
                 });
                 });
         },
         },
+        //查询级部搜索
+        getGradelist() {
+            getGradelist().then(response => {
+                this.loading = false;
+                this.gradeLists = response.data;
+                console.log("this.gradeList", this.gradeList);
+
+            });
+        },
         //查看按钮
         //查看按钮
         handleLook(row) {
         handleLook(row) {
             console.log(row);
             console.log(row);
@@ -194,7 +205,6 @@ export default {
             };
             };
             getTeacherxq(params).then(response => {
             getTeacherxq(params).then(response => {
                 this.ExperimentalData = response.rows;
                 this.ExperimentalData = response.rows;
-                this.total = response.total;
                 this.loading = false;
                 this.loading = false;
             }).catch(error => {
             }).catch(error => {
 
 

ruoyi-ui/src/views/smartSchool/laboratoryManagement/leader/laboratoryRecords/index.vue

@@ -34,7 +34,6 @@
 <script>
 <script>
 import {
 import {
     getList,
     getList,
-    getTeacherxq,
     getSemester
     getSemester
 } from '@/api/smartSchool/laboratoryManagement/leadlaboratoryRecords'
 } from '@/api/smartSchool/laboratoryManagement/leadlaboratoryRecords'
 export default {
 export default {
@@ -44,6 +43,7 @@ export default {
             queryForm: {
             queryForm: {
                 pageNum: 1,
                 pageNum: 1,
                 pageSize: 10,
                 pageSize: 10,
+                semester: "",
                 schoolYear: "",
                 schoolYear: "",
                 applyName: "",
                 applyName: "",
             },
             },
@@ -60,13 +60,20 @@ export default {
     },
     },
     methods: {
     methods: {
         async getSemesterAndList() {
         async getSemesterAndList() {
-            await this.getSemester(); // 等待获取学年信息
-            this.getList(); // 获取默认数据
+            try {
+                await this.getSemester(); // 等待获取学年信息
+                this.getList(); // 获取默认数据
+            } catch (error) {
+                console.log(error);
+                // 处理错误情况
+            }
         },
         },
+
         getList() {
         getList() {
             const params = {
             const params = {
                 schoolYear: this.queryForm.schoolYear,
                 schoolYear: this.queryForm.schoolYear,
                 applyName: this.queryForm.applyName,
                 applyName: this.queryForm.applyName,
+                semester: this.queryForm.semester,
             };
             };
             getList(params)
             getList(params)
                 .then(response => {
                 .then(response => {
@@ -78,8 +85,10 @@ export default {
                 .catch(error => {
                 .catch(error => {
                     this.loading = false;
                     this.loading = false;
                     console.log(error);
                     console.log(error);
+                    // 处理错误情况
                 });
                 });
         },
         },
+
         getSemester() {
         getSemester() {
             return new Promise((resolve, reject) => {
             return new Promise((resolve, reject) => {
                 getSemester()
                 getSemester()
@@ -98,11 +107,13 @@ export default {
             this.queryForm = {
             this.queryForm = {
                 pageNum: 1,
                 pageNum: 1,
                 pageSize: 10,
                 pageSize: 10,
+                semester: "",
                 schoolYear: "",
                 schoolYear: "",
                 applyName: "",
                 applyName: "",
             };
             };
             this.getList();
             this.getList();
-        },
+        }
+
 
 
     },
     },
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.organization;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,7 +20,9 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
+import yangtz.cs.liu.campus.domain.student.SchoolStudentParent;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
+import yangtz.cs.liu.campus.service.student.ISchoolStudentParentService;
 import yangtz.cs.liu.campus.vo.organization.MemberListVo;
 import yangtz.cs.liu.campus.vo.organization.MemberListVo;
 
 
 import java.util.Arrays;
 import java.util.Arrays;
@@ -38,6 +41,9 @@ public class SchoolOrganizationMemberController extends BaseController
     @Autowired
     @Autowired
     private ISchoolOrganizationMemberService schoolOrganizationMemberService;
     private ISchoolOrganizationMemberService schoolOrganizationMemberService;
 
 
+    @Autowired
+    private ISchoolStudentParentService schoolStudentParentService;
+
     /**
     /**
      * 查询社团成员列表
      * 查询社团成员列表
      */
      */
@@ -71,6 +77,11 @@ public class SchoolOrganizationMemberController extends BaseController
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody SchoolOrganizationMember schoolOrganizationMember)
     public AjaxResult add(@RequestBody SchoolOrganizationMember schoolOrganizationMember)
     {
     {
+        //新增社团成员的时候 要根据身份证号查询这个学生对应的userid
+        LambdaQueryWrapper<SchoolStudentParent> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(SchoolStudentParent::getIdCard,schoolOrganizationMember.getCardid());
+        SchoolStudentParent one = schoolStudentParentService.getOne(wrapper);
+        schoolOrganizationMember.setUserId(one.getUserId());
         return toAjax(schoolOrganizationMemberService.save(schoolOrganizationMember));
         return toAjax(schoolOrganizationMemberService.save(schoolOrganizationMember));
     }
     }
 
 

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolInstrument/SchoolInstrumentClassifyController.java

+package yangtz.cs.liu.campus.controller.schoolInstrument;
+
+import com.ruoyi.common.annotation.Log;
+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.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrumentClassify;
+import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentClassifyService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 仪器药品分类Controller
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@RestController
+@RequestMapping("/schoolInstrumentClassify")
+public class SchoolInstrumentClassifyController extends BaseController {
+    @Autowired
+    private ISchoolInstrumentClassifyService schoolInstrumentClassifyService;
+
+    /**
+     * 查询仪器药品分类列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolInstrumentClassify schoolInstrumentClassify)
+    {
+        List<SchoolInstrumentClassify> list = schoolInstrumentClassifyService.selectSchoolInstrumentClassifyList(schoolInstrumentClassify);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取仪器药品分类详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolInstrumentClassifyService.selectSchoolInstrumentClassifyById(id));
+    }
+
+    /**
+     * 新增仪器药品分类
+     */
+    @Log(title = "仪器药品分类", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolInstrumentClassify schoolInstrumentClassify)
+    {
+        return toAjax(schoolInstrumentClassifyService.insertSchoolInstrumentClassify(schoolInstrumentClassify));
+    }
+
+    /**
+     * 修改仪器药品分类
+     */
+    @Log(title = "仪器药品分类", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolInstrumentClassify schoolInstrumentClassify)
+    {
+        return toAjax(schoolInstrumentClassifyService.updateSchoolInstrumentClassify(schoolInstrumentClassify));
+    }
+
+    /**
+     * 删除仪器药品分类
+     */
+    @Log(title = "仪器药品分类", businessType = BusinessType.DELETE)
+    @PostMapping("/{id}")
+    public AjaxResult remove(@PathVariable("id") Long id)
+    {
+        return toAjax(schoolInstrumentClassifyService.deleteSchoolInstrumentClassifyById(id));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolInstrument/SchoolInstrumentController.java

+package yangtz.cs.liu.campus.controller.schoolInstrument;
+
+import com.ruoyi.common.annotation.Log;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrument;
+import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentService;
+
+import java.util.List;
+
+/**
+ * 仪器管理Controller
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@RestController
+@RequestMapping("/schoolInstrument")
+public class SchoolInstrumentController extends BaseController {
+
+    @Autowired
+    private ISchoolInstrumentService schoolInstrumentService;
+
+    /**
+     * 查询仪器管理列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolInstrument schoolInstrument)
+    {
+        startPage();
+        List<SchoolInstrument> list = schoolInstrumentService.selectSchoolInstrumentList(schoolInstrument);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取仪器管理详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolInstrumentService.selectSchoolInstrumentById(id));
+    }
+
+    /**
+     * 新增仪器管理
+     */
+    @Log(title = "仪器管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolInstrument schoolInstrument)
+    {
+        return toAjax(schoolInstrumentService.insertSchoolInstrument(schoolInstrument));
+    }
+
+    /**
+     * 修改仪器管理
+     */
+    @Log(title = "仪器管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolInstrument schoolInstrument)
+    {
+        return toAjax(schoolInstrumentService.updateSchoolInstrument(schoolInstrument));
+    }
+
+    /**
+     * 删除仪器管理
+     */
+    @Log(title = "仪器管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolInstrumentService.deleteSchoolInstrumentByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolInstrument/SchoolInstrumentDetailController.java

+package yangtz.cs.liu.campus.controller.schoolInstrument;
+
+
+import com.ruoyi.common.annotation.Log;
+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.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrumentDetail;
+import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentDetailService;
+import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolInstrumentDetailVo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 仪器出入库明细Controller
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@RestController
+@RequestMapping("/schoolInstrumentDetail")
+public class SchoolInstrumentDetailController extends BaseController {
+
+    @Autowired
+    private ISchoolInstrumentDetailService schoolInstrumentDetailService;
+
+    /**
+     * 查询仪器出入库明细列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolInstrumentDetailVo schoolInstrumentDetailVo)
+    {
+        startPage();
+        List<SchoolInstrumentDetail> list = schoolInstrumentDetailService.selectSchoolInstrumentDetailList(schoolInstrumentDetailVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取仪器出入库明细详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolInstrumentDetailService.selectSchoolInstrumentDetailById(id));
+    }
+
+    /**
+     * 新增仪器出入库明细
+     */
+    @Log(title = "仪器出入库明细", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolInstrumentDetail schoolInstrumentDetail)
+    {
+        return toAjax(schoolInstrumentDetailService.insertSchoolInstrumentDetail(schoolInstrumentDetail));
+    }
+
+    /**
+     * 修改仪器出入库明细
+     */
+    @Log(title = "仪器出入库明细", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolInstrumentDetail schoolInstrumentDetail)
+    {
+        return toAjax(schoolInstrumentDetailService.updateSchoolInstrumentDetail(schoolInstrumentDetail));
+    }
+
+    /**
+     * 删除仪器出入库明细
+     */
+    @Log(title = "仪器出入库明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolInstrumentDetailService.deleteSchoolInstrumentDetailByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolInstrument/SchoolTeacherBorrowController.java

+package yangtz.cs.liu.campus.controller.schoolInstrument;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.annotation.Log;
+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.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrument;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolTeacherBorrow;
+import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolInstrumentService;
+import yangtz.cs.liu.campus.service.schoolInstrument.ISchoolTeacherBorrowService;
+import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolInstrumentVo;
+import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolTeacherBorrowVo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 教师借用Controller
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@RestController
+@RequestMapping("/schoolTeacherBorrow")
+public class SchoolTeacherBorrowController extends BaseController {
+
+    @Autowired
+    private ISchoolTeacherBorrowService schoolTeacherBorrowService;
+    @Autowired
+    private ISchoolInstrumentService schoolInstrumentService;
+
+    /**
+     * 查询教师借用列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolTeacherBorrowVo schoolTeacherBorrowVo)
+    {
+        startPage();
+        List<SchoolTeacherBorrowVo> list = schoolTeacherBorrowService.selectSchoolTeacherBorrowList(schoolTeacherBorrowVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取教师借用详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolTeacherBorrowService.selectSchoolTeacherBorrowById(id));
+    }
+
+    /**
+     * 新增教师借用
+     */
+    @Log(title = "教师借用", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SchoolTeacherBorrowVo schoolTeacherBorrowVo)
+    {
+        return toAjax(schoolTeacherBorrowService.insertSchoolTeacherBorrow(schoolTeacherBorrowVo));
+    }
+
+    /**
+     * 办理教师借用
+     */
+    @Log(title = "教师借用", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SchoolTeacherBorrowVo schoolTeacherBorrowVo)
+    {
+        return toAjax(schoolTeacherBorrowService.updateSchoolTeacherBorrow(schoolTeacherBorrowVo));
+    }
+
+    /**
+     * 删除教师借用
+     */
+    @Log(title = "教师借用", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolTeacherBorrowService.deleteSchoolTeacherBorrowByIds(ids));
+    }
+
+    /**
+     * 借用明细列表
+     */
+    @GetMapping("/selectInstrumentList")
+    public TableDataInfo selectInstrumentList(SchoolInstrumentVo schoolInstrumentVo)
+    {
+        return getDataTable(schoolInstrumentService.selectInstrumentList(schoolInstrumentVo));
+    }
+
+    /**
+     * 仓库借用管理列表
+     */
+    @GetMapping("/selectBorrowInstrumentList")
+    public TableDataInfo selectBorrowInstrumentList(SchoolTeacherBorrowVo schoolTeacherBorrowVo)
+    {
+        startPage();
+        List<SchoolTeacherBorrowVo> list = schoolTeacherBorrowService.selectBorrowInstrumentList(schoolTeacherBorrowVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 归还教师借出仪器
+     */
+    @PostMapping("/returnInstrument")
+    public AjaxResult returnInstrument(@RequestBody SchoolTeacherBorrowVo schoolTeacherBorrowVo){
+        return toAjax(schoolTeacherBorrowService.returnInstrument(schoolTeacherBorrowVo));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolExperimentPlanController.java

@@ -527,6 +527,8 @@ public class SchoolExperimentPlanController extends BaseController
      */
      */
     @GetMapping("/getGradeClassDetails")
     @GetMapping("/getGradeClassDetails")
     public TableDataInfo getGradeClassDetails(SchoolTeacherLabApplyVo schoolTeacherLabApplyVo){
     public TableDataInfo getGradeClassDetails(SchoolTeacherLabApplyVo schoolTeacherLabApplyVo){
+        //查询完成的班级实验信息
+        schoolTeacherLabApplyVo.setState("1");
         return getDataTable(schoolTeacherLabApplyService.getGradeClassDetails(schoolTeacherLabApplyVo));
         return getDataTable(schoolTeacherLabApplyService.getGradeClassDetails(schoolTeacherLabApplyVo));
     }
     }
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolLabCompetitionController.java

@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolLab;
 
 
 import java.util.List;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -95,4 +97,12 @@ public class SchoolLabCompetitionController extends BaseController
     {
     {
         return toAjax(schoolLabCompetitionService.deleteSchoolLabCompetitionByIds(ids));
         return toAjax(schoolLabCompetitionService.deleteSchoolLabCompetitionByIds(ids));
     }
     }
+
+    /**
+     * 获取教师
+     */
+    @GetMapping("/getTeacher")
+    public AjaxResult getTeacher(SysUser sysUser){
+        return AjaxResult.success(schoolLabCompetitionService.getTeacher(sysUser));
+    }
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolTeacherLabApplyController.java

@@ -208,6 +208,8 @@ public class SchoolTeacherLabApplyController extends BaseController
      */
      */
     @GetMapping("/getLabUserDetial")
     @GetMapping("/getLabUserDetial")
     public TableDataInfo getLabUserDetial(SchoolTeacherLabApplyVo schoolTeacherLabApplyVo){
     public TableDataInfo getLabUserDetial(SchoolTeacherLabApplyVo schoolTeacherLabApplyVo){
+        //查询已确认的实验室使用记录
+        schoolTeacherLabApplyVo.setApplyState("1");
         startPage();
         startPage();
         return getDataTable(schoolTeacherLabApplyService.selectSchoolTeacherLabApplyList(schoolTeacherLabApplyVo));
         return getDataTable(schoolTeacherLabApplyService.selectSchoolTeacherLabApplyList(schoolTeacherLabApplyVo));
     }
     }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolSecurity/SchoolVehicleInOutController.java

+package yangtz.cs.liu.campus.controller.schoolSecurity;
+
+import com.ruoyi.common.annotation.Log;
+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.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVehicleInOut;
+import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVehicleInOutService;
+import yangtz.cs.liu.campus.vo.schoolSecurity.SchoolVehicleInOutVo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 车辆出入登记Controller
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@RestController
+@RequestMapping("/schoolVehicleInOut")
+public class SchoolVehicleInOutController extends BaseController
+{
+
+    @Autowired
+    private ISchoolVehicleInOutService schoolVehicleInOutService;
+
+    /**
+     * 查询车辆出入登记列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolVehicleInOutVo schoolVehicleInOutVo)
+    {
+        startPage();
+        List<SchoolVehicleInOutVo> list = schoolVehicleInOutService.selectSchoolVehicleInOutList(schoolVehicleInOutVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出车辆出入登记列表
+     */
+    @Log(title = "车辆出入登记", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolVehicleInOutVo schoolVehicleInOutVo)
+    {
+        List<SchoolVehicleInOutVo> list = schoolVehicleInOutService.selectSchoolVehicleInOutList(schoolVehicleInOutVo);
+        ExcelUtil<SchoolVehicleInOutVo> util = new ExcelUtil<SchoolVehicleInOutVo>(SchoolVehicleInOutVo.class);
+        util.exportExcel(response, list, "车辆出入登记数据");
+    }
+
+    /**
+     * 获取车辆出入登记详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolVehicleInOutService.selectSchoolVehicleInOutById(id));
+    }
+
+    /**
+     * 新增车辆出入登记
+     */
+    @Log(title = "车辆出入登记", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolVehicleInOutVo schoolVehicleInOutVo)
+    {
+        return toAjax(schoolVehicleInOutService.insertSchoolVehicleInOut(schoolVehicleInOutVo));
+    }
+
+    /**
+     * 修改车辆出入登记
+     */
+    @Log(title = "车辆出入登记", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolVehicleInOutVo schoolVehicleInOutVo)
+    {
+        return toAjax(schoolVehicleInOutService.updateSchoolVehicleInOut(schoolVehicleInOutVo));
+    }
+
+    /**
+     * 删除车辆出入登记
+     */
+    @Log(title = "车辆出入登记", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolVehicleInOutService.deleteSchoolVehicleInOutByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolSecurity/SchoolVehicleRegistrationController.java

+package yangtz.cs.liu.campus.controller.schoolSecurity;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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 yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVehicleRegistration;
+import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVehicleRegistrationService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 车辆登记Controller
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@RestController
+@RequestMapping("/schoolVehicleRegistration/schoolVehicleRegistration")
+public class SchoolVehicleRegistrationController extends BaseController
+{
+
+    @Autowired
+    private ISchoolVehicleRegistrationService schoolVehicleRegistrationService;
+
+    /**
+     * 查询车辆登记列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolVehicleRegistration schoolVehicleRegistration)
+    {
+        startPage();
+        List<SchoolVehicleRegistration> list = schoolVehicleRegistrationService.selectSchoolVehicleRegistrationList(schoolVehicleRegistration);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出车辆登记列表
+     */
+    @Log(title = "车辆登记", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolVehicleRegistration schoolVehicleRegistration)
+    {
+        List<SchoolVehicleRegistration> list = schoolVehicleRegistrationService.selectSchoolVehicleRegistrationList(schoolVehicleRegistration);
+        ExcelUtil<SchoolVehicleRegistration> util = new ExcelUtil<SchoolVehicleRegistration>(SchoolVehicleRegistration.class);
+        util.exportExcel(response, list, "车辆登记数据");
+    }
+
+    /**
+     * 获取车辆登记详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolVehicleRegistrationService.selectSchoolVehicleRegistrationById(id));
+    }
+
+    /**
+     * 新增车辆登记
+     */
+    @Log(title = "车辆登记", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolVehicleRegistration schoolVehicleRegistration)
+    {
+        return toAjax(schoolVehicleRegistrationService.insertSchoolVehicleRegistration(schoolVehicleRegistration));
+    }
+
+    /**
+     * 修改车辆登记
+     */
+    @Log(title = "车辆登记", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolVehicleRegistration schoolVehicleRegistration)
+    {
+        return toAjax(schoolVehicleRegistrationService.updateSchoolVehicleRegistration(schoolVehicleRegistration));
+    }
+
+    /**
+     * 删除车辆登记
+     */
+    @Log(title = "车辆登记", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolVehicleRegistrationService.deleteSchoolVehicleRegistrationByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolSecurity/SchoolVideoConsultController.java

+package yangtz.cs.liu.campus.controller.schoolSecurity;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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 yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVideoConsult;
+import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVideoConsultService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.vo.schoolSecurity.SchoolVideoConsultVo;
+
+/**
+ * 监控录像调用(内部)Controller
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@RestController
+@RequestMapping("/schoolVideoConsult")
+public class SchoolVideoConsultController extends BaseController
+{
+
+    @Autowired
+    private ISchoolVideoConsultService schoolVideoConsultService;
+
+    /**
+     * 查询监控录像调用(内部)列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolVideoConsultVo schoolVideoConsultVo)
+    {
+        startPage();
+        List<SchoolVideoConsultVo> list = schoolVideoConsultService.selectSchoolVideoConsultList(schoolVideoConsultVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出监控录像调用(内部)列表
+     */
+    @Log(title = "监控录像调用(内部)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolVideoConsultVo schoolVideoConsultVo)
+    {
+        List<SchoolVideoConsultVo> list = schoolVideoConsultService.selectSchoolVideoConsultList(schoolVideoConsultVo);
+        ExcelUtil<SchoolVideoConsultVo> util = new ExcelUtil<SchoolVideoConsultVo>(SchoolVideoConsultVo.class);
+        util.exportExcel(response, list, "监控录像调用(内部)数据");
+    }
+
+    /**
+     * 获取监控录像调用(内部)详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolVideoConsultService.selectSchoolVideoConsultById(id));
+    }
+
+    /**
+     * 新增监控录像调用(内部)
+     */
+    @Log(title = "监控录像调用(内部)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolVideoConsultVo schoolVideoConsultVo)
+    {
+        return toAjax(schoolVideoConsultService.insertSchoolVideoConsult(schoolVideoConsultVo));
+    }
+
+    /**
+     * 修改监控录像调用(内部)
+     */
+    @Log(title = "监控录像调用(内部)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolVideoConsultVo schoolVideoConsultVo)
+    {
+        return toAjax(schoolVideoConsultService.updateSchoolVideoConsult(schoolVideoConsultVo));
+    }
+
+    /**
+     * 删除监控录像调用(内部)
+     */
+    @Log(title = "监控录像调用(内部)", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolVideoConsultService.deleteSchoolVideoConsultByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolSecurity/SchoolVideoConsultExternalController.java

+package yangtz.cs.liu.campus.controller.schoolSecurity;
+
+import com.ruoyi.common.annotation.Log;
+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.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVideoConsultExternal;
+import yangtz.cs.liu.campus.service.schoolSecurity.ISchoolVideoConsultExternalService;
+import yangtz.cs.liu.campus.vo.schoolSecurity.SchoolVideoConsultExternalVo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 监控调阅（外部）Controller
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@RestController
+@RequestMapping("/schoolVideoConsultExternal")
+public class SchoolVideoConsultExternalController extends BaseController
+{
+
+    @Autowired
+    private ISchoolVideoConsultExternalService schoolVideoConsultExternalService;
+
+    /**
+     * 查询监控调阅（外部）列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolVideoConsultExternalVo schoolVideoConsultExternalVo)
+    {
+        startPage();
+        List<SchoolVideoConsultExternalVo> list = schoolVideoConsultExternalService.selectSchoolVideoConsultExternalList(schoolVideoConsultExternalVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出监控调阅（外部）列表
+     */
+    @Log(title = "监控调阅（外部）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolVideoConsultExternalVo schoolVideoConsultExternalVo)
+    {
+        List<SchoolVideoConsultExternalVo> list = schoolVideoConsultExternalService.selectSchoolVideoConsultExternalList(schoolVideoConsultExternalVo);
+        ExcelUtil<SchoolVideoConsultExternalVo> util = new ExcelUtil<SchoolVideoConsultExternalVo>(SchoolVideoConsultExternalVo.class);
+        util.exportExcel(response, list, "监控调阅（外部）数据");
+    }
+
+    /**
+     * 获取监控调阅（外部）详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolVideoConsultExternalService.selectSchoolVideoConsultExternalById(id));
+    }
+
+    /**
+     * 新增监控调阅（外部）
+     */
+    @Log(title = "监控调阅（外部）", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolVideoConsultExternalVo schoolVideoConsultExternalVo)
+    {
+        return toAjax(schoolVideoConsultExternalService.insertSchoolVideoConsultExternal(schoolVideoConsultExternalVo));
+    }
+
+    /**
+     * 修改监控调阅（外部）
+     */
+    @Log(title = "监控调阅（外部）", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolVideoConsultExternalVo schoolVideoConsultExternalVo)
+    {
+        return toAjax(schoolVideoConsultExternalService.updateSchoolVideoConsultExternal(schoolVideoConsultExternalVo));
+    }
+
+    /**
+     * 删除监控调阅（外部）
+     */
+    @Log(title = "监控调阅（外部）", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolVideoConsultExternalService.deleteSchoolVideoConsultExternalByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolInstrument/SchoolInstrument.java

+package yangtz.cs.liu.campus.domain.schoolInstrument;
+
+import com.core.domain.OurBaseEntity;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 仪器管理对象 school_instrument
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Data
+public class SchoolInstrument extends OurBaseEntity {
+
+    /** 仪器名称 */
+    @Excel(name = "仪器名称")
+    private String instrumentName;
+
+    /** 仪器分类id */
+    private Long instrumentTypeId;
+
+    /** 仪器分类 */
+    @Excel(name = "仪器分类")
+    private String instrumentTypeName;
+
+    /** 仪器型号 */
+    @Excel(name = "仪器型号")
+    private String instrumentModel;
+
+    /** 仪器数量 */
+    @Excel(name = "仪器数量")
+    private Integer instrumentNum;
+
+    /** 备注 */
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolInstrument/SchoolInstrumentClassify.java

+package yangtz.cs.liu.campus.domain.schoolInstrument;
+
+import com.core.domain.OurBaseEntity;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 仪器药品分类对象 school_instrument_classify
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Data
+public class SchoolInstrumentClassify extends OurBaseEntity {
+
+    /** 仪器类名 */
+    @Excel(name = "仪器类名")
+    private String instrumentTypeName;
+
+    /** 上级分类id */
+    @Excel(name = "上级分类id")
+    private Long parentId;
+
+    /** 祖级列表 */
+    @Excel(name = "祖级列表")
+    private String ancestors;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Integer orderNum;
+
+    /** 是否为消耗品(1是，0否) */
+    @Excel(name = "是否为消耗品",readConverterExp = ("1=是,0=否"))
+    private String isConsumables;
+
+    /** 备注 */
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolInstrument/SchoolInstrumentDetail.java

+package yangtz.cs.liu.campus.domain.schoolInstrument;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 仪器出入库明细对象 school_instrument_detail
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Data
+public class SchoolInstrumentDetail extends OurBaseEntity {
+
+    /** 仪器id */
+    @Excel(name = "仪器id")
+    private Long instrumentId;
+
+    /** 仪器名称 */
+    @Excel(name = "仪器名称")
+    private String instrumentName;
+
+    /** 仪器分类id */
+    private Long instrumentTypeId;
+
+    /** 仪器分类 */
+    @Excel(name = "仪器分类")
+    private String instrumentTypeName;
+
+    /** 变动类型（1出库，2入库） */
+    @Excel(name = "变动类型", readConverterExp = "1=出库，2入库")
+    private String variationType;
+
+    /** 变动数量 */
+    @Excel(name = "变动数量")
+    private Integer variationNum;
+
+    /** 旧库存数量 */
+    @Excel(name = "旧库存数量")
+    private Integer oldStockNum;
+
+    /** 新库存数量 */
+    @Excel(name = "新库存数量")
+    private Integer newStockNum;
+
+    /** 变更时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date variationTime;
+
+    /** 备注 */
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolInstrument/SchoolTeacherBorrow.java

+package yangtz.cs.liu.campus.domain.schoolInstrument;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 教师借用对象 school_teacher_borrow
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Data
+public class SchoolTeacherBorrow extends OurBaseEntity {
+
+    /** 借用人id */
+    @Excel(name = "借用人id")
+    private Long borrowById;
+
+    /** 借用人 */
+    @Excel(name = "借用人")
+    private String borrowBy;
+
+    /** 借用学科(1物理，2化学，3生物) */
+    @Excel(name = "借用学科(1物理，2化学，3生物)")
+    private String borrowSub;
+
+    /** 借用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "借用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date borrowTime;
+
+    /** 借用状态(0未归还，1已归还，2已申请) */
+    @Excel(name = "借用状态(0未归还，1已归还，2已申请)")
+    private String borrowState;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 归还时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date returnTime;
+
+    /** 备注 */
+    private String remark;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolInstrument/SchoolTeacherBorrowDetail.java

+package yangtz.cs.liu.campus.domain.schoolInstrument;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.core.domain.OurBaseEntity;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 教师借用明细对象 school_teacher_borrow_detail
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Data
+public class SchoolTeacherBorrowDetail {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /** 教师借用主键id */
+    @Excel(name = "教师借用主键id")
+    private Long teacherBorrowId;
+
+    /** 仪器id */
+    @Excel(name = "仪器id")
+    private Long instrumentId;
+
+    /** 仪器名称 */
+    @Excel(name = "仪器名称")
+    private String instrumentName;
+
+    /** 仪器型号 */
+    @Excel(name = "仪器型号")
+    private String instrumentModel;
+
+    /** 仪器数量 */
+    @Excel(name = "仪器数量")
+    private Integer instrumentNum;
+
+    /** 借用数量 */
+    @Excel(name = "借用数量")
+    private Integer borrowNum;
+
+    /** 损坏数量 */
+    private Integer damageNum;
+
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolSecurity/SchoolVehicleInOut.java

+package yangtz.cs.liu.campus.domain.schoolSecurity;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 车辆出入登记对象 school_vehicle_in_out
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@Data
+public class SchoolVehicleInOut extends OurBaseEntity
+{
+
+    /** 流程实例id */
+    private String instanceId;
+
+    /** 用户id */
+    private Long userId;
+
+    /** 用户名称 */
+    private String userName;
+
+    /** 联系电话 */
+    private Long phone;
+
+    /** 工作性质（1在编，2合同制，3代课，4其他） */
+    private String jobNature;
+
+    /** 预计在校工作开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date workStartTime;
+
+    /** 预计在校工作结束时间 */
+    private String workEndTime;
+
+    /** 现申请登记车号 */
+    private String applyLicenseNumber;
+
+    /** 车辆品牌 */
+    private String brand;
+
+    /** 车型 */
+    private String carType;
+
+    /** 已登记车辆车号 */
+    private String oldLicenseNumber;
+
+    /** 已登记车辆是否保留（1是，0否） */
+    private String isRetain;
+
+    /** 申请人id */
+    private Long applyUserId;
+
+    /** 申请人 */
+    private String applyUser;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 申请人类型（（0教工 1职工）） */
+    private String applyType;
+
+    /** 状态（0未提交，1级部/处室审核，2分管领导审核，3已结束） */
+    private String state;
+
+    /** 申请人级部/处室id */
+    private Long applyOrgid;
+
+    /** 申请人级部/处室 */
+    private String applyOrgname;
+
+    /** 审批人id1 */
+    private Long handUserId1;
+
+    /** 审批人1 */
+    private String handUserName1;
+
+    /** 审批人1意见 */
+    private String handUserOpinion1;
+
+    /** 审批人1签名是否显示（1是，0否） */
+    private String isSign1;
+
+    /** 审批人id2 */
+    private Long handUserId2;
+
+    /** 审批人2 */
+    private String handUserName2;
+
+    /** 审批人2意见 */
+    private String handUserOpinion2;
+
+    /** 审批人2签名是否显示（1是，0否） */
+    private String isSign2;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolSecurity/SchoolVehicleRegistration.java

+package yangtz.cs.liu.campus.domain.schoolSecurity;
+
+import com.core.domain.OurBaseEntity;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 车辆登记对象 school_vehicle_registration
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@Data
+public class SchoolVehicleRegistration extends OurBaseEntity
+{
+
+    /** 用户id */
+    private Long userId;
+
+    /** 用户名称 */
+    private String userName;
+
+    /** 工作性质（1在编，2合同制，3代课，4其他） */
+    private String jobNature;
+
+    /** 常用车号 */
+    private String licenseNumber;
+
+    /** 品牌及车型 */
+    private String brand;
+
+    /** 联系电话 */
+    private Long phone;
+
+    /** 备注1 */
+    private String remark1;
+
+    /** 备注2 */
+    private String remark2;
+
+    /** 备注3 */
+    private String remark3;
+
+    /** 备注4 */
+    private String remark4;
+
+    /** 备注5 */
+    private String remark5;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolSecurity/SchoolVideoConsult.java

+package yangtz.cs.liu.campus.domain.schoolSecurity;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 监控录像调用(内部)对象 school_video_consult
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@Data
+public class SchoolVideoConsult extends OurBaseEntity
+{
+
+    /** 流程实例id */
+    private String instanceId;
+
+    /** 用户id */
+    private Long userId;
+
+    /** 用户名称 */
+    private String userName;
+
+    /** 联系电话 */
+    private Long phone;
+
+    /** 所在部门id */
+    private Long orgid;
+
+    /** 所在部门 */
+    private String orgname;
+
+    /** 录像调用开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date videoStartTime;
+
+    /** 录像调用结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date videoEndTime;
+
+    /** 调阅位置 */
+    private String location;
+
+    /** 申请事由 */
+    private String applyReason;
+
+    /** 状态（0未提交，1级部/处室审核，2信息技术中心负责人审核，3安全管理中心负责人审核，4分管领导审核，5结束） */
+    private String state;
+
+    /** 申请人id */
+    private Long applyUserId;
+
+    /** 申请人 */
+    private String applyUser;
+
+    /** 申请部门id */
+    private Long applyOrgid;
+
+    /** 申请部门 */
+    private String applyOrgname;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 申请人类型（0教工 1职工） */
+    private String applyType;
+
+    /** 审批人id1 */
+    private Long handUserId1;
+
+    /** 审批人1 */
+    private String handUserName1;
+
+    /** 审批人1意见 */
+    private String handUserOpinion1;
+
+    /** 审批人1签名是否显示（1是，0否） */
+    private String isSign1;
+
+    /** 审批人id2 */
+    private Long handUserId2;
+
+    /** 审批人2 */
+    private String handUserName2;
+
+    /** 审批人2意见 */
+    private String handUserOpinion2;
+
+    /** 审批人2签名是否显示（1是，0否） */
+    private String isSign2;
+
+    /** 审批人id3 */
+    private Long handUserId3;
+
+    /** 审批人3 */
+    private String handUserName3;
+
+    /** 审批人3意见 */
+    private String handUserOpinion3;
+
+    /** 审批人3签名是否显示（1是，0否） */
+    private String isSign3;
+
+    /** 审批人id4 */
+    private Long handUserId4;
+
+    /** 审批人4 */
+    private String handUserName4;
+
+    /** 审批人4意见 */
+    private String handUserOpinion4;
+
+    /** 审批人4签名是否显示（1是，0否） */
+    private String isSign4;
+
+    /** 调取结果1 */
+    private String fetchResult1;
+
+    /** 调取结果2 */
+    private String fetchResult2;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolSecurity/SchoolVideoConsultExternal.java

+package yangtz.cs.liu.campus.domain.schoolSecurity;
+
+import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * 监控调阅（外部）对象 school_video_consult_external
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@Data
+public class SchoolVideoConsultExternal extends OurBaseEntity
+{
+
+    /** 流程实例id */
+    private String instanceId;
+
+    /** 用户id */
+    private Long userId;
+
+    /** 姓名 */
+    private String userName;
+
+    /** 联系电话 */
+    private Long phone;
+
+    /** 身份证号 */
+    private String idCard;
+
+    /** 录像调用开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date videoStartTime;
+
+    /** 录像调用结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date videoEndTime;
+
+    /** 调阅位置 */
+    private String location;
+
+    /** 申请事由 */
+    private String applyReason;
+
+    /** 状态（0未提交，1信息技术中心负责人审核，2安保负责人审核，3安全管理中心负责人审核，4分管领导审核，5结束） */
+    private String state;
+
+    /** 申请人id */
+    private Long applyUserId;
+
+    /** 申请人 */
+    private String applyUser;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 审批人id1 */
+    private Long handUserId1;
+
+    /** 审批人1 */
+    private String handUserName1;
+
+    /** 审批人1意见 */
+    private String handUserOpinion1;
+
+    /** 审批人1签名是否显示（1是，0否） */
+    private String isSign1;
+
+    /** 审批人id2 */
+    private Long handUserId2;
+
+    /** 审批人2 */
+    private String handUserName2;
+
+    /** 审批人2意见 */
+    private String handUserOpinion2;
+
+    /** 审批人2签名是否显示（1是，0否） */
+    private String isSign2;
+
+    /** 审批人id3 */
+    private Long handUserId3;
+
+    /** 审批人3 */
+    private String handUserName3;
+
+    /** 审批人3意见 */
+    private String handUserOpinion3;
+
+    /** 审批人3签名是否显示（1是，0否） */
+    private String isSign3;
+
+    /** 审批人id4 */
+    private Long handUserId4;
+
+    /** 审批人4 */
+    private String handUserName4;
+
+    /** 审批人4意见 */
+    private String handUserOpinion4;
+
+    /** 审批人4签名是否显示（1是，0否） */
+    private String isSign4;
+
+    /** 调取结果 */
+    private String fetchResult;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacher/TeacherJy.java

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.domain.teacher;
 
 
 import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
 import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -33,7 +34,8 @@ public class TeacherJy extends OurBaseEntity {
 
 
     //借用日期
     //借用日期
     @Excel(name = "借用日期")
     @Excel(name = "借用日期")
-    private String borrowTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date borrowTime;
 
 
     //借用人
     //借用人
     @Excel(name = "借用人")
     @Excel(name = "借用人")

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacher/TeacherLy.java

 package yangtz.cs.liu.campus.domain.teacher;
 package yangtz.cs.liu.campus.domain.teacher;
 
 
 import com.core.domain.OurBaseEntity;
 import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.Date;
+
 @Data
 @Data
 public class TeacherLy extends OurBaseEntity {
 public class TeacherLy extends OurBaseEntity {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
@@ -28,7 +31,8 @@ public class TeacherLy extends OurBaseEntity {
 
 
     //领用日期
     //领用日期
     @Excel(name = "领用日期")
     @Excel(name = "领用日期")
-    private String recipientTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date recipientTime;
 
 
     private Long recipientById;
     private Long recipientById;
     //领用人
     //领用人

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentLedgerMapper.java

@@ -27,7 +27,7 @@ public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger>
      * 获取用户
      * 获取用户
      * @return
      * @return
      */
      */
-    List<Map<String, String>> getUser(SysUser sysUser);
+    List<Map<String, Object>> getUser(SysUser sysUser);
 
 
     /**
     /**
      * 查看个人设备台账列表
      * 查看个人设备台账列表

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolInstrument/SchoolInstrumentClassifyMapper.java

+package yangtz.cs.liu.campus.mapper.schoolInstrument;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrumentClassify;
+
+import java.util.List;
+
+/**
+ * 仪器药品分类Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Repository
+public interface SchoolInstrumentClassifyMapper extends BaseMapper<SchoolInstrumentClassify> {
+    /**
+     * 查询仪器药品分类
+     *
+     * @param id 仪器药品分类主键
+     * @return 仪器药品分类
+     */
+    public SchoolInstrumentClassify selectSchoolInstrumentClassifyById(Long id);
+
+    /**
+     * 查询仪器药品分类列表
+     *
+     * @param schoolInstrumentClassify 仪器药品分类
+     * @return 仪器药品分类集合
+     */
+    public List<SchoolInstrumentClassify> selectSchoolInstrumentClassifyList(SchoolInstrumentClassify schoolInstrumentClassify);
+
+    /**
+     * 新增仪器药品分类
+     *
+     * @param schoolInstrumentClassify 仪器药品分类
+     * @return 结果
+     */
+    public int insertSchoolInstrumentClassify(SchoolInstrumentClassify schoolInstrumentClassify);
+
+    /**
+     * 修改仪器药品分类
+     *
+     * @param schoolInstrumentClassify 仪器药品分类
+     * @return 结果
+     */
+    public int updateSchoolInstrumentClassify(SchoolInstrumentClassify schoolInstrumentClassify);
+
+    /**
+     * 删除仪器药品分类
+     *
+     * @param id 仪器药品分类主键
+     * @return 结果
+     */
+    public int deleteSchoolInstrumentClassifyById(Long id);
+
+    /**
+     * 批量删除仪器药品分类
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolInstrumentClassifyByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolInstrument/SchoolInstrumentDetailMapper.java

+package yangtz.cs.liu.campus.mapper.schoolInstrument;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrumentDetail;
+import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolInstrumentDetailVo;
+
+import java.util.List;
+
+/**
+ * 仪器出入库明细Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Repository
+public interface SchoolInstrumentDetailMapper extends BaseMapper<SchoolInstrumentDetail> {
+
+    /**
+     * 查询仪器出入库明细
+     *
+     * @param id 仪器出入库明细主键
+     * @return 仪器出入库明细
+     */
+    public SchoolInstrumentDetail selectSchoolInstrumentDetailById(Long id);
+
+    /**
+     * 查询仪器出入库明细列表
+     *
+     * @param schoolInstrumentDetailVo 仪器出入库明细
+     * @return 仪器出入库明细集合
+     */
+    public List<SchoolInstrumentDetail> selectSchoolInstrumentDetailList(SchoolInstrumentDetailVo schoolInstrumentDetailVo);
+
+    /**
+     * 新增仪器出入库明细
+     *
+     * @param schoolInstrumentDetail 仪器出入库明细
+     * @return 结果
+     */
+    public int insertSchoolInstrumentDetail(SchoolInstrumentDetail schoolInstrumentDetail);
+
+    /**
+     * 修改仪器出入库明细
+     *
+     * @param schoolInstrumentDetail 仪器出入库明细
+     * @return 结果
+     */
+    public int updateSchoolInstrumentDetail(SchoolInstrumentDetail schoolInstrumentDetail);
+
+    /**
+     * 删除仪器出入库明细
+     *
+     * @param id 仪器出入库明细主键
+     * @return 结果
+     */
+    public int deleteSchoolInstrumentDetailById(Long id);
+
+    /**
+     * 批量删除仪器出入库明细
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolInstrumentDetailByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolInstrument/SchoolInstrumentMapper.java

+package yangtz.cs.liu.campus.mapper.schoolInstrument;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolInstrument;
+import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolInstrumentVo;
+
+import java.util.List;
+
+/**
+ * 仪器管理Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Repository
+public interface SchoolInstrumentMapper extends BaseMapper<SchoolInstrument> {
+
+    /**
+     * 查询仪器管理
+     *
+     * @param id 仪器管理主键
+     * @return 仪器管理
+     */
+    public SchoolInstrument selectSchoolInstrumentById(Long id);
+
+    /**
+     * 查询仪器管理列表
+     *
+     * @param schoolInstrument 仪器管理
+     * @return 仪器管理集合
+     */
+    public List<SchoolInstrument> selectSchoolInstrumentList(SchoolInstrument schoolInstrument);
+
+    /**
+     * 新增仪器管理
+     *
+     * @param schoolInstrument 仪器管理
+     * @return 结果
+     */
+    public int insertSchoolInstrument(SchoolInstrument schoolInstrument);
+
+    /**
+     * 修改仪器管理
+     *
+     * @param schoolInstrument 仪器管理
+     * @return 结果
+     */
+    public int updateSchoolInstrument(SchoolInstrument schoolInstrument);
+
+    /**
+     * 删除仪器管理
+     *
+     * @param id 仪器管理主键
+     * @return 结果
+     */
+    public int deleteSchoolInstrumentById(Long id);
+
+    /**
+     * 批量删除仪器管理
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolInstrumentByIds(Long[] ids);
+
+    /**
+     * 教师借用-明细列表
+     * @param schoolInstrumentVo
+     * @return
+     */
+    List<SchoolInstrument> selectInstrumentList(SchoolInstrumentVo schoolInstrumentVo);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolInstrument/SchoolTeacherBorrowDetailMapper.java

+package yangtz.cs.liu.campus.mapper.schoolInstrument;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolTeacherBorrowDetail;
+
+/**
+ * 教师借用明细Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Repository
+public interface SchoolTeacherBorrowDetailMapper extends BaseMapper<SchoolTeacherBorrowDetail> {
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolInstrument/SchoolTeacherBorrowMapper.java

+package yangtz.cs.liu.campus.mapper.schoolInstrument;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolTeacherBorrow;
+import yangtz.cs.liu.campus.domain.schoolInstrument.SchoolTeacherBorrowDetail;
+import yangtz.cs.liu.campus.vo.schoolInstrument.SchoolTeacherBorrowVo;
+
+import java.util.List;
+
+/**
+ * 教师借用Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-06
+ */
+@Repository
+public interface SchoolTeacherBorrowMapper extends BaseMapper<SchoolTeacherBorrow> {
+
+    /**
+     * 查询教师借用
+     *
+     * @param id 教师借用主键
+     * @return 教师借用
+     */
+    public SchoolTeacherBorrowVo selectSchoolTeacherBorrowById(Long id);
+
+    /**
+     * 查询教师借用列表
+     *
+     * @param schoolTeacherBorrowVo 教师借用
+     * @return 教师借用集合
+     */
+    public List<SchoolTeacherBorrowVo> selectSchoolTeacherBorrowList(SchoolTeacherBorrowVo schoolTeacherBorrowVo);
+
+    /**
+     * 新增教师借用
+     *
+     * @param schoolTeacherBorrowVo 教师借用
+     * @return 结果
+     */
+    public int insertSchoolTeacherBorrow(SchoolTeacherBorrowVo schoolTeacherBorrowVo);
+
+    /**
+     * 修改教师借用
+     *
+     * @param schoolTeacherBorrowVo 教师借用
+     * @return 结果
+     */
+    public int updateSchoolTeacherBorrow(SchoolTeacherBorrowVo schoolTeacherBorrowVo);
+
+    /**
+     * 删除教师借用
+     *
+     * @param id 教师借用主键
+     * @return 结果
+     */
+    public int deleteSchoolTeacherBorrowById(Long id);
+
+    /**
+     * 批量删除教师借用
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolTeacherBorrowByIds(Long[] ids);
+
+    /**
+     * 批量删除教师借用明细
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolTeacherBorrowDetailByTeacherBorrowIds(Long[] ids);
+
+    /**
+     * 批量新增教师借用明细
+     *
+     * @param schoolTeacherBorrowDetailList 教师借用明细列表
+     * @return 结果
+     */
+    public int batchSchoolTeacherBorrowDetail(List<SchoolTeacherBorrowDetail> schoolTeacherBorrowDetailList);
+
+
+    /**
+     * 通过教师借用主键删除教师借用明细信息
+     *
+     * @param id 教师借用ID
+     * @return 结果
+     */
+    public int deleteSchoolTeacherBorrowDetailByTeacherBorrowId(Long id);
+
+    /**
+     * 批量修改归还教师借用明细
+     * @param list
+     * @return
+     */
+    int updateSchoolTeacherBorrowDetails(@Param("list") List<SchoolTeacherBorrowDetail> list);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolLab/SchoolLabCompetitionMapper.java

 package yangtz.cs.liu.campus.mapper.schoolLab;
 package yangtz.cs.liu.campus.mapper.schoolLab;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
 import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
 import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabCompetition;
 import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabCompetition;
 import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabCompetitionVo;
 import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabCompetitionVo;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 实验室竞赛Mapper接口
  * 实验室竞赛Mapper接口
@@ -84,4 +86,11 @@ public interface SchoolLabCompetitionMapper extends BaseMapper<SchoolLabCompetit
      * @return
      * @return
      */
      */
     int deleteSchoolAccessoryByBusinessId(Long id);
     int deleteSchoolAccessoryByBusinessId(Long id);
+
+    /**
+     * 获取教师
+     * @param sysUser
+     * @return
+     */
+    List<Map<String, Object>> getTeacher(SysUser sysUser);
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolLab/SchoolLabMapper.java

@@ -75,7 +75,7 @@ public interface SchoolLabMapper extends BaseMapper<SchoolLab>
      * 查询指定实验室管理员
      * 查询指定实验室管理员
      * @return
      * @return
      */
      */
-    public Map<String,String> getLabAdmin(@Param("roleKey") String roleKey);
+    public Map<String,String> getLabAdmin(@Param("roleKey") String roleKey,@Param("userId") Long userId);
 
 
     /**
     /**
      * 查询全部学科
      * 查询全部学科

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolSecurity/SchoolVehicleInOutMapper.java

+package yangtz.cs.liu.campus.mapper.schoolSecurity;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVehicleInOut;
+import yangtz.cs.liu.campus.vo.schoolSecurity.SchoolVehicleInOutVo;
+
+import java.util.List;
+
+/**
+ * 车辆出入登记Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+public interface SchoolVehicleInOutMapper extends BaseMapper<SchoolVehicleInOut>
+{
+
+    /**
+     * 查询车辆出入登记
+     *
+     * @param id 车辆出入登记主键
+     * @return 车辆出入登记
+     */
+    public SchoolVehicleInOutVo selectSchoolVehicleInOutById(Long id);
+
+    /**
+     * 查询车辆出入登记列表
+     *
+     * @param schoolVehicleInOutVo 车辆出入登记
+     * @return 车辆出入登记集合
+     */
+    public List<SchoolVehicleInOutVo> selectSchoolVehicleInOutList(SchoolVehicleInOutVo schoolVehicleInOutVo);
+
+    /**
+     * 新增车辆出入登记
+     *
+     * @param schoolVehicleInOutVo 车辆出入登记
+     * @return 结果
+     */
+    public int insertSchoolVehicleInOut(SchoolVehicleInOutVo schoolVehicleInOutVo);
+
+    /**
+     * 修改车辆出入登记
+     *
+     * @param schoolVehicleInOutVo 车辆出入登记
+     * @return 结果
+     */
+    public int updateSchoolVehicleInOut(SchoolVehicleInOutVo schoolVehicleInOutVo);
+
+    /**
+     * 删除车辆出入登记
+     *
+     * @param id 车辆出入登记主键
+     * @return 结果
+     */
+    public int deleteSchoolVehicleInOutById(Long id);
+
+    /**
+     * 批量删除车辆出入登记
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolVehicleInOutByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolSecurity/SchoolVehicleRegistrationMapper.java

+package yangtz.cs.liu.campus.mapper.schoolSecurity;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVehicleRegistration;
+
+import java.util.List;
+
+/**
+ * 车辆登记Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+public interface SchoolVehicleRegistrationMapper extends BaseMapper<SchoolVehicleRegistration>
+{
+
+    /**
+     * 查询车辆登记
+     *
+     * @param id 车辆登记主键
+     * @return 车辆登记
+     */
+    public SchoolVehicleRegistration selectSchoolVehicleRegistrationById(Long id);
+
+    /**
+     * 查询车辆登记列表
+     *
+     * @param schoolVehicleRegistration 车辆登记
+     * @return 车辆登记集合
+     */
+    public List<SchoolVehicleRegistration> selectSchoolVehicleRegistrationList(SchoolVehicleRegistration schoolVehicleRegistration);
+
+    /**
+     * 新增车辆登记
+     *
+     * @param schoolVehicleRegistration 车辆登记
+     * @return 结果
+     */
+    public int insertSchoolVehicleRegistration(SchoolVehicleRegistration schoolVehicleRegistration);
+
+    /**
+     * 修改车辆登记
+     *
+     * @param schoolVehicleRegistration 车辆登记
+     * @return 结果
+     */
+    public int updateSchoolVehicleRegistration(SchoolVehicleRegistration schoolVehicleRegistration);
+
+    /**
+     * 删除车辆登记
+     *
+     * @param id 车辆登记主键
+     * @return 结果
+     */
+    public int deleteSchoolVehicleRegistrationById(Long id);
+
+    /**
+     * 批量删除车辆登记
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolVehicleRegistrationByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolSecurity/SchoolVideoConsultExternalMapper.java

+package yangtz.cs.liu.campus.mapper.schoolSecurity;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
+import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVideoConsultExternal;
+import yangtz.cs.liu.campus.vo.schoolSecurity.SchoolVideoConsultExternalVo;
+
+import java.util.List;
+
+/**
+ * 监控调阅（外部）Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+public interface SchoolVideoConsultExternalMapper extends BaseMapper<SchoolVideoConsultExternal>
+{
+
+    /**
+     * 查询监控调阅（外部）
+     *
+     * @param id 监控调阅（外部）主键
+     * @return 监控调阅（外部）
+     */
+    public SchoolVideoConsultExternalVo selectSchoolVideoConsultExternalById(Long id);
+
+    /**
+     * 查询监控调阅（外部）列表
+     *
+     * @param schoolVideoConsultExternalVo 监控调阅（外部）
+     * @return 监控调阅（外部）集合
+     */
+    public List<SchoolVideoConsultExternalVo> selectSchoolVideoConsultExternalList(SchoolVideoConsultExternalVo schoolVideoConsultExternalVo);
+
+    /**
+     * 新增监控调阅（外部）
+     *
+     * @param schoolVideoConsultExternalVo 监控调阅（外部）
+     * @return 结果
+     */
+    public int insertSchoolVideoConsultExternal(SchoolVideoConsultExternalVo schoolVideoConsultExternalVo);
+
+    /**
+     * 修改监控调阅（外部）
+     *
+     * @param schoolVideoConsultExternalVo 监控调阅（外部）
+     * @return 结果
+     */
+    public int updateSchoolVideoConsultExternal(SchoolVideoConsultExternalVo schoolVideoConsultExternalVo);
+
+    /**
+     * 删除监控调阅（外部）
+     *
+     * @param id 监控调阅（外部）主键
+     * @return 结果
+     */
+    public int deleteSchoolVideoConsultExternalById(Long id);
+
+    /**
+     * 批量删除监控调阅（外部）
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolVideoConsultExternalByIds(Long[] ids);
+
+    /**
+     * 批量删除附件信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolAccessoryByBusinessIds(Long[] ids);
+
+    /**
+     * 批量新增附件信息
+     *
+     * @param schoolAccessoryList 附件信息列表
+     * @return 结果
+     */
+    public int batchSchoolAccessory(List<SchoolAccessory> schoolAccessoryList);
+
+
+    /**
+     * 通过监控调阅（外部）主键删除附件信息信息
+     *
+     * @param id 监控调阅（外部）ID
+     * @return 结果
+     */
+    public int deleteSchoolAccessoryByBusinessId(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolSecurity/SchoolVideoConsultMapper.java

+package yangtz.cs.liu.campus.mapper.schoolSecurity;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolSecurity.SchoolVideoConsult;
+import yangtz.cs.liu.campus.vo.schoolSecurity.SchoolVideoConsultVo;
+
+import java.util.List;
+
+/**
+ * 监控录像调用(内部)Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+public interface SchoolVideoConsultMapper extends BaseMapper<SchoolVideoConsult>
+{
+
+    /**
+     * 查询监控录像调用(内部)
+     *
+     * @param id 监控录像调用(内部)主键
+     * @return 监控录像调用(内部)
+     */
+    public SchoolVideoConsultVo selectSchoolVideoConsultById(Long id);
+
+    /**
+     * 查询监控录像调用(内部)列表
+     *
+     * @param schoolVideoConsultVo 监控录像调用(内部)
+     * @return 监控录像调用(内部)集合
+     */
+    public List<SchoolVideoConsultVo> selectSchoolVideoConsultList(SchoolVideoConsultVo schoolVideoConsultVo);
+
+    /**
+     * 新增监控录像调用(内部)
+     *
+     * @param schoolVideoConsultVo 监控录像调用(内部)
+     * @return 结果
+     */
+    public int insertSchoolVideoConsult(SchoolVideoConsultVo schoolVideoConsultVo);
+
+    /**
+     * 修改监控录像调用(内部)
+     *
+     * @param schoolVideoConsultVo 监控录像调用(内部)
+     * @return 结果
+     */
+    public int updateSchoolVideoConsult(SchoolVideoConsultVo schoolVideoConsultVo);
+
+    /**
+     * 删除监控录像调用(内部)
+     *
+     * @param id 监控录像调用(内部)主键
+     * @return 结果
+     */
+    public int deleteSchoolVideoConsultById(Long id);
+
+    /**
+     * 批量删除监控录像调用(内部)
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolVideoConsultByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java

@@ -51,26 +51,21 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
      * @return
      * @return
      */
      */
     @Override
     @Override
-//    @DataScope(userAlias = "u")
     public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) {
     public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) {
-        List<SchoolCirculationVo> list = new ArrayList<>();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         for (SysRole role : roles) {
         for (SysRole role : roles) {
             if (role.getRoleKey().equals("admin")){
             if (role.getRoleKey().equals("admin")){
-                list =  circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
-                break;
+                return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
                 schoolCirculationVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
                 schoolCirculationVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
-                list = circulationMapper.selectSchoolCirculationVoListGr(schoolCirculationVo);
+                return circulationMapper.selectSchoolCirculationVoListGr(schoolCirculationVo);
             }
             }
         }
         }
-        if (roles.size() <= 0){
-            if (user.isAdmin()){
-                list =  circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
-            }
+        if (user.isAdmin()){
+            return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
         }
         }
-        return list;
+        return new ArrayList<>();
     }
     }
   public List<SchoolCirculationVo> selectVxSchoolCirculationVoList(
   public List<SchoolCirculationVo> selectVxSchoolCirculationVoList(
       SchoolReceiveQuery schoolReceiveQuery) {
       SchoolReceiveQuery schoolReceiveQuery) {

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java

@@ -46,26 +46,21 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      * @return
      * @return
      */
      */
     @Override
     @Override
-//    @DataScope(userAlias = "u")
     public List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerList(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo) {
     public List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerList(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo) {
-        List<SchoolEquipmentLedger> list = new ArrayList<>();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         for (SysRole role : roles) {
         for (SysRole role : roles) {
             if (role.getRoleKey().equals("admin")){
             if (role.getRoleKey().equals("admin")){
-                list =  equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
-                break;
+                return equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
                 schoolEquipmentLedgerVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
                 schoolEquipmentLedgerVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
-                list = equipmentLedgerMapper.selectSchoolEquipmentLedgerListGr(schoolEquipmentLedgerVo);
+                return equipmentLedgerMapper.selectSchoolEquipmentLedgerListGr(schoolEquipmentLedgerVo);
             }
             }
         }
         }
-        if (roles.size() <= 0){
-            if (user.isAdmin()){
-                list =  equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
-            }
+        if (user.isAdmin()){
+            return equipmentLedgerMapper.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
         }
         }
-        return list;
+        return new ArrayList<>();
     }
     }
 
 
     /**
     /**
@@ -278,7 +273,7 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public List<Map<String, String>> getUser(SysUser sysUser) {
+    public List<Map<String, Object>> getUser(SysUser sysUser) {
         return equipmentLedgerMapper.getUser(sysUser);
         return equipmentLedgerMapper.getUser(sysUser);
     }
     }
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java

@@ -37,26 +37,21 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
      * @return
      * @return
      */
      */
     @Override
     @Override
-//    @DataScope(userAlias = "u")
     public List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoList(SchoolEquipmentRepairVo schoolEquipmentRepairVo) {
     public List<SchoolEquipmentRepairVo> selectSchoolEquipmentRepairVoList(SchoolEquipmentRepairVo schoolEquipmentRepairVo) {
-        List<SchoolEquipmentRepairVo> list = new ArrayList<>();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         for (SysRole role : roles) {
         for (SysRole role : roles) {
             if (role.getRoleKey().equals("admin")){
             if (role.getRoleKey().equals("admin")){
-                list =  equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
-                break;
+                return equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
                 schoolEquipmentRepairVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
                 schoolEquipmentRepairVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
-                list = equipmentRepairMapper.selectSchoolEquipmentRepairVoListGr(schoolEquipmentRepairVo);
+                return equipmentRepairMapper.selectSchoolEquipmentRepairVoListGr(schoolEquipmentRepairVo);
             }
             }
         }
         }
-        if (roles.size() <= 0){
-            if (user.isAdmin()){
-                list =  equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
-            }
+        if (user.isAdmin()){
+            return   equipmentRepairMapper.selectSchoolEquipmentRepairVoList(schoolEquipmentRepairVo);
         }
         }
-        return list;
+        return new ArrayList<>();
     }
     }
 
 
     /**
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/InStockServiceImpl.java

@@ -27,26 +27,21 @@ public class InStockServiceImpl extends ServiceImpl<InStockMapper, SchoolInStock
      * @return
      * @return
      */
      */
     @Override
     @Override
-//    @DataScope(userAlias = "u")
     public List<SchoolInStockVo> selectSchoolInStockVoList(SchoolInStockVo schoolInStockVo) {
     public List<SchoolInStockVo> selectSchoolInStockVoList(SchoolInStockVo schoolInStockVo) {
-        List<SchoolInStockVo> list = new ArrayList<>();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         for (SysRole role : roles) {
         for (SysRole role : roles) {
             if (role.getRoleKey().equals("admin")){
             if (role.getRoleKey().equals("admin")){
-                list =  inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
-                break;
+                return inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
                 schoolInStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
                 schoolInStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
-                list = inStockMapper.selectSchoolInStockVoListGr(schoolInStockVo);
+                return inStockMapper.selectSchoolInStockVoListGr(schoolInStockVo);
             }
             }
         }
         }
-        if (roles.size() <= 0){
-            if (user.isAdmin()){
-                list =  inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
-            }
+        if (user.isAdmin()){
+            return inStockMapper.selectSchoolInStockVoList(schoolInStockVo);
         }
         }
-        return list;
+        return new ArrayList<>();
     }
     }
 
 
     /**
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/OutStockServiceImpl.java

@@ -27,26 +27,21 @@ public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, SchoolOutSt
      * @return
      * @return
      */
      */
     @Override
     @Override
-//    @DataScope(userAlias = "u")
     public List<SchoolOutStockVo> selectSchoolOutStockVoList(SchoolOutStockVo schoolOutStockVo) {
     public List<SchoolOutStockVo> selectSchoolOutStockVoList(SchoolOutStockVo schoolOutStockVo) {
-        List<SchoolOutStockVo> list = new ArrayList<>();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         for (SysRole role : roles) {
         for (SysRole role : roles) {
             if (role.getRoleKey().equals("admin")){
             if (role.getRoleKey().equals("admin")){
-                list =  outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
-                break;
+                return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
             }else if (role.getRoleKey().equals("productCategoryAdmin")){
                 schoolOutStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
                 schoolOutStockVo.setAdminId(SecurityUtils.getLoginUser().getUser().getUserId());
-                list = outStockMapper.selectSchoolOutStockVoListGr(schoolOutStockVo);
+                return outStockMapper.selectSchoolOutStockVoListGr(schoolOutStockVo);
             }
             }
         }
         }
-        if (roles.size() <= 0){
-            if (user.isAdmin()){
-                list =  outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
-            }
+        if (user.isAdmin()){
+            return outStockMapper.selectSchoolOutStockVoList(schoolOutStockVo);
         }
         }
-        return list;
+        return new ArrayList<>();
     }
     }
 
 
     /**
     /**