bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/excel/ExamStudentImportDto.java

@@ -36,13 +36,15 @@ public class ExamStudentImportDto implements Serializable {
     @NotNull
     private String clazzName;
 
-    @ExcelNote(value = "考点")
-    private String examPlace;
-
     @ExcelNote(value = "考场")
     @NotNull
     private String examRoom;
 
+
+    @ExcelNote(value = "考点")
+    private String examPlace;
+
+
     public String getStudentName() {
         return studentName;
     }
@@ -91,14 +93,6 @@ public class ExamStudentImportDto implements Serializable {
         this.clazzName = clazzName;
     }
 
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
     public String getExamRoom() {
         return examRoom;
     }
@@ -106,4 +100,12 @@ public class ExamStudentImportDto implements Serializable {
     public void setExamRoom(String examRoom) {
         this.examRoom = examRoom;
     }
+
+    public String getExamPlace() {
+        return examPlace;
+    }
+
+    public void setExamPlace(String examPlace) {
+        this.examPlace = examPlace;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/DictionaryResult.java

@@ -23,6 +23,9 @@ public class DictionaryResult implements Serializable {
     @ApiModelProperty(value = "编号")
     private String code;
 
+    @ApiModelProperty(value = "当前使用的（学期...）")
+    private Boolean inUsed;
+
     public Long getId() {
         return id;
     }
@@ -46,4 +49,12 @@ public class DictionaryResult implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
+    public Boolean getInUsed() {
+        return inUsed;
+    }
+
+    public void setInUsed(Boolean inUsed) {
+        this.inUsed = inUsed;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -2045,8 +2045,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             if (examPlaceList.size() > 1) {
                 throw ExceptionResultEnum.ERROR.exception("异常：考场对应多个考点");
             }
-            String examPlace = examPlaceList.get(0);
-
+            String examPlace = null;
+            if (examPlaceList.size() > 0){
+                examPlace = examPlaceList.get(0);
+            }
 
             // 该考场学号集合
             List<String> studentCodeList = examStudentImportDtoList.stream()
@@ -2083,7 +2085,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
             ExamTaskExamStudentImportResult examTaskExamStudentImportResult = new ExamTaskExamStudentImportResult();
             examTaskExamStudentImportResult.setExamRoom(examRoom);
-            examTaskExamStudentImportResult.setExamPlace(examPlace);
+            if (SystemConstant.strNotNull(examPlace)){
+                examTaskExamStudentImportResult.setExamPlace(examPlace);
+            }
             examTaskExamStudentImportResult.setExamTaskStudentObjectResultList(examTaskStudentObjectResultList);
             result.add(examTaskExamStudentImportResult);
         }

distributed-print-business/src/main/resources/db/1、init-table.sql

@@ -1361,8 +1361,7 @@ CREATE TABLE `sys_privilege` (
                                  `enable` tinyint NOT NULL DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
                                  `default_auth` tinyint DEFAULT '1' COMMENT '默认权限，0：否，1：是',
                                  `front_display` tinyint(1) DEFAULT '1' COMMENT '是否前端展示',
-                                 PRIMARY KEY (`id`) USING BTREE,
-                                 UNIQUE KEY `privilege_index` (`name`,`url`,`type`) USING BTREE
+                                 PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单权限表';
 
 -- ----------------------------

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -82,9 +82,6 @@ public class SysController {
     @Resource
     TeachcloudCommonService teachcloudCommonService;
 
-    @Resource
-    SysOrgService sysOrgService;
-
     @Resource
     BasicMajorService basicMajorService;
 
@@ -577,12 +574,17 @@ public class SysController {
         List<DictionaryResult> dictionaryResultList = new ArrayList<>();
         switch (dictionaryEnum) {
             case SEMESTER:
-                List<BasicSemester> basicSemesterList = basicSemesterService.list(new QueryWrapper<BasicSemester>().lambda().eq(BasicSemester::getSchoolId, schoolId).eq(BasicSemester::getEnable, true));
+                List<BasicSemester> basicSemesterList = basicSemesterService.list(new QueryWrapper<BasicSemester>()
+                        .lambda()
+                        .eq(BasicSemester::getSchoolId, schoolId)
+                        .eq(BasicSemester::getEnable, true)
+                        .orderByDesc(BasicSemester::getInUsed));
                 dictionaryResultList = basicSemesterList.stream().map(e -> {
                     DictionaryResult dictionaryResult = new DictionaryResult();
                     dictionaryResult.setId(e.getId());
                     dictionaryResult.setCode(e.getCode());
                     dictionaryResult.setName(e.getName());
+                    dictionaryResult.setInUsed(e.getInUsed());
                     return dictionaryResult;
                 }).collect(Collectors.toList());
                 break;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/BasicCourseImportDto.java

@@ -24,8 +24,8 @@ public class BasicCourseImportDto implements Serializable {
     @NotNull
     private String courseCode;
 
-    @ExcelNote(value = "所属部门")
-    @ExcelProperty(name = "所属部门", width = 30, index = 3)
+    @ExcelNote(value = "开课部门")
+    @ExcelProperty(name = "开课部门", width = 30, index = 3)
     @NotNull
     private String teachingRoomName;