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

ruoyi-admin/src/main/resources/application.yml

@@ -35,6 +35,9 @@ server:
 #  port: 11324
   #port: 8082
   servlet:
+    #配置超时时间
+    session:
+      timeout: 120s
     # 应用的访问路径
     context-path: /
   tomcat:

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

@@ -70,3 +70,10 @@ export function getResult(data) {
     data,
   });
 }
+//获取科目
+export function getSub() {
+  return request({
+    url: "schoolTeacherExperimentApply/getSubject",
+    method: "get",
+  });
+}

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

@@ -89,9 +89,9 @@
                 <el-row :gutter="30">
                     <el-col :span="10">
                         <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 v-model="form.sub" placeholder="请选择" clearable :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in subList" :key="index" :label="item.subName"
+                                    :value="item.sub"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -173,6 +173,7 @@
 
             </div>
         </el-dialog>
+
         <!--查看弹窗 -->
         <el-dialog title="申请信息" :visible.sync="open" width="60%">
             <el-form :model="form" ref="form" size="small" label-width="110px" :disabled="isEdit">
@@ -294,6 +295,7 @@ import {
     getApplylist,// 查询个人实验申请列表
     getListxq,//查看详情
     getResult,//附件
+    getSub,//获取科目
 } from '@/api/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp';
 import FileUploadlab from '@/components/FileUploadlab';
 import { getToken } from '@/utils/auth';
@@ -355,6 +357,8 @@ export default {
             //级部
             gradeList: [],
             gradeLists: [],
+            //科目
+            subList: [],
             total: 0,
             postForm: {
                 id: '',
@@ -400,11 +404,11 @@ export default {
         this.getList();
         this.getGradelist();
         this.getGrade();
+        this.getSubiect();
 
 
     },
     methods: {
-
         getList() {
             getApplylist(this.queryForm).then(response => {
                 this.tableData = response.rows;
@@ -518,6 +522,15 @@ export default {
 
 
         },
+        //获取科目
+        getSubiect() {
+            getSub().then(response => {
+                this.subList = response.data;
+                console.log(this.subList, 'this.subList');
+            })
+
+
+        },
 
         //上传按钮
         getFileList(data) {

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

 package yangtz.cs.liu.campus.controller.schoolLab;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,6 +28,8 @@ import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYearRelation;
 import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
 import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApplyLabs;
 import yangtz.cs.liu.campus.service.accessory.IAccessoryService;
+import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassMentorService;
+import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService;
 import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherExperimentApplyService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -51,6 +54,10 @@ public class SchoolTeacherExperimentApplyController extends BaseController
     private ISchoollTeacherExperimentApplyLabsService schoollTeacherExperimentApplyLabsService;
     @Autowired
     private IAccessoryService accessoryService;
+    @Autowired
+    private ISchoolClassMentorService schoolClassMentorService;
+    @Autowired
+    ISchoolLabClassYearService schoolLabClassYearService;
 
     /**
      * 查询教师个人实验申请列表
@@ -336,4 +343,43 @@ public class SchoolTeacherExperimentApplyController extends BaseController
         return toAjax(schoolTeacherExperimentApplyService.experimentResult(schoolTeacherExperimentApplyVo));
     }
 
+    /**
+     * 获取当前登录角色学科
+     */
+
+    @GetMapping("/getSubject")
+    public AjaxResult getSubject(){
+        Long userId = SecurityUtils.getUserId();
+        List<Map<String,String>> subList = new ArrayList<>();
+
+        //设置级部
+        //获取学科
+        Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
+        if (map != null && null != map.get("courseId") ) {
+            String s = map.get("courseId");
+            List<String> list = Arrays.asList(s.split(","));
+            List<String> myList = list.stream().distinct().collect(Collectors.toList());
+            List<String> strings = schoolLabClassYearService.convertMentor(myList);
+            for (String date : strings) {
+                if (date.equals("1")) {
+                    Map<String,String> mapList = new HashMap<>();
+                    mapList.put("subName", "物理");
+                    mapList.put("sub", "1");
+                    subList.add(mapList);
+                } else if (date.equals("2")) {
+                    Map<String,String> mapList = new HashMap<>();
+                    mapList.put("subName", "化学");
+                    mapList.put("sub", "2");
+                    subList.add(mapList);
+                } else if (date.equals("3")) {
+                    Map<String,String> mapList = new HashMap<>();
+                    mapList.put("subName", "生物");
+                    mapList.put("sub", "3");
+                    subList.add(mapList);
+                }
+            }
+        }
+        return AjaxResult.success(subList);
+    }
+
 }