Merge branch 'master' of 49.232.152.146:qangqi/dd_school

ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue

@@ -73,7 +73,7 @@
         <template slot-scope="{ row }">
         <template slot-scope="{ row }">
           {{
           {{
             row.state == 1
             row.state == 1
-              ? "编辑"
+              ? "未填写"
               : row.state == 4
               : row.state == 4
               ? "已提交"
               ? "已提交"
               : row.state == 5
               : row.state == 5
@@ -120,7 +120,25 @@
         align="center"
         align="center"
         min-width="150"
         min-width="150"
         prop="education"
         prop="education"
-      />
+      >
+        <template slot-scope="{ row }">
+          {{
+            row.education == 0
+              ? "高中"
+              : row.education == 1
+              ? "专科"
+              : row.education == 2
+              ? "本科"
+              : row.education == 3
+              ? "研究生"
+              : row.education == 4
+              ? "硕士"
+              : row.education == 5
+              ? "博士"
+              : ""
+          }}
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         label="政治面貌"
         label="政治面貌"
         align="center"
         align="center"

ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue

@@ -319,6 +319,8 @@
               style="padding-right: 10px"
               style="padding-right: 10px"
             >
             >
               <el-input
               <el-input
+                type="number"
+                placeholder="请输入数字"
                 v-model="form.classHour"
                 v-model="form.classHour"
                 :disabled="form.state == '4' ? true : false"
                 :disabled="form.state == '4' ? true : false"
               ></el-input>
               ></el-input>

ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue

@@ -308,6 +308,7 @@
               style="padding-right: 10px"
               style="padding-right: 10px"
             >
             >
               <el-input
               <el-input
+                type="number"
                 v-model="form.classHour"
                 v-model="form.classHour"
                 :disabled="status == '7' ? true : false"
                 :disabled="status == '7' ? true : false"
               ></el-input>
               ></el-input>

ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue

@@ -562,6 +562,9 @@ export default {
           elink.setAttribute("href", objectUrl);
           elink.setAttribute("href", objectUrl);
           elink.setAttribute("download", "教师电子档案" + ".xls");
           elink.setAttribute("download", "教师电子档案" + ".xls");
           elink.click();
           elink.click();
+        })
+        .then(() => {
+          this.$modal.closeLoading();
         });
         });
     },
     },
 
 

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolExperimentPlanServiceImpl.java

@@ -277,8 +277,9 @@ public class SchoolExperimentPlanServiceImpl extends ServiceImpl<SchoolExperimen
         wrapper.eq(SchoolGradeMentor::getGradeId,gradeId)
         wrapper.eq(SchoolGradeMentor::getGradeId,gradeId)
                 .eq(SchoolGradeMentor::getTeacherId,user.getUserId());
                 .eq(SchoolGradeMentor::getTeacherId,user.getUserId());
         SchoolGradeMentor schoolGradeMentor = schoolGradeMentorMapper.selectOne(wrapper);
         SchoolGradeMentor schoolGradeMentor = schoolGradeMentorMapper.selectOne(wrapper);
+        //无学科组返回提示
         if (StringUtils.isBlank(schoolGradeMentor.getSubGroup())){
         if (StringUtils.isBlank(schoolGradeMentor.getSubGroup())){
-            return schoolLabMapper.getSubAll();
+            throw new ServiceException("您还未加入学科组！");
         }
         }
         if (schoolGradeMentor.getSubGroup().equals("1")){
         if (schoolGradeMentor.getSubGroup().equals("1")){
             list.add(schoolLabMapper.getSub("1"));
             list.add(schoolLabMapper.getSub("1"));

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/experiment/TeacherExperimentController.java

@@ -78,7 +78,7 @@ public class TeacherExperimentController extends BaseController {
     schoolLabClassYearVo.setGradeId(gradeId);
     schoolLabClassYearVo.setGradeId(gradeId);
     //获取学科
     //获取学科
     Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
     Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
-    if (null != map.get("courseId")){
+    if (map != null && null != map.get("courseId")){
       String s = map.get("courseId");
       String s = map.get("courseId");
       List<String> list = Arrays.asList(s.split(","));
       List<String> list = Arrays.asList(s.split(","));
       List<String> myList = list.stream().distinct().collect(Collectors.toList());
       List<String> myList = list.stream().distinct().collect(Collectors.toList());
@@ -193,7 +193,7 @@ public class TeacherExperimentController extends BaseController {
     //设置级部
     //设置级部
     //获取学科
     //获取学科
     Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
     Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
-    if (null != map.get("courseId")) {
+    if (map != null && null != map.get("courseId") ) {
       String s = map.get("courseId");
       String s = map.get("courseId");
       List<String> list = Arrays.asList(s.split(","));
       List<String> list = Arrays.asList(s.split(","));
       List<String> myList = list.stream().distinct().collect(Collectors.toList());
       List<String> myList = list.stream().distinct().collect(Collectors.toList());

smart-campus/src/main/resources/mapper/schoolLab/SchoolLabClassYearMapper.xml

@@ -45,7 +45,7 @@
     </sql>
     </sql>
 
 
     <select id="selectSchoolLabClassYearList" parameterType="SchoolLabClassYearVo" resultMap="SchoolLabClassYearVoResult">
     <select id="selectSchoolLabClassYearList" parameterType="SchoolLabClassYearVo" resultMap="SchoolLabClassYearVoResult">
-        select lcy.id, lcy.experiment_plan_id, lcy.experiment_name, lcy.grade_id, lcy.grade,
+        select DISTINCT lcy.id, lcy.experiment_plan_id, lcy.experiment_name, lcy.grade_id, lcy.grade,
         lcy.school_year, lcy.semester, lcy.sub, lcy.experiment_classify, lcy.planned_start_time,
         lcy.school_year, lcy.semester, lcy.sub, lcy.experiment_classify, lcy.planned_start_time,
         lcy.planned_end_time, lcy.chapter_content, lcy.experiment_use_goods, lcy.declare_state, lcy.apply_id,
         lcy.planned_end_time, lcy.chapter_content, lcy.experiment_use_goods, lcy.declare_state, lcy.apply_id,
         lcy.apply_name, lcy.apply_time, lcy.create_by, lcy.create_time, lcy.update_by, lcy.update_time, lcy.del_flag
         lcy.apply_name, lcy.apply_time, lcy.create_by, lcy.create_time, lcy.update_by, lcy.update_time, lcy.del_flag