1、学生处分增加移动端分页

2、批量添加增加逻辑验证
3、info接口增加处分类型和学期

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

@@ -13,6 +13,7 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseSemester;
+import com.xjrsoft.module.base.mapper.BaseSemesterMapper;
 import com.xjrsoft.module.student.dto.AddBaseStudentPunishmentInfoDto;
 import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentPunishmentInfoDto;
@@ -22,8 +23,8 @@ import com.xjrsoft.module.student.entity.BaseStudentCadre;
 import com.xjrsoft.module.student.entity.BaseStudentPunishmentInfo;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.mapper.BasePunishmentStudentRelationMapper;
+import com.xjrsoft.module.student.mapper.BasePunishmentTypeMapper;
 import com.xjrsoft.module.student.service.IBaseStudentPunishmentInfoService;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobliePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoPageVo;
 import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoVo;
@@ -58,6 +59,8 @@ public class BaseStudentPunishmentInfoController {
 
     private final IBaseStudentPunishmentInfoService baseStudentPunishmentInfoService;
     private final BasePunishmentStudentRelationMapper basePunishmentStudentRelationMapper;
+    private final BasePunishmentTypeMapper basePunishmentTypeMapper;
+    private final BaseSemesterMapper baseSemesterMapper;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="学生处分信息管理列表(分页)")
@@ -157,7 +160,18 @@ public class BaseStudentPunishmentInfoController {
 
         baseStudentPunishmentInfo.setBasePunishmentStudentRelationList(studentRelationList);
 
-        return RT.ok(BeanUtil.toBean(baseStudentPunishmentInfo, BaseStudentPunishmentInfoVo.class));
+        BaseStudentPunishmentInfoVo punishmentInfoVo = BeanUtil.toBean(baseStudentPunishmentInfo, BaseStudentPunishmentInfoVo.class);
+        BasePunishmentType punishmentType = basePunishmentTypeMapper.selectById(baseStudentPunishmentInfo.getPunishmentTypeId());
+        if(punishmentType != null){
+            punishmentInfoVo.setPunishmentType(punishmentType.getPunishmentType());
+        }
+
+        BaseSemester baseSemester = baseSemesterMapper.selectById(baseStudentPunishmentInfo.getBaseSemesterId());
+        if(baseSemester != null){
+            punishmentInfoVo.setSemesterName(baseSemester.getName());
+        }
+
+        return RT.ok(punishmentInfoVo);
     }