Merge branch 'master' of 49.232.152.146:xhxy/smart_school

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -118,4 +118,15 @@ public class SysDictDataController extends BaseController
         dictDataService.deleteDictDataByIds(dictCodes);
         return success();
     }
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     * @param dictType
+     * @param dictValue
+     * @return
+     */
+    @GetMapping("/getDictLabel{dictType}/{dictValue}")
+    public AjaxResult selectDictLabel(@PathVariable("dictType") String dictType, @PathVariable("dictValue") String dictValue){
+        return AjaxResult.success(dictDataService.selectDictLabel(dictType,dictValue));
+    }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/auditorium/SchoolAuditorium.java

@@ -52,7 +52,7 @@ public class SchoolAuditorium extends OurBaseEntity
     private Long activityNumber;
 
     /** 预计时长 */
-    private BigDecimal duration;
+    private String duration;
 
     /** 是否彩排（1-是，0-否） */
     private String isRehearsal;
@@ -188,15 +188,6 @@ public class SchoolAuditorium extends OurBaseEntity
     {
         return activityNumber;
     }
-    public void setDuration(BigDecimal duration)
-    {
-        this.duration = duration;
-    }
-
-    public BigDecimal getDuration()
-    {
-        return duration;
-    }
     public void setIsRehearsal(String isRehearsal)
     {
         this.isRehearsal = isRehearsal;

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/curricula/StudentScoreServiceImpl.java

@@ -153,10 +153,10 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreMapper, Sch
             } else if (StringUtils.isEmpty(schoolStudentScoreVo.getStudentNumber())) {
                 failureNum++;
                 failureMsg.append("<br/>" + failureNum + "、学号为空，请您重新输入！");
-            } else if (StringUtils.isEmpty(schoolStudentScoreVo.getClassName())) {
+            } /*else if (StringUtils.isEmpty(schoolStudentScoreVo.getClassName())) {
                 failureNum++;
                 failureMsg.append("<br/>" + failureNum + "、班级为空，请您重新输入！");
-            } else if (StringUtils.isNull(schoolStudentScoreVo.getExamType())) {
+            }*/ else if (StringUtils.isNull(schoolStudentScoreVo.getExamType())) {
                 failureNum++;
                 failureMsg.append("<br/>" + failureNum + "、考试类型为空，请您重新输入！");
             } else {
@@ -167,7 +167,7 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreMapper, Sch
                 if (StringUtils.isNull(schoolStudents) || schoolStudents.size() == 0){
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、" + schoolStudentScoreVo.getStudentName() + "同学不存在,请您重新输入! ");
-                }else {
+                }/*else {
                     SchoolStudent schoolStudent = schoolStudents.get(0);
                     LambdaQueryWrapper<SchoolClass> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(SchoolClass::getId,schoolStudent.getClassId())
@@ -177,7 +177,7 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreMapper, Sch
                         failureNum++;
                         failureMsg.append("<br/>" + failureNum + "、" + schoolStudentScoreVo.getClassName() + "班级" + schoolStudentScoreVo.getStudentName() + "同学不存在,请您重新输入! ");
                     }
-                }
+                }*/
             }
         }
         if (failureNum > 0) {

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/auditorium/SchoolAuditoriumVo.java

@@ -48,7 +48,7 @@ public class SchoolAuditoriumVo extends ProcessBaseEntity {
 
     /** 预计时长 */
     @Excel(name = "预计时长")
-    private BigDecimal duration;
+    private String duration;
 
     /** 是否彩排（1-是，0-否） */
     @Excel(name = "是否彩排", readConverterExp = "1=-是，0-否")

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/student/SchoolStudentScoreVo.java

@@ -19,13 +19,13 @@ public class SchoolStudentScoreVo extends OurBaseEntity {
     /** 班级主键id */
     private Long classId;
     /** 学生姓名 */
-    @Excel(name = "学生姓名")
+    @Excel(name = "*学生姓名")
     private String studentName;
     /** 学号 */
-    @Excel(name = "学号")
+    @Excel(name = "*学号")
     private String studentNumber;
     /** 身份证号 */
-    @Excel(name = "身份证号")
+    @Excel(name = "*身份证号")
     private String idCard;
     /** 班级 */
     @Excel(name = "班级")
@@ -33,7 +33,7 @@ public class SchoolStudentScoreVo extends OurBaseEntity {
     /**年级值*/
     private Integer gradeValue;
     /** 考试类型 */
-    @Excel(name = "考试类型",combo = {"一次","二次","三次","期末"},readConverterExp = "1=一次,2=二次,3=三次,4=期末")
+    @Excel(name = "*考试类型",combo = {"一次","二次","三次","期末"},readConverterExp = "1=一次,2=二次,3=三次,4=期末")
     private String examType;
     /** 总成绩 */
     private double totalScore;