Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/controller/ClassHonorsController.java

@@ -61,8 +61,6 @@ public class ClassHonorsController {
     @ApiOperation(value="班级荣誉列表(分页)")
     @SaCheckPermission("classhonors:detail")
     public RT<PageOutput<ClassHonorsPageVo>> page(@Valid ClassHonorsPageDto dto){
-        //为保证返回给前端的班级id唯一性，将学期id加在班级id上,应该处理
-        dto.setClassId(dto.getClassId() - dto.getBaseSemesterId());
         IPage<ClassHonorsPageVo> page = classHonorsService.getPagePC(dto);
         PageOutput<ClassHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, ClassHonorsPageVo.class);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/student/controller/StudentHonorsController.java

@@ -50,8 +50,6 @@ public class StudentHonorsController {
     @ApiOperation(value="学生荣誉列表(分页)")
     @SaCheckPermission("studenthonors:detail")
     public RT<PageOutput<StudentHonorsPageVo>> page(@Valid StudentHonorsPageDto dto){
-        //传过来的班级id为加上学期id的，应该处理
-        dto.setClassId(dto.getClassId() - dto.getBaseSemesterId());
         Page<StudentHonorsPageVo> page = studentHonorsService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<StudentHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, StudentHonorsPageVo.class);
         return RT.ok(pageOutput);
@@ -62,7 +60,6 @@ public class StudentHonorsController {
     @ApiOperation(value = "学生荣誉列表(树)")
     @SaCheckPermission("studenthonors:detail")
     public RT<List<StudentHonorsTreeVo>> tree() {
-
         List<StudentHonorsTreeVo> voList = new ArrayList<>();
         studentHonorsService.getSemesterInfo().forEach((node) -> {
             voList.add(new StudentHonorsTreeVo(){{
@@ -72,8 +69,7 @@ public class StudentHonorsController {
         });
         studentHonorsService.getClassInfo().forEach((node) -> {
             voList.add(new StudentHonorsTreeVo(){{
-                //为保证返回给前端的班级id唯一性，将学期id加在班级id上
-                setId(node.getId()+node.getParentId());
+                setId(node.getId());
                 setName(node.getName());
                 setParentId(node.getParentId());
             }});

src/main/java/com/xjrsoft/module/student/service/impl/ClassHonorsServiceImpl.java

@@ -85,8 +85,7 @@ public class ClassHonorsServiceImpl extends MPJBaseServiceImpl<ClassHonorsMapper
         //获取班级荣誉中出现的学期下的所有班级作为树的子级
         classHonorsMapper.getSemesterClass().forEach((node) -> {
             treeVoList.add(new ClassHonorsSemesterClassTreeVo(){{
-                //为保证返回给前端的班级id唯一性，将学期id加在班级id上
-                setId(node.getClassId() + node.getBaseSemesterId());
+                setId(node.getClassId());
                 setName(node.getClassIdCN());
                 setParentId(node.getBaseSemesterId());
             }});

src/main/resources/mapper/student/ClassHonorsMapper.xml

@@ -44,7 +44,7 @@
             t1.name AS honorsLevelCN,
             t2.name AS honorsGradeCN,
             t3.name AS baseSemesterIdCN,
-            t4.name AS classIdCN,
+            t4.name AS classIdCN
         FROM class_honors t
             LEFT JOIN xjr_dictionary_detail t1 ON t1.code = t.honors_level
             LEFT JOIN xjr_dictionary_detail t2 ON t2.code = t.honors_grade