处分信息列表和详情页

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

@@ -1,110 +1,110 @@
-package com.xjrsoft.module.student.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.xjrsoft.common.page.ConventPage;
-import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentCategoryDto;
-import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
-import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentCategoryDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
-import com.xjrsoft.module.student.dto.BaseStudentAssessmentCategoryListDto;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
-import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
-
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @title: 学生考核类别
- * @Author fanxp
- * @Date: 2023-11-14
- * @Version 1.0
- */
-@RestController
-@RequestMapping("/student" + "/basestudentassessmentcategory")
-@Api(value = "/student" + "/basestudentassessmentcategory", tags = "学生考核类别代码")
-@AllArgsConstructor
-public class BaseStudentAssessmentCategoryController {
-
-
-    private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
-
-    @GetMapping(value = "/list")
-    @ApiOperation(value = "学生考核类别列表(不分页)")
-    @SaCheckPermission("basestudentassessmentcategory:detail")
-    public RT<List<BaseStudentAssessmentCategoryListVo>> list(@Valid BaseStudentAssessmentCategoryListDto dto) {
-
-        LambdaQueryWrapper<BaseStudentAssessmentCategory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .orderByDesc(BaseStudentAssessmentCategory::getId)
-                .select(BaseStudentAssessmentCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentCategoryListVo.class).contains(x.getProperty()));
-
-        List<BaseStudentAssessmentCategory> list = baseStudentAssessmentCategoryService.list(queryWrapper);
-        list.forEach((node) -> {
-            if (node.getTotalScore() > 0) {
-                node.setName(String.format("%s(总分：%s)", node.getName(), node.getTotalScore().toString()));
-            }
-        });
-        List<BaseStudentAssessmentCategoryListVo> listVos = BeanUtil.copyToList(list, BaseStudentAssessmentCategoryListVo.class);
-        return RT.ok(listVos);
-    }
-
-    @GetMapping(value = "/info")
-    @ApiOperation(value = "根据id查询学生考核类别信息")
-    @SaCheckPermission("basestudentassessmentcategory:detail")
-    public RT<BaseStudentAssessmentCategoryVo> info(@RequestParam Long id) {
-        BaseStudentAssessmentCategory baseStudentAssessmentCategory = baseStudentAssessmentCategoryService.getById(id);
-        if (baseStudentAssessmentCategory == null) {
-            return RT.error("找不到此数据！");
-        }
-        return RT.ok(BeanUtil.toBean(baseStudentAssessmentCategory, BaseStudentAssessmentCategoryVo.class));
-    }
-
-
-    @PostMapping
-    @ApiOperation(value = "新增学生考核类别")
-    @SaCheckPermission("basestudentassessmentcategory:add")
-    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto) {
-        BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
-        boolean isSuccess = baseStudentAssessmentCategoryService.save(baseStudentAssessmentCategory);
-        return RT.ok(isSuccess);
-    }
-
-    @PutMapping
-    @ApiOperation(value = "修改学生考核类别")
-    @SaCheckPermission("basestudentassessmentcategory:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentCategoryDto dto) {
-
-        BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
-        return RT.ok(baseStudentAssessmentCategoryService.updateById(baseStudentAssessmentCategory));
-
-    }
-
-    @DeleteMapping
-    @ApiOperation(value = "删除学生考核类别")
-    @SaCheckPermission("basestudentassessmentcategory:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
-        return RT.ok(baseStudentAssessmentCategoryService.removeBatchByIds(ids));
-
-    }
-
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentCategoryDto;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentCategoryDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentCategoryListDto;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @title: 学生考核类别
+ * @Author fanxp
+ * @Date: 2023-11-14
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/student" + "/basestudentassessmentcategory")
+@Api(value = "/student" + "/basestudentassessmentcategory", tags = "学生考核类别代码")
+@AllArgsConstructor
+public class BaseStudentAssessmentCategoryController {
+
+
+    private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "学生考核类别列表(不分页)")
+    @SaCheckPermission("basestudentassessmentcategory:detail")
+    public RT<List<BaseStudentAssessmentCategoryListVo>> list(@Valid BaseStudentAssessmentCategoryListDto dto) {
+
+        LambdaQueryWrapper<BaseStudentAssessmentCategory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(BaseStudentAssessmentCategory::getId)
+                .select(BaseStudentAssessmentCategory.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentCategoryListVo.class).contains(x.getProperty()));
+
+        List<BaseStudentAssessmentCategory> list = baseStudentAssessmentCategoryService.list(queryWrapper);
+        list.forEach((node) -> {
+            if (node.getTotalScore() > 0) {
+                node.setName(String.format("%s(总分：%s)", node.getName(), node.getTotalScore().toString()));
+            }
+        });
+        List<BaseStudentAssessmentCategoryListVo> listVos = BeanUtil.copyToList(list, BaseStudentAssessmentCategoryListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value = "根据id查询学生考核类别信息")
+    @SaCheckPermission("basestudentassessmentcategory:detail")
+    public RT<BaseStudentAssessmentCategoryVo> info(@RequestParam Long id) {
+        BaseStudentAssessmentCategory baseStudentAssessmentCategory = baseStudentAssessmentCategoryService.getById(id);
+        if (baseStudentAssessmentCategory == null) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentAssessmentCategory, BaseStudentAssessmentCategoryVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生考核类别")
+    @SaCheckPermission("basestudentassessmentcategory:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentCategoryDto dto) {
+        BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
+        boolean isSuccess = baseStudentAssessmentCategoryService.save(baseStudentAssessmentCategory);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生考核类别")
+    @SaCheckPermission("basestudentassessmentcategory:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentCategoryDto dto) {
+
+        BaseStudentAssessmentCategory baseStudentAssessmentCategory = BeanUtil.toBean(dto, BaseStudentAssessmentCategory.class);
+        return RT.ok(baseStudentAssessmentCategoryService.updateById(baseStudentAssessmentCategory));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生考核类别")
+    @SaCheckPermission("basestudentassessmentcategory:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
+        return RT.ok(baseStudentAssessmentCategoryService.removeBatchByIds(ids));
+
+    }
+
 }

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

@@ -1,162 +1,162 @@
-package com.xjrsoft.module.student.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.yulichang.interfaces.MPJBaseJoin;
-import com.github.yulichang.toolkit.MPJWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.xjrsoft.common.page.ConventPage;
-import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.TreeUtil;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.organization.vo.PostTreeVo;
-import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentProjectDto;
-import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
-import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentProjectDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
-import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectListDto;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
-import com.xjrsoft.module.student.entity.BaseStudentCadre;
-import com.xjrsoft.module.student.entity.BaseStudentUser;
-import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
-import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
-import com.xjrsoft.module.student.vo.*;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @title: 学生考核项目
- * @Author fanxp
- * @Date: 2023-11-14
- * @Version 1.0
- */
-@RestController
-@RequestMapping("/student" + "/basestudentassessmentproject")
-@Api(value = "/student" + "/basestudentassessmentproject", tags = "学生考核项目代码")
-@AllArgsConstructor
-public class BaseStudentAssessmentProjectController {
-
-
-    private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
-
-    private final IBaseStudentAssessmentProjectService baseStudentAssessmentProjectService;
-
-
-    @GetMapping(value = "/tree")
-    @ApiOperation(value = "学生考核项目列表(树)")
-    @SaCheckPermission("basestudentassessmentproject:detail")
-    public RT<List<BaseStudentAssessmentProjectTreeVo>> tree() {
-
-        List<BaseStudentAssessmentProjectTreeVo> voList = new ArrayList<>();
-        baseStudentAssessmentCategoryService.list().forEach((node) -> {
-            voList.add(new BaseStudentAssessmentProjectTreeVo(){{
-                setId(node.getId());
-                setName(node.getName());
-            }});
-        });
-
-        baseStudentAssessmentProjectService.list().forEach((node)->{
-            voList.add(new BaseStudentAssessmentProjectTreeVo(){{
-                setId(node.getId());
-                setName(node.getName());
-                setParentId(node.getBaseStudentAssessmentCategoryId());
-            }});
-        });
-        List<BaseStudentAssessmentProjectTreeVo> treeVoList = TreeUtil.build(voList);
-
-        return RT.ok(treeVoList);
-    }
-
-    @GetMapping(value = "/page")
-    @ApiOperation(value = "学生考核项目列表(分页)")
-    @SaCheckPermission("basestudentassessmentproject:detail")
-    public RT<PageOutput<BaseStudentAssessmentProjectPageVo>> page(@Valid BaseStudentAssessmentProjectPageDto dto) {
-
-        MPJBaseJoin<BaseStudentAssessmentProject> queryWrapper = MPJWrappers.<BaseStudentAssessmentProject>lambdaJoin()
-                .disableSubLogicDel()
-                .orderByDesc(BaseStudentAssessmentProject::getId)
-                .eq(ObjectUtil.isNotEmpty(dto.getBaseStudentAssessmentCategoryId()), BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId())
-                .select(BaseStudentAssessmentProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectPageVo.class).contains(x.getProperty()))
-                .leftJoin(BaseStudentAssessmentCategory.class, BaseStudentAssessmentCategory::getId, BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId)
-                .select(BaseStudentAssessmentProject::getId)
-                .selectAs(BaseStudentAssessmentCategory::getName,BaseStudentAssessmentProjectPageVo::getBaseStudentAssessmentCategoryName);
-
-        IPage<BaseStudentAssessmentProjectPageVo> page = baseStudentAssessmentProjectService.selectJoinListPage(ConventPage.getPage(dto),BaseStudentAssessmentProjectPageVo.class,queryWrapper);
-        PageOutput<BaseStudentAssessmentProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentAssessmentProjectPageVo.class);
-        return RT.ok(pageOutput);
-    }
-
-
-    @GetMapping(value = "/list")
-    @ApiOperation(value = "学生考核项目列表(不分页)")
-    @SaCheckPermission("basestudentassessmentproject:detail")
-    public RT<List<BaseStudentAssessmentProjectListVo>> list(@Valid BaseStudentAssessmentProjectListDto dto) {
-
-        LambdaQueryWrapper<BaseStudentAssessmentProject> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .orderByDesc(BaseStudentAssessmentProject::getId)
-                .eq(ObjectUtil.isNotEmpty(dto.getBaseStudentAssessmentCategoryId()), BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId())
-                .select(BaseStudentAssessmentProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectListVo.class).contains(x.getProperty()));
-
-        List<BaseStudentAssessmentProject> list = baseStudentAssessmentProjectService.list(queryWrapper);
-        List<BaseStudentAssessmentProjectListVo> listVos = BeanUtil.copyToList(list, BaseStudentAssessmentProjectListVo.class);
-        return RT.ok(listVos);
-    }
-
-    @GetMapping(value = "/info")
-    @ApiOperation(value = "根据id查询学生考核项目信息")
-    @SaCheckPermission("basestudentassessmentproject:detail")
-    public RT<BaseStudentAssessmentProjectVo> info(@RequestParam Long id) {
-        BaseStudentAssessmentProject baseStudentAssessmentProject = baseStudentAssessmentProjectService.getById(id);
-        if (baseStudentAssessmentProject == null) {
-            return RT.error("找不到此数据！");
-        }
-        return RT.ok(BeanUtil.toBean(baseStudentAssessmentProject, BaseStudentAssessmentProjectVo.class));
-    }
-
-
-    @PostMapping
-    @ApiOperation(value = "新增学生考核项目")
-    @SaCheckPermission("basestudentassessmentproject:add")
-    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentProjectDto dto) {
-        BaseStudentAssessmentProject baseStudentAssessmentProject = BeanUtil.toBean(dto, BaseStudentAssessmentProject.class);
-        boolean isSuccess = baseStudentAssessmentProjectService.save(baseStudentAssessmentProject);
-        return RT.ok(isSuccess);
-    }
-
-    @PutMapping
-    @ApiOperation(value = "修改学生考核项目")
-    @SaCheckPermission("basestudentassessmentproject:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentProjectDto dto) {
-
-        BaseStudentAssessmentProject baseStudentAssessmentProject = BeanUtil.toBean(dto, BaseStudentAssessmentProject.class);
-        return RT.ok(baseStudentAssessmentProjectService.updateById(baseStudentAssessmentProject));
-
-    }
-
-    @DeleteMapping
-    @ApiOperation(value = "删除学生考核项目")
-    @SaCheckPermission("basestudentassessmentproject:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
-        return RT.ok(baseStudentAssessmentProjectService.removeBatchByIds(ids));
-
-    }
-
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.interfaces.MPJBaseJoin;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.vo.PostTreeVo;
+import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentProjectDto;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectPageDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentProjectDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentProjectListDto;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
+import com.xjrsoft.module.student.entity.BaseStudentCadre;
+import com.xjrsoft.module.student.entity.BaseStudentUser;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
+import com.xjrsoft.module.student.vo.*;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @title: 学生考核项目
+ * @Author fanxp
+ * @Date: 2023-11-14
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/student" + "/basestudentassessmentproject")
+@Api(value = "/student" + "/basestudentassessmentproject", tags = "学生考核项目代码")
+@AllArgsConstructor
+public class BaseStudentAssessmentProjectController {
+
+
+    private final IBaseStudentAssessmentCategoryService baseStudentAssessmentCategoryService;
+
+    private final IBaseStudentAssessmentProjectService baseStudentAssessmentProjectService;
+
+
+    @GetMapping(value = "/tree")
+    @ApiOperation(value = "学生考核项目列表(树)")
+    @SaCheckPermission("basestudentassessmentproject:detail")
+    public RT<List<BaseStudentAssessmentProjectTreeVo>> tree() {
+
+        List<BaseStudentAssessmentProjectTreeVo> voList = new ArrayList<>();
+        baseStudentAssessmentCategoryService.list().forEach((node) -> {
+            voList.add(new BaseStudentAssessmentProjectTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+            }});
+        });
+
+        baseStudentAssessmentProjectService.list().forEach((node)->{
+            voList.add(new BaseStudentAssessmentProjectTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+                setParentId(node.getBaseStudentAssessmentCategoryId());
+            }});
+        });
+        List<BaseStudentAssessmentProjectTreeVo> treeVoList = TreeUtil.build(voList);
+
+        return RT.ok(treeVoList);
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value = "学生考核项目列表(分页)")
+    @SaCheckPermission("basestudentassessmentproject:detail")
+    public RT<PageOutput<BaseStudentAssessmentProjectPageVo>> page(@Valid BaseStudentAssessmentProjectPageDto dto) {
+
+        MPJBaseJoin<BaseStudentAssessmentProject> queryWrapper = MPJWrappers.<BaseStudentAssessmentProject>lambdaJoin()
+                .disableSubLogicDel()
+                .orderByDesc(BaseStudentAssessmentProject::getId)
+                .eq(ObjectUtil.isNotEmpty(dto.getBaseStudentAssessmentCategoryId()), BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId())
+                .select(BaseStudentAssessmentProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectPageVo.class).contains(x.getProperty()))
+                .leftJoin(BaseStudentAssessmentCategory.class, BaseStudentAssessmentCategory::getId, BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId)
+                .select(BaseStudentAssessmentProject::getId)
+                .selectAs(BaseStudentAssessmentCategory::getName,BaseStudentAssessmentProjectPageVo::getBaseStudentAssessmentCategoryName);
+
+        IPage<BaseStudentAssessmentProjectPageVo> page = baseStudentAssessmentProjectService.selectJoinListPage(ConventPage.getPage(dto),BaseStudentAssessmentProjectPageVo.class,queryWrapper);
+        PageOutput<BaseStudentAssessmentProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentAssessmentProjectPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "学生考核项目列表(不分页)")
+    @SaCheckPermission("basestudentassessmentproject:detail")
+    public RT<List<BaseStudentAssessmentProjectListVo>> list(@Valid BaseStudentAssessmentProjectListDto dto) {
+
+        LambdaQueryWrapper<BaseStudentAssessmentProject> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(BaseStudentAssessmentProject::getId)
+                .eq(ObjectUtil.isNotEmpty(dto.getBaseStudentAssessmentCategoryId()), BaseStudentAssessmentProject::getBaseStudentAssessmentCategoryId, dto.getBaseStudentAssessmentCategoryId())
+                .select(BaseStudentAssessmentProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentProjectListVo.class).contains(x.getProperty()));
+
+        List<BaseStudentAssessmentProject> list = baseStudentAssessmentProjectService.list(queryWrapper);
+        List<BaseStudentAssessmentProjectListVo> listVos = BeanUtil.copyToList(list, BaseStudentAssessmentProjectListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value = "根据id查询学生考核项目信息")
+    @SaCheckPermission("basestudentassessmentproject:detail")
+    public RT<BaseStudentAssessmentProjectVo> info(@RequestParam Long id) {
+        BaseStudentAssessmentProject baseStudentAssessmentProject = baseStudentAssessmentProjectService.getById(id);
+        if (baseStudentAssessmentProject == null) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentAssessmentProject, BaseStudentAssessmentProjectVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生考核项目")
+    @SaCheckPermission("basestudentassessmentproject:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentAssessmentProjectDto dto) {
+        BaseStudentAssessmentProject baseStudentAssessmentProject = BeanUtil.toBean(dto, BaseStudentAssessmentProject.class);
+        boolean isSuccess = baseStudentAssessmentProjectService.save(baseStudentAssessmentProject);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生考核项目")
+    @SaCheckPermission("basestudentassessmentproject:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentAssessmentProjectDto dto) {
+
+        BaseStudentAssessmentProject baseStudentAssessmentProject = BeanUtil.toBean(dto, BaseStudentAssessmentProject.class);
+        return RT.ok(baseStudentAssessmentProjectService.updateById(baseStudentAssessmentProject));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生考核项目")
+    @SaCheckPermission("basestudentassessmentproject:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
+        return RT.ok(baseStudentAssessmentProjectService.removeBatchByIds(ids));
+
+    }
+
 }

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

@@ -1,119 +1,119 @@
-package com.xjrsoft.module.student.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.xjrsoft.common.page.ConventPage;
-import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.student.dto.AddBaseStudentBehaviorCategoryDto;
-import com.xjrsoft.module.student.dto.BaseStudentBehaviorCategoryListDto;
-import com.xjrsoft.module.student.dto.UpdateBaseStudentBehaviorCategoryDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
-import com.xjrsoft.module.student.dto.BaseStudentBehaviorCategoryPageDto;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
-import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
-import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryListVo;
-import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryPageVo;
-
-import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
-* @title: 学生操行分考核类别
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@RestController
-@RequestMapping("/student" + "/basestudentbehaviorcategory")
-@Api(value = "/student"  + "/basestudentbehaviorcategory",tags = "学生操行分考核类别代码")
-@AllArgsConstructor
-public class BaseStudentBehaviorCategoryController {
-
-
-    private final IBaseStudentBehaviorCategoryService baseStudentBehaviorCategoryService;
-
-    @GetMapping(value = "/list")
-    @ApiOperation(value="学生操行分考核类别列表(不分页)")
-    @SaCheckPermission("basestudentbehaviorcategory:detail")
-    public RT<List<BaseStudentBehaviorCategoryListVo>> list(@Valid BaseStudentBehaviorCategoryListDto dto){
-
-        LambdaQueryWrapper<BaseStudentBehaviorCategory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .orderByDesc(BaseStudentBehaviorCategory::getId)
-                .select(BaseStudentBehaviorCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorCategoryListVo.class).contains(x.getProperty()));
-
-        List<BaseStudentBehaviorCategory> list = baseStudentBehaviorCategoryService.list(queryWrapper);
-        List<BaseStudentBehaviorCategoryListVo> listVos = BeanUtil.copyToList(list, BaseStudentBehaviorCategoryListVo.class);
-        return RT.ok(listVos);
-    }
-
-    @GetMapping(value = "/page")
-    @ApiOperation(value="学生操行分考核类别列表(分页)")
-    @SaCheckPermission("basestudentbehaviorcategory:detail")
-    public RT<PageOutput<BaseStudentBehaviorCategoryPageVo>> page(@Valid BaseStudentBehaviorCategoryPageDto dto){
-
-        LambdaQueryWrapper<BaseStudentBehaviorCategory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(BaseStudentBehaviorCategory::getId)
-                .select(BaseStudentBehaviorCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorCategoryPageVo.class).contains(x.getProperty()));
-        IPage<BaseStudentBehaviorCategory> page = baseStudentBehaviorCategoryService.page(ConventPage.getPage(dto), queryWrapper);
-        PageOutput<BaseStudentBehaviorCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorCategoryPageVo.class);
-        return RT.ok(pageOutput);
-    }
-
-    @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询学生操行分考核类别信息")
-    @SaCheckPermission("basestudentbehaviorcategory:detail")
-    public RT<BaseStudentBehaviorCategoryVo> info(@RequestParam Long id){
-        BaseStudentBehaviorCategory baseStudentBehaviorCategory = baseStudentBehaviorCategoryService.getById(id);
-        if (baseStudentBehaviorCategory == null) {
-           return RT.error("找不到此数据！");
-        }
-        return RT.ok(BeanUtil.toBean(baseStudentBehaviorCategory, BaseStudentBehaviorCategoryVo.class));
-    }
-
-
-    @PostMapping
-    @ApiOperation(value = "新增学生操行分考核类别")
-    @SaCheckPermission("basestudentbehaviorcategory:add")
-    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorCategoryDto dto){
-        BaseStudentBehaviorCategory baseStudentBehaviorCategory = BeanUtil.toBean(dto, BaseStudentBehaviorCategory.class);
-        boolean isSuccess = baseStudentBehaviorCategoryService.save(baseStudentBehaviorCategory);
-    return RT.ok(isSuccess);
-    }
-
-    @PutMapping
-    @ApiOperation(value = "修改学生操行分考核类别")
-    @SaCheckPermission("basestudentbehaviorcategory:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorCategoryDto dto){
-
-        BaseStudentBehaviorCategory baseStudentBehaviorCategory = BeanUtil.toBean(dto, BaseStudentBehaviorCategory.class);
-        return RT.ok(baseStudentBehaviorCategoryService.updateById(baseStudentBehaviorCategory));
-
-    }
-
-    @DeleteMapping
-    @ApiOperation(value = "删除学生操行分考核类别")
-    @SaCheckPermission("basestudentbehaviorcategory:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-        return RT.ok(baseStudentBehaviorCategoryService.removeBatchByIds(ids));
-
-    }
-
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.student.dto.AddBaseStudentBehaviorCategoryDto;
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorCategoryListDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentBehaviorCategoryDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorCategoryPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryListVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryPageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorCategoryVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 学生操行分考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/basestudentbehaviorcategory")
+@Api(value = "/student"  + "/basestudentbehaviorcategory",tags = "学生操行分考核类别代码")
+@AllArgsConstructor
+public class BaseStudentBehaviorCategoryController {
+
+
+    private final IBaseStudentBehaviorCategoryService baseStudentBehaviorCategoryService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="学生操行分考核类别列表(不分页)")
+    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    public RT<List<BaseStudentBehaviorCategoryListVo>> list(@Valid BaseStudentBehaviorCategoryListDto dto){
+
+        LambdaQueryWrapper<BaseStudentBehaviorCategory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(BaseStudentBehaviorCategory::getId)
+                .select(BaseStudentBehaviorCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorCategoryListVo.class).contains(x.getProperty()));
+
+        List<BaseStudentBehaviorCategory> list = baseStudentBehaviorCategoryService.list(queryWrapper);
+        List<BaseStudentBehaviorCategoryListVo> listVos = BeanUtil.copyToList(list, BaseStudentBehaviorCategoryListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="学生操行分考核类别列表(分页)")
+    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    public RT<PageOutput<BaseStudentBehaviorCategoryPageVo>> page(@Valid BaseStudentBehaviorCategoryPageDto dto){
+
+        LambdaQueryWrapper<BaseStudentBehaviorCategory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseStudentBehaviorCategory::getId)
+                .select(BaseStudentBehaviorCategory.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorCategoryPageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentBehaviorCategory> page = baseStudentBehaviorCategoryService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentBehaviorCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorCategoryPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学生操行分考核类别信息")
+    @SaCheckPermission("basestudentbehaviorcategory:detail")
+    public RT<BaseStudentBehaviorCategoryVo> info(@RequestParam Long id){
+        BaseStudentBehaviorCategory baseStudentBehaviorCategory = baseStudentBehaviorCategoryService.getById(id);
+        if (baseStudentBehaviorCategory == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentBehaviorCategory, BaseStudentBehaviorCategoryVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生操行分考核类别")
+    @SaCheckPermission("basestudentbehaviorcategory:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorCategoryDto dto){
+        BaseStudentBehaviorCategory baseStudentBehaviorCategory = BeanUtil.toBean(dto, BaseStudentBehaviorCategory.class);
+        boolean isSuccess = baseStudentBehaviorCategoryService.save(baseStudentBehaviorCategory);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生操行分考核类别")
+    @SaCheckPermission("basestudentbehaviorcategory:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorCategoryDto dto){
+
+        BaseStudentBehaviorCategory baseStudentBehaviorCategory = BeanUtil.toBean(dto, BaseStudentBehaviorCategory.class);
+        return RT.ok(baseStudentBehaviorCategoryService.updateById(baseStudentBehaviorCategory));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生操行分考核类别")
+    @SaCheckPermission("basestudentbehaviorcategory:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseStudentBehaviorCategoryService.removeBatchByIds(ids));
+
+    }
+
 }

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

@@ -1,134 +1,134 @@
-package com.xjrsoft.module.student.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.xjrsoft.common.page.ConventPage;
-import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.TreeUtil;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.organization.vo.PostTreeVo;
-import com.xjrsoft.module.student.dto.AddBaseStudentBehaviorProjectDto;
-import com.xjrsoft.module.student.dto.UpdateBaseStudentBehaviorProjectDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
-import com.xjrsoft.module.student.dto.BaseStudentBehaviorProjectPageDto;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
-import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
-import com.xjrsoft.module.student.service.IBaseStudentBehaviorProjectService;
-import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectPageVo;
-
-import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectTreeVo;
-import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @title: 学生操行分考核项目
- * @Author fanxp
- * @Date: 2023-11-15
- * @Version 1.0
- */
-@RestController
-@RequestMapping("/student" + "/basestudentbehaviorproject")
-@Api(value = "/student" + "/basestudentbehaviorproject", tags = "学生操行分考核项目代码")
-@AllArgsConstructor
-public class BaseStudentBehaviorProjectController {
-
-    private final IBaseStudentBehaviorCategoryService baseStudentBehaviorCategoryService;
-
-    private final IBaseStudentBehaviorProjectService baseStudentBehaviorProjectService;
-
-    @GetMapping(value = "/tree")
-    @ApiOperation(value = "学生操行分考核项目列表(树)")
-    @SaCheckPermission("basestudentbehaviorproject:detail")
-    public RT<List<BaseStudentBehaviorProjectTreeVo>> tree() {
-
-        List<BaseStudentBehaviorProjectTreeVo> voList = new ArrayList<>();
-        baseStudentBehaviorCategoryService.list().forEach((node) -> {
-            voList.add(new BaseStudentBehaviorProjectTreeVo(){{
-                setId(node.getId());
-                setName(node.getName());
-            }});
-        });
-
-        baseStudentBehaviorProjectService.list().forEach((node)->{
-            voList.add(new BaseStudentBehaviorProjectTreeVo(){{
-                setId(node.getId());
-                setName(node.getName());
-                setParentId(node.getBaseStudentBehaviorCategoryId());
-            }});
-        });
-        List<BaseStudentBehaviorProjectTreeVo> treeVoList = TreeUtil.build(voList);
-
-        return RT.ok(treeVoList);
-    }
-
-    @GetMapping(value = "/page")
-    @ApiOperation(value = "学生操行分考核项目列表(分页)")
-    @SaCheckPermission("basestudentbehaviorproject:detail")
-    public RT<PageOutput<BaseStudentBehaviorProjectPageVo>> page(@Valid BaseStudentBehaviorProjectPageDto dto) {
-
-        LambdaQueryWrapper<BaseStudentBehaviorProject> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .orderByDesc(BaseStudentBehaviorProject::getId)
-                .eq(ObjectUtil.isNotNull(dto.getBaseStudentBehaviorCategoryId()), BaseStudentBehaviorProject::getBaseStudentBehaviorCategoryId, dto.getBaseStudentBehaviorCategoryId())
-                .select(BaseStudentBehaviorProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()));
-        IPage<BaseStudentBehaviorProject> page = baseStudentBehaviorProjectService.page(ConventPage.getPage(dto), queryWrapper);
-        PageOutput<BaseStudentBehaviorProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorProjectPageVo.class);
-        return RT.ok(pageOutput);
-    }
-
-    @GetMapping(value = "/info")
-    @ApiOperation(value = "根据id查询学生操行分考核项目信息")
-    @SaCheckPermission("basestudentbehaviorproject:detail")
-    public RT<BaseStudentBehaviorProjectVo> info(@RequestParam Long id) {
-        BaseStudentBehaviorProject baseStudentBehaviorProject = baseStudentBehaviorProjectService.getById(id);
-        if (baseStudentBehaviorProject == null) {
-            return RT.error("找不到此数据！");
-        }
-        return RT.ok(BeanUtil.toBean(baseStudentBehaviorProject, BaseStudentBehaviorProjectVo.class));
-    }
-
-
-    @PostMapping
-    @ApiOperation(value = "新增学生操行分考核项目")
-    @SaCheckPermission("basestudentbehaviorproject:add")
-    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorProjectDto dto) {
-        BaseStudentBehaviorProject baseStudentBehaviorProject = BeanUtil.toBean(dto, BaseStudentBehaviorProject.class);
-        boolean isSuccess = baseStudentBehaviorProjectService.save(baseStudentBehaviorProject);
-        return RT.ok(isSuccess);
-    }
-
-    @PutMapping
-    @ApiOperation(value = "修改学生操行分考核项目")
-    @SaCheckPermission("basestudentbehaviorproject:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorProjectDto dto) {
-
-        BaseStudentBehaviorProject baseStudentBehaviorProject = BeanUtil.toBean(dto, BaseStudentBehaviorProject.class);
-        return RT.ok(baseStudentBehaviorProjectService.updateById(baseStudentBehaviorProject));
-
-    }
-
-    @DeleteMapping
-    @ApiOperation(value = "删除学生操行分考核项目")
-    @SaCheckPermission("basestudentbehaviorproject:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
-        return RT.ok(baseStudentBehaviorProjectService.removeBatchByIds(ids));
-
-    }
-
+package com.xjrsoft.module.student.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.organization.vo.PostTreeVo;
+import com.xjrsoft.module.student.dto.AddBaseStudentBehaviorProjectDto;
+import com.xjrsoft.module.student.dto.UpdateBaseStudentBehaviorProjectDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorProjectPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorProjectService;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectPageVo;
+
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectTreeVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorProjectVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @title: 学生操行分考核项目
+ * @Author fanxp
+ * @Date: 2023-11-15
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/student" + "/basestudentbehaviorproject")
+@Api(value = "/student" + "/basestudentbehaviorproject", tags = "学生操行分考核项目代码")
+@AllArgsConstructor
+public class BaseStudentBehaviorProjectController {
+
+    private final IBaseStudentBehaviorCategoryService baseStudentBehaviorCategoryService;
+
+    private final IBaseStudentBehaviorProjectService baseStudentBehaviorProjectService;
+
+    @GetMapping(value = "/tree")
+    @ApiOperation(value = "学生操行分考核项目列表(树)")
+    @SaCheckPermission("basestudentbehaviorproject:detail")
+    public RT<List<BaseStudentBehaviorProjectTreeVo>> tree() {
+
+        List<BaseStudentBehaviorProjectTreeVo> voList = new ArrayList<>();
+        baseStudentBehaviorCategoryService.list().forEach((node) -> {
+            voList.add(new BaseStudentBehaviorProjectTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+            }});
+        });
+
+        baseStudentBehaviorProjectService.list().forEach((node)->{
+            voList.add(new BaseStudentBehaviorProjectTreeVo(){{
+                setId(node.getId());
+                setName(node.getName());
+                setParentId(node.getBaseStudentBehaviorCategoryId());
+            }});
+        });
+        List<BaseStudentBehaviorProjectTreeVo> treeVoList = TreeUtil.build(voList);
+
+        return RT.ok(treeVoList);
+    }
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value = "学生操行分考核项目列表(分页)")
+    @SaCheckPermission("basestudentbehaviorproject:detail")
+    public RT<PageOutput<BaseStudentBehaviorProjectPageVo>> page(@Valid BaseStudentBehaviorProjectPageDto dto) {
+
+        LambdaQueryWrapper<BaseStudentBehaviorProject> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(BaseStudentBehaviorProject::getId)
+                .eq(ObjectUtil.isNotNull(dto.getBaseStudentBehaviorCategoryId()), BaseStudentBehaviorProject::getBaseStudentBehaviorCategoryId, dto.getBaseStudentBehaviorCategoryId())
+                .select(BaseStudentBehaviorProject.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorProjectPageVo.class).contains(x.getProperty()));
+        IPage<BaseStudentBehaviorProject> page = baseStudentBehaviorProjectService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseStudentBehaviorProjectPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentBehaviorProjectPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value = "根据id查询学生操行分考核项目信息")
+    @SaCheckPermission("basestudentbehaviorproject:detail")
+    public RT<BaseStudentBehaviorProjectVo> info(@RequestParam Long id) {
+        BaseStudentBehaviorProject baseStudentBehaviorProject = baseStudentBehaviorProjectService.getById(id);
+        if (baseStudentBehaviorProject == null) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseStudentBehaviorProject, BaseStudentBehaviorProjectVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学生操行分考核项目")
+    @SaCheckPermission("basestudentbehaviorproject:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseStudentBehaviorProjectDto dto) {
+        BaseStudentBehaviorProject baseStudentBehaviorProject = BeanUtil.toBean(dto, BaseStudentBehaviorProject.class);
+        boolean isSuccess = baseStudentBehaviorProjectService.save(baseStudentBehaviorProject);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学生操行分考核项目")
+    @SaCheckPermission("basestudentbehaviorproject:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentBehaviorProjectDto dto) {
+
+        BaseStudentBehaviorProject baseStudentBehaviorProject = BeanUtil.toBean(dto, BaseStudentBehaviorProject.class);
+        return RT.ok(baseStudentBehaviorProjectService.updateById(baseStudentBehaviorProject));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学生操行分考核项目")
+    @SaCheckPermission("basestudentbehaviorproject:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
+        return RT.ok(baseStudentBehaviorProjectService.removeBatchByIds(ids));
+
+    }
+
 }

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

@@ -2,44 +2,24 @@ package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 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;
-import com.xjrsoft.module.student.entity.BasePunishmentStudentRelation;
-import com.xjrsoft.module.student.entity.BasePunishmentType;
-import com.xjrsoft.module.student.entity.BaseStudentCadre;
+import com.xjrsoft.module.student.dto.*;
 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.BaseStudentPunishmentInfoMobliePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoDetailVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobileDetailVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobilePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoPageVo;
-import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoVo;
-import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -66,112 +46,41 @@ public class BaseStudentPunishmentInfoController {
     @ApiOperation(value="学生处分信息管理列表(分页)")
     @SaCheckPermission("basestudentpunishmentinfo:detail")
     public RT<PageOutput<BaseStudentPunishmentInfoPageVo>> page(@Valid BaseStudentPunishmentInfoPageDto dto){
-
-        IPage<BaseStudentPunishmentInfoPageVo> page = baseStudentPunishmentInfoService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentPunishmentInfoPageVo.class,
-                MPJWrappers.<BaseStudentPunishmentInfo>lambdaJoin()
-                .eq(StrUtil.isNotBlank(dto.getArchivesStatus()), BaseStudentSchoolRoll::getArchivesStatus, dto.getArchivesStatus())
-                .eq(StrUtil.isNotBlank(dto.getSemesterId()), BaseStudentPunishmentInfo::getBaseSemesterId, dto.getSemesterId())
-                .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudentPunishmentInfo::getClassId, dto.getClassId())
-                .eq(ObjectUtil.isNotNull(dto.getGradeId()), BaseStudentSchoolRoll::getGradeId, dto.getGradeId())
-                .eq(BaseStudentPunishmentInfo::getStatus, 1)
-                .in(ObjectUtil.isNotNull(dto.getOrgIds()), BaseClass::getOrgId, dto.getOrgIds())
-                .between(ObjectUtil.isNotNull(dto.getStartTimeStart()) && ObjectUtil.isNotNull(dto.getStartTimeEnd()), BaseStudentPunishmentInfo::getStartTime,dto.getStartTimeStart(),dto.getStartTimeEnd())
-                .between(ObjectUtil.isNotNull(dto.getEndTimeStart()) && ObjectUtil.isNotNull(dto.getEndTimeEnd()), BaseStudentPunishmentInfo::getEndTime,dto.getEndTimeStart(),dto.getEndTimeEnd())
-                .select(BaseStudentPunishmentInfo::getId)
-                .selectAs(BaseSemester::getName, BaseStudentPunishmentInfoPageVo::getSemesterName)
-                .select(BasePunishmentType::getPunishmentType)
-                .select(BaseStudentPunishmentInfo::getStartTime)
-                .select(BaseStudentPunishmentInfo::getEndTime)
-                .select(BaseStudentPunishmentInfo::getIsPublicity)
-                .select(BaseStudentPunishmentInfo::getReason)
-                .orderByDesc(BaseStudentPunishmentInfo::getId)
-                .innerJoin(BasePunishmentType.class, BasePunishmentType::getId, BaseStudentPunishmentInfo::getPunishmentTypeId)
-                .innerJoin(BaseSemester.class, BaseSemester::getId, BaseStudentPunishmentInfo::getBaseSemesterId)
-        );
-
-        PageOutput<BaseStudentPunishmentInfoPageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentPunishmentInfoPageVo.class);
+        IPage<BaseStudentPunishmentInfoPageVo> pageList = baseStudentPunishmentInfoService.selectJoinListPagePc(dto);
+        PageOutput<BaseStudentPunishmentInfoPageVo> pageOutput = ConventPage.getPageOutput(pageList, BaseStudentPunishmentInfoPageVo.class);
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/mobilePage")
+    @GetMapping(value = "/mobile-page")
     @ApiOperation(value="学生处分信息管理列表(移动端分页)")
     @SaCheckPermission("basestudentpunishmentinfo:detail")
-    public RT<PageOutput<BaseStudentPunishmentInfoMobliePageVo>> mobilePage(@Valid BaseStudentPunishmentInfoPageDto dto){
-
-        IPage<BaseStudentPunishmentInfoMobliePageVo> page = baseStudentPunishmentInfoService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentPunishmentInfoMobliePageVo.class,
-                MPJWrappers.<BaseStudentPunishmentInfo>lambdaJoin()
-                .like(StrUtil.isNotBlank(dto.getUserName()), BasePunishmentStudentRelation::getName, dto.getUserName())
-                .like(StrUtil.isNotBlank(dto.getStudentId()), BasePunishmentStudentRelation::getStudentId, dto.getStudentId())
-                .like(StrUtil.isNotBlank(dto.getCredentialNumber()), XjrUser::getCredentialNumber, dto.getCredentialNumber())
-                .eq(StrUtil.isNotBlank(dto.getArchivesStatus()), BaseStudentSchoolRoll::getArchivesStatus, dto.getArchivesStatus())
-                .eq(StrUtil.isNotBlank(dto.getSemesterId()), BaseStudentPunishmentInfo::getBaseSemesterId, dto.getSemesterId())
-                .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudentPunishmentInfo::getClassId, dto.getClassId())
-                .eq(ObjectUtil.isNotNull(dto.getGradeId()), BaseStudentSchoolRoll::getGradeId, dto.getGradeId())
-                .eq(ObjectUtil.isNotNull(dto.getAdjustType()), BasePunishmentStudentRelation::getAdjustType, dto.getAdjustType())
-                .eq(ObjectUtil.isNotNull(dto.getIsPublicity()), BaseStudentPunishmentInfo::getIsPublicity, dto.getIsPublicity())
-                .in(ObjectUtil.isNotNull(dto.getOrgIds()), BaseClass::getOrgId, dto.getOrgIds())
-                .between(ObjectUtil.isNotNull(dto.getStartTimeStart()) && ObjectUtil.isNotNull(dto.getStartTimeEnd()), BaseStudentPunishmentInfo::getStartTime,dto.getStartTimeStart(),dto.getStartTimeEnd())
-                .between(ObjectUtil.isNotNull(dto.getEndTimeStart()) && ObjectUtil.isNotNull(dto.getEndTimeEnd()), BaseStudentPunishmentInfo::getEndTime,dto.getEndTimeStart(),dto.getEndTimeEnd())
-                .between(ObjectUtil.isNotNull(dto.getAdjustDateStart()) && ObjectUtil.isNotNull(dto.getAdjustDateEnd()), BasePunishmentStudentRelation::getAdjustDate,dto.getAdjustDateStart(),dto.getAdjustDateEnd())
-                .between(ObjectUtil.isNotNull(dto.getModifyDateStart()) && ObjectUtil.isNotNull(dto.getModifyDateEnd()), BasePunishmentStudentRelation::getModifyDate,dto.getModifyDateStart(),dto.getModifyDateEnd())
-                .select(BasePunishmentStudentRelation::getId)
-                .select(BasePunishmentStudentRelation::getStudentId)
-                .select(BasePunishmentStudentRelation::getName)
-                .select(BasePunishmentStudentRelation::getGender)
-                .select(BasePunishmentStudentRelation::getClassName)
-                .select(BasePunishmentStudentRelation::getMajor)
-                .selectAs(BaseSemester::getName, BaseStudentPunishmentInfoPageVo::getSemesterName)
-                .select(BasePunishmentType::getPunishmentType)
-                .select(BaseStudentPunishmentInfo::getStartTime)
-                .select(BaseStudentPunishmentInfo::getEndTime)
-                .select(BaseStudentPunishmentInfo::getIsPublicity)
-                .select(BaseStudentPunishmentInfo::getReason)
-                .select(BasePunishmentStudentRelation::getAdjustType)
-                .select(BasePunishmentStudentRelation::getAdjustDate)
-                .select(BasePunishmentStudentRelation::getModifyDate)
-                .orderByDesc(BaseStudentCadre::getId)
-                .innerJoin(BasePunishmentStudentRelation.class, BasePunishmentStudentRelation::getPunishmentInfoId, BaseStudentPunishmentInfo::getId)
-                .innerJoin(BasePunishmentType.class, BasePunishmentType::getId, BaseStudentPunishmentInfo::getPunishmentTypeId)
-                .innerJoin(XjrUser.class, XjrUser::getId, BasePunishmentStudentRelation::getUserId)
-                .innerJoin(BaseSemester.class, BaseSemester::getId, BaseStudentPunishmentInfo::getBaseSemesterId)
-                .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BasePunishmentStudentRelation::getUserId)
-                .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentPunishmentInfo::getClassId)
-        );
-
-        PageOutput<BaseStudentPunishmentInfoMobliePageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentPunishmentInfoMobliePageVo.class);
+    public RT<PageOutput<BaseStudentPunishmentInfoMobilePageVo>> mobilePage(@Valid BaseStudentPunishmentInfoMobilePageDto dto){
+
+        IPage<BaseStudentPunishmentInfoMobilePageVo> paglIst = baseStudentPunishmentInfoService.selectJoinListPageMobile(dto);
+        PageOutput<BaseStudentPunishmentInfoMobilePageVo> pageOutput = ConventPage.getPageOutput(paglIst, BaseStudentPunishmentInfoMobilePageVo.class);
         return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询学生处分信息管理信息")
     @SaCheckPermission("basestudentpunishmentinfo:detail")
-    public RT<BaseStudentPunishmentInfoVo> info(@RequestParam Long id){
-        BaseStudentPunishmentInfo baseStudentPunishmentInfo = baseStudentPunishmentInfoService.getById(id);
-        if (baseStudentPunishmentInfo == null) {
-           return RT.error("找不到此数据！");
-        }
-
-        //查询班级
-        LambdaQueryWrapper<BasePunishmentStudentRelation> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .eq(BasePunishmentStudentRelation::getPunishmentInfoId, id)
-                .select(BasePunishmentStudentRelation.class, x -> VoToColumnUtil.fieldsToColumns(BasePunishmentStudentRelation.class).contains(x.getProperty()));
-        List<BasePunishmentStudentRelation> studentRelationList = basePunishmentStudentRelationMapper.selectList(queryWrapper);
-
-        baseStudentPunishmentInfo.setBasePunishmentStudentRelationList(studentRelationList);
-
-        BaseStudentPunishmentInfoVo punishmentInfoVo = BeanUtil.toBean(baseStudentPunishmentInfo, BaseStudentPunishmentInfoVo.class);
-        BasePunishmentType punishmentType = basePunishmentTypeMapper.selectById(baseStudentPunishmentInfo.getPunishmentTypeId());
-        if(punishmentType != null){
-            punishmentInfoVo.setPunishmentType(punishmentType.getPunishmentType());
+    public RT<BaseStudentPunishmentInfoDetailVo> info(@RequestParam Long id){
+        BaseStudentPunishmentInfoDetailVo baseStudentPunishmentInfoDetailVo = baseStudentPunishmentInfoService.getDetailById(id);
+        if (baseStudentPunishmentInfoDetailVo == null) {
+            return RT.error("找不到此数据！");
         }
+        return RT.ok(BeanUtil.toBean(baseStudentPunishmentInfoDetailVo,BaseStudentPunishmentInfoDetailVo.class));
+    }
 
-        BaseSemester baseSemester = baseSemesterMapper.selectById(baseStudentPunishmentInfo.getBaseSemesterId());
-        if(baseSemester != null){
-            punishmentInfoVo.setSemesterName(baseSemester.getName());
+    @GetMapping(value = "/mobile-info")
+    @ApiOperation(value="根据id查询学生处分信息管理信息(移动端)")
+    @SaCheckPermission("basestudentpunishmentinfo:detail")
+    public RT<BaseStudentPunishmentInfoMobileDetailVo> mobileInfo(@Valid BaseStudentPunishmentInfoMobileDetailDto dto){
+        BaseStudentPunishmentInfoMobileDetailVo baseStudentPunishmentInfoMobileDetailVo = baseStudentPunishmentInfoService.getDetailById(dto);
+        if (baseStudentPunishmentInfoMobileDetailVo == null) {
+            return RT.error("找不到此数据！");
         }
-
-        return RT.ok(punishmentInfoVo);
+        return RT.ok(BeanUtil.toBean(baseStudentPunishmentInfoMobileDetailVo,BaseStudentPunishmentInfoMobileDetailVo.class));
     }
 
 

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentCategoryDto.java

@@ -1,53 +1,53 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class AddBaseStudentAssessmentCategoryDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 总分
-    */
-    @ApiModelProperty("总分")
-    private Double totalScore;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentAssessmentCategoryDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentClassRelationDto.java

@@ -1,48 +1,48 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生班级巡查考核-关联班级
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-public class AddBaseStudentAssessmentClassRelationDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 班级编号id
-    */
-    @ApiModelProperty("班级编号id")
-    private Long classId;
-    /**
-    * 学生班级巡查考核id
-    */
-    @ApiModelProperty("学生班级巡查考核id")
-    private Long baseStudentAssessmentInspectionId;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 班主任姓名
-    */
-    @ApiModelProperty("班主任姓名")
-    private String teacherName;
-
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentAssessmentClassRelationDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+}

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentProjectDto.java

@@ -1,118 +1,118 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生考核项目
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class AddBaseStudentAssessmentProjectDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学生考核类别(base_student_assessment_category)
-    */
-    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
-    private Long baseStudentAssessmentCategoryId;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 基础分
-    */
-    @ApiModelProperty("基础分")
-    private Double basicPoints;
-    /**
-    * 扣分范围（最小）
-    */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-    * 扣分范围（最大）
-    */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-    * 加分范围（最小）
-    */
-    @ApiModelProperty("加分范围（最小）")
-    private Double addPointsMin;
-    /**
-    * 加分范围（最大）
-    */
-    @ApiModelProperty("加分范围（最大）")
-    private Double addPointsMax;
-    /**
-    * 所属机构(xjr_department)
-    */
-    @ApiModelProperty("所属机构(xjr_department)")
-    private Long departmentId;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 是否影响(1:是 0:否)
-    */
-    @ApiModelProperty("是否影响(1:是 0:否)")
-    private Integer isAffect;
-    /**
-    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
-    */
-    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
-    private String processingMethod;
-    /**
-    * 折算操行分要求
-    */
-    @ApiModelProperty("折算操行分要求")
-    private Double behaviorScore;
-    /**
-    * 操行项目编号
-    */
-    @ApiModelProperty("操行项目编号")
-    private Long baseStudentBehaviorProjectId;
-    /**
-    * 是否允许班主任修改项目(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
-    private Integer isTeacherEdit;
-    /**
-    * 手动处理学生操行分说明
-    */
-    @ApiModelProperty("手动处理学生操行分说明")
-    private String behaviorScoreRemark;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生考核项目
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentAssessmentProjectDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别(base_student_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围（最小）
+    */
+    @ApiModelProperty("加分范围（最小）")
+    private Double addPointsMin;
+    /**
+    * 加分范围（最大）
+    */
+    @ApiModelProperty("加分范围（最大）")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentBehaviorCategoryDto.java

@@ -1,53 +1,53 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class AddBaseStudentBehaviorCategoryDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBehaviorCategoryDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentBehaviorProjectDto.java

@@ -1,103 +1,103 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生操行分考核项目
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class AddBaseStudentBehaviorProjectDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学生考核类别编号(base_student_behavior_category)
-    */
-    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
-    private Long baseStudentBehaviorCategoryId;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 考核类型(xjr_dictionary_item[score_type])
-    */
-    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
-    private String scoreType;
-    /**
-    * 分值
-    */
-    @ApiModelProperty("分值")
-    private Double score;
-    /**
-    * 是否允许调整(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许调整(1:是 0:否)")
-    private Integer isAdjustment;
-    /**
-    * 扣分范围（最小）
-    */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-    * 扣分范围（最大）
-    */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-    * 是否影响班级考核(1:是 0:否)
-    */
-    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
-    private Integer isImpactAssessment;
-    /**
-    * 换算方式(1:手动换算 2:自动换算)
-    */
-    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
-    private Integer conversionMethod;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 班级考核项目编号（base_student_assessment_project）
-    */
-    @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
-    private Long baseStudentAssessmentProjectId;
-    /**
-    * 自动换算考核类型(xjr_dictionary_item[score_type])
-    */
-    @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")
-    private String automaticScoreType;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class AddBaseStudentBehaviorProjectDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别编号(base_student_behavior_category)
+    */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+    /**
+    * 分值
+    */
+    @ApiModelProperty("分值")
+    private Double score;
+    /**
+    * 是否允许调整(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许调整(1:是 0:否)")
+    private Integer isAdjustment;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 是否影响班级考核(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
+    private Integer isImpactAssessment;
+    /**
+    * 换算方式(1:手动换算 2:自动换算)
+    */
+    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
+    private Integer conversionMethod;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 班级考核项目编号（base_student_assessment_project）
+    */
+    @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
+    private Long baseStudentAssessmentProjectId;
+    /**
+    * 自动换算考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")
+    private String automaticScoreType;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentCategoryListDto.java

@@ -1,26 +1,26 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.ListInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
-* @title: 学生考核类别列表查询入参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class BaseStudentAssessmentCategoryListDto extends ListInput {
-
-
-}
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核类别列表查询入参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentAssessmentCategoryListDto extends ListInput {
+
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentClassRelationListDto.java

@@ -1,26 +1,26 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.ListInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
-* @title: 学生班级巡查考核-关联班级列表查询入参
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class BaseStudentAssessmentClassRelationListDto extends ListInput {
-
-
-}
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生班级巡查考核-关联班级列表查询入参
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentAssessmentClassRelationListDto extends ListInput {
+
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentProjectListDto.java

@@ -1,30 +1,30 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.ListInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
-* @title: 学生考核项目列表查询入参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class BaseStudentAssessmentProjectListDto extends ListInput {
-    /**
-     * 学生考核类别(base_student_assessment_category)
-     */
-    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
-    private String baseStudentAssessmentCategoryId;
-
-}
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核项目列表查询入参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentAssessmentProjectListDto extends ListInput {
+    /**
+     * 学生考核类别(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private String baseStudentAssessmentCategoryId;
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentProjectPageDto.java

@@ -1,30 +1,30 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.PageInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
-* @title: 学生考核项目分页查询入参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class BaseStudentAssessmentProjectPageDto extends PageInput {
-    /**
-     * 学生考核类别(base_student_assessment_category)
-     */
-    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
-    private String baseStudentAssessmentCategoryId;
-
-}
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核项目分页查询入参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentAssessmentProjectPageDto extends PageInput {
+    /**
+     * 学生考核类别(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private String baseStudentAssessmentCategoryId;
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentBehaviorCategoryListDto.java

@@ -1,26 +1,26 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.ListInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
-* @title: 学生考核类别列表查询入参
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class BaseStudentBehaviorCategoryListDto extends ListInput {
-
-
-}
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核类别列表查询入参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBehaviorCategoryListDto extends ListInput {
+
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentBehaviorCategoryPageDto.java

@@ -1,26 +1,26 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.PageInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
-* @title: 学生考核类别分页查询入参
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class BaseStudentBehaviorCategoryPageDto extends PageInput {
-
-
-}
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核类别分页查询入参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBehaviorCategoryPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentBehaviorProjectPageDto.java

@@ -1,30 +1,30 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.PageInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
-* @title: 学生操行分考核项目分页查询入参
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class BaseStudentBehaviorProjectPageDto extends PageInput {
-
-    /**
-     * 学生考核类别编号(base_student_behavior_category)
-     */
-    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
-    private String baseStudentBehaviorCategoryId;
-}
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生操行分考核项目分页查询入参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBehaviorProjectPageDto extends PageInput {
+
+    /**
+     * 学生考核类别编号(base_student_behavior_category)
+     */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private String baseStudentBehaviorCategoryId;
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentPostListDto.java

@@ -1,29 +1,29 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.ListInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
-* @title: 学生职务设置列表查询入参
-* @Author dzx
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class BaseStudentPostListDto extends ListInput {
-    /**
-     * 职务级别
-     */
-    @ApiModelProperty("职务级别")
-    private String level;
-}
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 学生职务设置列表查询入参
+* @Author dzx
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentPostListDto extends ListInput {
+    /**
+     * 职务级别
+     */
+    @ApiModelProperty("职务级别")
+    private String level;
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentPunishmentInfoMobileDetailDto.java

@@ -0,0 +1,23 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 学生处分信息管理详情入参（移动端）
+* @Author dzx
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentPunishmentInfoMobileDetailDto{
+    @ApiModelProperty("处分信息id")
+    private Long id;
+
+    @ApiModelProperty("学生id")
+    private Long userId;
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentPunishmentInfoMobilePageDto.java

@@ -0,0 +1,42 @@
+package com.xjrsoft.module.student.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 学生处分信息管理移动端列表查询入参
+* @Author dzx
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentPunishmentInfoMobilePageDto extends PageInput {
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("处分开始日期")
+    private String startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("处分结束日期")
+    private String endTime;
+
+    @ApiModelProperty("处分类型id")
+    private Integer punishmentTypeId;
+
+    @ApiModelProperty("是否公示")
+    private Integer isPublicity;
+
+    /**
+     * 学生姓名（模糊查询）
+     */
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
+}

src/main/java/com/xjrsoft/module/student/dto/BaseStudentPunishmentInfoPageDto.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.student.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,87 +20,18 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BaseStudentPunishmentInfoPageDto extends PageInput {
-
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("学号")
-    @ApiModelProperty("学号")
-    private String studentId;
-
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("学生姓名")
-    @ApiModelProperty("学生姓名")
-    private String userName;
-
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("证件号码")
-    @ApiModelProperty("证件号码")
-    private String credentialNumber;
-
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("学籍状态")
-    @ApiModelProperty("学籍状态")
-    private String archivesStatus;
-
-    @ContentStyle(dataFormat = 49)
     @ExcelProperty("处分学期")
     @ApiModelProperty("处分学期")
-    private String semesterId;
-
-    /**
-     * orgIds
-     */
-    @ApiModelProperty("组织机构id")
-    private List<Long> orgIds;
-
-    /**
-     * orgIds
-     */
-    @ApiModelProperty("年级id")
-    private Long gradeId;
-
-    /**
-     * marjorSetId
-     */
-    @ApiModelProperty("专业")
-    private Long marjorSetId;
-    @ContentStyle(dataFormat = 49)
-    @ApiModelProperty("处分开始日期-开始")
-    private String startTimeStart;
-
-    @ContentStyle(dataFormat = 49)
-    @ApiModelProperty("处分开始日期-结束")
-    private String startTimeEnd;
-
-    @ContentStyle(dataFormat = 49)
-    @ApiModelProperty("处分结束日期-开始")
-    private String endTimeStart;
-
-    @ContentStyle(dataFormat = 49)
-    @ApiModelProperty("处分结束日期-结束")
-    private String endTimeEnd;
-
-    @ApiModelProperty("调整类型")
-    private Integer adjustType;
-
-    @ContentStyle(dataFormat = 49)
-    @ApiModelProperty("升级/降级日期-开始")
-    private String adjustDateStart;
-
-    @ContentStyle(dataFormat = 49)
-    @ApiModelProperty("升级/降级日期-结束")
-    private String adjustDateEnd;
-
-    @ContentStyle(dataFormat = 49)
-    @ApiModelProperty("操作时间-开始")
-    private String modifyDateStart;
+    private Long semesterId;
 
-    @ContentStyle(dataFormat = 49)
-    @ApiModelProperty("操作时间-结束")
-    private String modifyDateEnd;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("处分开始日期")
+    private String startTime;
 
-    @ApiModelProperty("操作时间-结束")
-    private Long classId;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("处分结束日期")
+    private String endTime;
 
-    @ApiModelProperty("是否公示(1:是 0:否)")
-    private Integer isPublicity;
+    @ApiModelProperty("处分类型id")
+    private Long punishmentTypeId;
 }

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentAssessmentCategoryDto.java

@@ -1,32 +1,32 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class UpdateBaseStudentAssessmentCategoryDto extends AddBaseStudentAssessmentCategoryDto {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentAssessmentCategoryDto extends AddBaseStudentAssessmentCategoryDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentAssessmentClassRelationDto.java

@@ -1,32 +1,32 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生班级巡查考核-关联班级
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-public class UpdateBaseStudentAssessmentClassRelationDto extends AddBaseStudentAssessmentClassRelationDto {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentAssessmentClassRelationDto extends AddBaseStudentAssessmentClassRelationDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentAssessmentProjectDto.java

@@ -1,32 +1,32 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生考核项目
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class UpdateBaseStudentAssessmentProjectDto extends AddBaseStudentAssessmentProjectDto {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生考核项目
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentAssessmentProjectDto extends AddBaseStudentAssessmentProjectDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentBehaviorCategoryDto.java

@@ -1,32 +1,32 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class UpdateBaseStudentBehaviorCategoryDto extends AddBaseStudentBehaviorCategoryDto {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentBehaviorCategoryDto extends AddBaseStudentBehaviorCategoryDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/dto/UpdateBaseStudentBehaviorProjectDto.java

@@ -1,32 +1,32 @@
-package com.xjrsoft.module.student.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
-
-
-
-/**
-* @title: 学生操行分考核项目
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class UpdateBaseStudentBehaviorProjectDto extends AddBaseStudentBehaviorProjectDto {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-}
+package com.xjrsoft.module.student.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseStudentBehaviorProjectDto extends AddBaseStudentBehaviorProjectDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentCategory.java

@@ -1,103 +1,103 @@
-package com.xjrsoft.module.student.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-@TableName("base_student_assessment_category")
-@ApiModel(value = "学生考核类别对象", description = "学生考核类别")
-public class BaseStudentAssessmentCategory implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    @TableId
-    private Long id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    @TableField(fill = FieldFill.UPDATE)
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    @TableField(fill = FieldFill.INSERT)
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 总分
-    */
-    @ApiModelProperty("总分")
-    private Double totalScore;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_assessment_category")
+@ApiModel(value = "学生考核类别对象", description = "学生考核类别")
+public class BaseStudentAssessmentCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
 }

src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentClassRelation.java

@@ -1,56 +1,56 @@
-package com.xjrsoft.module.student.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-/**
-* @title: 学生班级巡查考核-关联班级
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-@TableName("base_student_assessment_class_relation")
-@ApiModel(value = "base_student_assessment_class_relation", description = "学生班级巡查考核-关联班级")
-public class BaseStudentAssessmentClassRelation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    @TableId
-    private Long id;
-    /**
-    * 班级编号id
-    */
-    @ApiModelProperty("班级编号id")
-    private Long classId;
-    /**
-    * 学生班级巡查考核id
-    */
-    @ApiModelProperty("学生班级巡查考核id")
-    private Long baseStudentAssessmentInspectionId;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-
-
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_assessment_class_relation")
+@ApiModel(value = "base_student_assessment_class_relation", description = "学生班级巡查考核-关联班级")
+public class BaseStudentAssessmentClassRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+
+
 }

src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentProject.java

@@ -1,168 +1,168 @@
-package com.xjrsoft.module.student.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-/**
-* @title: 学生考核项目
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-@TableName("base_student_assessment_project")
-@ApiModel(value = "学生考核项目对象", description = "学生考核项目")
-public class BaseStudentAssessmentProject implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    @TableId
-    private Long id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    @TableField(fill = FieldFill.UPDATE)
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    @TableField(fill = FieldFill.INSERT)
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学生考核类别(base_student_assessment_category)
-    */
-    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
-    private Long baseStudentAssessmentCategoryId;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 基础分
-    */
-    @ApiModelProperty("基础分")
-    private Double basicPoints;
-    /**
-    * 扣分范围（最小）
-    */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-    * 扣分范围（最大）
-    */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-    * 加分范围（最小）
-    */
-    @ApiModelProperty("加分范围（最小）")
-    private Double addPointsMin;
-    /**
-    * 加分范围（最大）
-    */
-    @ApiModelProperty("加分范围（最大）")
-    private Double addPointsMax;
-    /**
-    * 所属机构(xjr_department)
-    */
-    @ApiModelProperty("所属机构(xjr_department)")
-    private Long departmentId;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 是否影响(1:是 0:否)
-    */
-    @ApiModelProperty("是否影响(1:是 0:否)")
-    private Integer isAffect;
-    /**
-    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
-    */
-    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
-    private String processingMethod;
-    /**
-    * 折算操行分要求
-    */
-    @ApiModelProperty("折算操行分要求")
-    private Double behaviorScore;
-    /**
-    * 操行项目编号
-    */
-    @ApiModelProperty("操行项目编号")
-    private Long baseStudentBehaviorProjectId;
-    /**
-    * 是否允许班主任修改项目(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
-    private Integer isTeacherEdit;
-    /**
-    * 手动处理学生操行分说明
-    */
-    @ApiModelProperty("手动处理学生操行分说明")
-    private String behaviorScoreRemark;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学生考核项目
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_assessment_project")
+@ApiModel(value = "学生考核项目对象", description = "学生考核项目")
+public class BaseStudentAssessmentProject implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别(base_student_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围（最小）
+    */
+    @ApiModelProperty("加分范围（最小）")
+    private Double addPointsMin;
+    /**
+    * 加分范围（最大）
+    */
+    @ApiModelProperty("加分范围（最大）")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
 }

src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentStudentRelation.java

@@ -1,91 +1,91 @@
-package com.xjrsoft.module.student.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-/**
-* @title: 学生班级巡查考核-关联学生
-* @Author fanxp
-* @Date: 2023-11-18
-* @Version 1.0
-*/
-@Data
-@TableName("base_student_assessment_student_relation")
-@ApiModel(value = "学生班级巡查考核-关联学生对象", description = "学生班级巡查考核-关联学生")
-public class BaseStudentAssessmentStudentRelation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    @TableId
-    private Long id;
-    /**
-    * 学生id
-    */
-    @ApiModelProperty("学生id")
-    private Long userId;
-    /**
-    * 班级编号
-    */
-    @ApiModelProperty("班级编号")
-    private Long classId;
-    /**
-    * 学生班级巡查考核id
-    */
-    @ApiModelProperty("学生班级巡查考核id")
-    private Long baseStudentAssessmentInspectionId;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学号
-    */
-    @ApiModelProperty("学号")
-    private String studentId;
-    /**
-    * 姓名
-    */
-    @ApiModelProperty("姓名")
-    private String name;
-    /**
-    * 性别
-    */
-    @ApiModelProperty("性别")
-    private String gender;
-    /**
-    * 民族(xjr_dictionary_item[nation])
-    */
-    @ApiModelProperty("民族(xjr_dictionary_item[nation])")
-    private String nation;
-    /**
-    * 所在班级
-    */
-    @ApiModelProperty("所在班级")
-    private String className;
-    /**
-    * 所学专业
-    */
-    @ApiModelProperty("所学专业")
-    private String majorName;
-
-
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学生班级巡查考核-关联学生
+* @Author fanxp
+* @Date: 2023-11-18
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_assessment_student_relation")
+@ApiModel(value = "学生班级巡查考核-关联学生对象", description = "学生班级巡查考核-关联学生")
+public class BaseStudentAssessmentStudentRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long userId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学号
+    */
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+    * 姓名
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 性别
+    */
+    @ApiModelProperty("性别")
+    private String gender;
+    /**
+    * 民族(xjr_dictionary_item[nation])
+    */
+    @ApiModelProperty("民族(xjr_dictionary_item[nation])")
+    private String nation;
+    /**
+    * 所在班级
+    */
+    @ApiModelProperty("所在班级")
+    private String className;
+    /**
+    * 所学专业
+    */
+    @ApiModelProperty("所学专业")
+    private String majorName;
+
+
 }

src/main/java/com/xjrsoft/module/student/entity/BaseStudentBehaviorCategory.java

@@ -1,103 +1,103 @@
-package com.xjrsoft.module.student.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-/**
-* @title: 学生操行分考核类别
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-@TableName("base_student_behavior_category")
-@ApiModel(value = "学生操行分考核类别对象", description = "学生操行分考核类别")
-public class BaseStudentBehaviorCategory implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    @TableId
-    private Long id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    @TableField(fill = FieldFill.UPDATE)
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    @TableField(fill = FieldFill.INSERT)
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学生操行分考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_behavior_category")
+@ApiModel(value = "学生操行分考核类别对象", description = "学生操行分考核类别")
+public class BaseStudentBehaviorCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
 }

src/main/java/com/xjrsoft/module/student/entity/BaseStudentBehaviorProject.java

@@ -1,153 +1,153 @@
-package com.xjrsoft.module.student.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-
-/**
-* @title: 学生操行分考核项目
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-@TableName("base_student_behavior_project")
-@ApiModel(value = "学生操行分考核项目对象", description = "学生操行分考核项目")
-public class BaseStudentBehaviorProject implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    @TableId
-    private Long id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    @TableField(fill = FieldFill.UPDATE)
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    @TableField(fill = FieldFill.INSERT)
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学生考核类别编号(base_student_behavior_category)
-    */
-    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
-    private Long baseStudentBehaviorCategoryId;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 考核类型(xjr_dictionary_item[score_type])
-    */
-    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
-    private String scoreType;
-    /**
-    * 分值
-    */
-    @ApiModelProperty("分值")
-    private Double score;
-    /**
-    * 是否允许调整(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许调整(1:是 0:否)")
-    private Integer isAdjustment;
-    /**
-    * 扣分范围（最小）
-    */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-    * 扣分范围（最大）
-    */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-    * 是否影响班级考核(1:是 0:否)
-    */
-    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
-    private Integer isImpactAssessment;
-    /**
-    * 换算方式(1:手动换算 2:自动换算)
-    */
-    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
-    private Integer conversionMethod;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 班级考核项目编号（base_student_assessment_project）
-    */
-    @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
-    private Long baseStudentAssessmentProjectId;
-    /**
-    * 自动换算考核类型(xjr_dictionary_item[score_type])
-    */
-    @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")
-    private String automaticScoreType;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-
+package com.xjrsoft.module.student.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+@TableName("base_student_behavior_project")
+@ApiModel(value = "学生操行分考核项目对象", description = "学生操行分考核项目")
+public class BaseStudentBehaviorProject implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别编号(base_student_behavior_category)
+    */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+    /**
+    * 分值
+    */
+    @ApiModelProperty("分值")
+    private Double score;
+    /**
+    * 是否允许调整(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许调整(1:是 0:否)")
+    private Integer isAdjustment;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 是否影响班级考核(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
+    private Integer isImpactAssessment;
+    /**
+    * 换算方式(1:手动换算 2:自动换算)
+    */
+    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
+    private Integer conversionMethod;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 班级考核项目编号（base_student_assessment_project）
+    */
+    @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
+    private Long baseStudentAssessmentProjectId;
+    /**
+    * 自动换算考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")
+    private String automaticScoreType;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
 }

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentCategoryMapper.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Mapper
-public interface BaseStudentAssessmentCategoryMapper extends BaseMapper<BaseStudentAssessmentCategory> {
-
-}
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentAssessmentCategoryMapper extends BaseMapper<BaseStudentAssessmentCategory> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentClassRelationMapper.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @title: 学生班级巡查考核-关联班级
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Mapper
-public interface BaseStudentAssessmentClassRelationMapper extends MPJBaseMapper<BaseStudentAssessmentClassRelation> {
-
-}
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentAssessmentClassRelationMapper extends MPJBaseMapper<BaseStudentAssessmentClassRelation> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentProjectMapper.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @title: 学生考核项目
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Mapper
-public interface BaseStudentAssessmentProjectMapper extends MPJBaseMapper<BaseStudentAssessmentProject> {
-
-}
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生考核项目
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentAssessmentProjectMapper extends MPJBaseMapper<BaseStudentAssessmentProject> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBehaviorCategoryMapper.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Mapper
-public interface BaseStudentBehaviorCategoryMapper extends BaseMapper<BaseStudentBehaviorCategory> {
-
-}
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBehaviorCategoryMapper extends BaseMapper<BaseStudentBehaviorCategory> {
+
+}

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentBehaviorProjectMapper.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @title: 学生操行分考核项目
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Mapper
-public interface BaseStudentBehaviorProjectMapper extends BaseMapper<BaseStudentBehaviorProject> {
-
-}
+package com.xjrsoft.module.student.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Mapper
+public interface BaseStudentBehaviorProjectMapper extends BaseMapper<BaseStudentBehaviorProject> {
+
+}

src/main/java/com/xjrsoft/module/student/service/IBasePunishStudentRelationService.java

@@ -0,0 +1,7 @@
+package com.xjrsoft.module.student.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BasePunishmentStudentRelation;
+
+public interface IBasePunishStudentRelationService  extends MPJBaseService<BasePunishmentStudentRelation> {
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentCategoryService.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
-import lombok.Data;
-import java.util.List;
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-
-public interface IBaseStudentAssessmentCategoryService extends IService<BaseStudentAssessmentCategory> {
-}
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+
+public interface IBaseStudentAssessmentCategoryService extends IService<BaseStudentAssessmentCategory> {
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentClassRelationService.java

@@ -1,24 +1,24 @@
-package com.xjrsoft.module.student.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
-import com.xjrsoft.module.student.entity.BaseStudentUser;
-import lombok.Data;
-import java.util.List;
-
-/**
-* @title: 学生班级巡查考核-关联班级
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-
-public interface IBaseStudentAssessmentClassRelationService extends IService<BaseStudentAssessmentClassRelation> {
-    /**
-     * 数据缓存
-     *
-     * @return
-     */
-    Boolean dataCache(Long dataId);
-}
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
+import com.xjrsoft.module.student.entity.BaseStudentUser;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生班级巡查考核-关联班级
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+
+public interface IBaseStudentAssessmentClassRelationService extends IService<BaseStudentAssessmentClassRelation> {
+    /**
+     * 数据缓存
+     *
+     * @return
+     */
+    Boolean dataCache(Long dataId);
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentProjectService.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
-import lombok.Data;
-import java.util.List;
-
-/**
-* @title: 学生考核项目
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-
-public interface IBaseStudentAssessmentProjectService extends MPJBaseService<BaseStudentAssessmentProject> {
-}
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生考核项目
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+
+public interface IBaseStudentAssessmentProjectService extends MPJBaseService<BaseStudentAssessmentProject> {
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentBehaviorCategoryService.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
-import lombok.Data;
-import java.util.List;
-
-/**
-* @title: 学生操行分考核类别
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-
-public interface IBaseStudentBehaviorCategoryService extends IService<BaseStudentBehaviorCategory> {
-}
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生操行分考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+
+public interface IBaseStudentBehaviorCategoryService extends IService<BaseStudentBehaviorCategory> {
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentBehaviorProjectService.java

@@ -1,17 +1,17 @@
-package com.xjrsoft.module.student.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
-import lombok.Data;
-import java.util.List;
-
-/**
-* @title: 学生操行分考核项目
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-
-public interface IBaseStudentBehaviorProjectService extends IService<BaseStudentBehaviorProject> {
-}
+package com.xjrsoft.module.student.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+
+public interface IBaseStudentBehaviorProjectService extends IService<BaseStudentBehaviorProject> {
+}

src/main/java/com/xjrsoft/module/student/service/IBaseStudentPunishmentInfoService.java

@@ -1,8 +1,16 @@
 package com.xjrsoft.module.student.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoMobileDetailDto;
+import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoMobilePageDto;
+import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentPunishmentInfo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoDetailVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobileDetailVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoPageVo;
 import lombok.Data;
 import java.util.List;
 
@@ -14,6 +22,35 @@ import java.util.List;
 */
 
 public interface IBaseStudentPunishmentInfoService extends MPJBaseService<BaseStudentPunishmentInfo> {
+    /**
+     * 学生处分信息管理列表(分页)
+     * @param dto 处分管理信息前端请求实体对象
+     * @return
+     */
+    IPage<BaseStudentPunishmentInfoPageVo> selectJoinListPagePc(BaseStudentPunishmentInfoPageDto dto);
+
+    /**
+     * 学生处分信息详情
+     * @param id 处分管理信息id
+     * @return
+     */
+    BaseStudentPunishmentInfoDetailVo getDetailById(Long id);
+
+    /**
+     * 学生处分信息详情
+     * @param dto 学生处分信息管理详情入参（移动端）
+     * @return
+     */
+    BaseStudentPunishmentInfoMobileDetailVo getDetailById(BaseStudentPunishmentInfoMobileDetailDto dto);
+
+    /**
+     * 学生处分信息管理列表(分页)(移动端）
+     * @param dto 处分管理信息前端请求实体对象(移动端）
+     * @return
+     */
+    IPage<BaseStudentPunishmentInfoMobilePageVo> selectJoinListPageMobile(BaseStudentPunishmentInfoMobilePageDto dto);
+
+
     /**
     * 新增
     *

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

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BasePunishmentStudentRelation;
+import com.xjrsoft.module.student.mapper.BasePunishmentStudentRelationMapper;
+import com.xjrsoft.module.student.service.IBasePunishStudentRelationService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class BasePunishStudentRelationServiceImpl extends MPJBaseServiceImpl<BasePunishmentStudentRelationMapper, BasePunishmentStudentRelation> implements IBasePunishStudentRelationService {
+
+}

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

@@ -1,25 +1,25 @@
-package com.xjrsoft.module.student.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
-import com.xjrsoft.module.student.mapper.BaseStudentAssessmentCategoryMapper;
-import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Service
-@AllArgsConstructor
-public class BaseStudentAssessmentCategoryServiceImpl extends ServiceImpl<BaseStudentAssessmentCategoryMapper, BaseStudentAssessmentCategory> implements IBaseStudentAssessmentCategoryService {
-}
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentCategoryMapper;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentCategoryService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentAssessmentCategoryServiceImpl extends ServiceImpl<BaseStudentAssessmentCategoryMapper, BaseStudentAssessmentCategory> implements IBaseStudentAssessmentCategoryService {
+}

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

@@ -1,57 +1,57 @@
-package com.xjrsoft.module.student.service.impl;
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.toolkit.MPJWrappers;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.base.entity.BaseClass;
-import com.xjrsoft.module.base.mapper.BaseClassMapper;
-import com.xjrsoft.module.form.entity.FormHistory;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
-import com.xjrsoft.module.student.mapper.BaseStudentAssessmentClassRelationMapper;
-import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
-import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
-import com.xjrsoft.module.teacher.entity.XjrUser;
-import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @title: 学生班级巡查考核-关联班级
- * @Author fanxp
- * @Date: 2023-11-16
- * @Version 1.0
- */
-@Service
-@AllArgsConstructor
-public class BaseStudentAssessmentClassRelationServiceImpl extends ServiceImpl<BaseStudentAssessmentClassRelationMapper, BaseStudentAssessmentClassRelation> implements IBaseStudentAssessmentClassRelationService {
-
-    private final IBaseStudentAssessmentInspectionService baseStudentAssessmentInspectionService;
-
-    private final BaseStudentAssessmentClassRelationMapper baseStudentAssessmentClassRelationMapper;
-
-    @Override
-    public Boolean dataCache(Long dataId) {
-        BaseStudentAssessmentInspection baseStudentAssessmentInspection = baseStudentAssessmentInspectionService.getById(dataId);
-        List<String> classIdList = StrUtil.split(baseStudentAssessmentInspection.getClassIds(), ",");
-
-        for (String classId : classIdList) {
-            BaseStudentAssessmentClassRelation classRelation = new BaseStudentAssessmentClassRelation();
-            Long classIdAsLong = Convert.toLong(classId);
-            classRelation.setClassId(classIdAsLong);
-            classRelation.setBaseStudentAssessmentInspectionId(dataId);
-
-            baseStudentAssessmentClassRelationMapper.insert(classRelation);
-        }
-
-        return true;
-    }
-}
+package com.xjrsoft.module.student.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.mapper.BaseClassMapper;
+import com.xjrsoft.module.form.entity.FormHistory;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentClassRelationMapper;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @title: 学生班级巡查考核-关联班级
+ * @Author fanxp
+ * @Date: 2023-11-16
+ * @Version 1.0
+ */
+@Service
+@AllArgsConstructor
+public class BaseStudentAssessmentClassRelationServiceImpl extends ServiceImpl<BaseStudentAssessmentClassRelationMapper, BaseStudentAssessmentClassRelation> implements IBaseStudentAssessmentClassRelationService {
+
+    private final IBaseStudentAssessmentInspectionService baseStudentAssessmentInspectionService;
+
+    private final BaseStudentAssessmentClassRelationMapper baseStudentAssessmentClassRelationMapper;
+
+    @Override
+    public Boolean dataCache(Long dataId) {
+        BaseStudentAssessmentInspection baseStudentAssessmentInspection = baseStudentAssessmentInspectionService.getById(dataId);
+        List<String> classIdList = StrUtil.split(baseStudentAssessmentInspection.getClassIds(), ",");
+
+        for (String classId : classIdList) {
+            BaseStudentAssessmentClassRelation classRelation = new BaseStudentAssessmentClassRelation();
+            Long classIdAsLong = Convert.toLong(classId);
+            classRelation.setClassId(classIdAsLong);
+            classRelation.setBaseStudentAssessmentInspectionId(dataId);
+
+            baseStudentAssessmentClassRelationMapper.insert(classRelation);
+        }
+
+        return true;
+    }
+}

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

@@ -1,25 +1,25 @@
-package com.xjrsoft.module.student.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
-import com.xjrsoft.module.student.mapper.BaseStudentAssessmentProjectMapper;
-import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-/**
-* @title: 学生考核项目
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Service
-@AllArgsConstructor
-public class BaseStudentAssessmentProjectServiceImpl extends MPJBaseServiceImpl<BaseStudentAssessmentProjectMapper, BaseStudentAssessmentProject> implements IBaseStudentAssessmentProjectService {
-}
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentProject;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentProjectMapper;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentProjectService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学生考核项目
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentAssessmentProjectServiceImpl extends MPJBaseServiceImpl<BaseStudentAssessmentProjectMapper, BaseStudentAssessmentProject> implements IBaseStudentAssessmentProjectService {
+}

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

@@ -1,25 +1,25 @@
-package com.xjrsoft.module.student.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
-import com.xjrsoft.module.student.mapper.BaseStudentBehaviorCategoryMapper;
-import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-/**
-* @title: 学生考核类别
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Service
-@AllArgsConstructor
-public class BaseStudentBehaviorCategoryServiceImpl extends ServiceImpl<BaseStudentBehaviorCategoryMapper, BaseStudentBehaviorCategory> implements IBaseStudentBehaviorCategoryService {
-}
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorCategoryMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorCategoryService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学生考核类别
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBehaviorCategoryServiceImpl extends ServiceImpl<BaseStudentBehaviorCategoryMapper, BaseStudentBehaviorCategory> implements IBaseStudentBehaviorCategoryService {
+}

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

@@ -1,25 +1,25 @@
-package com.xjrsoft.module.student.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
-import com.xjrsoft.module.student.mapper.BaseStudentBehaviorProjectMapper;
-import com.xjrsoft.module.student.service.IBaseStudentBehaviorProjectService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-/**
-* @title: 学生操行分考核项目
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Service
-@AllArgsConstructor
-public class BaseStudentBehaviorProjectServiceImpl extends ServiceImpl<BaseStudentBehaviorProjectMapper, BaseStudentBehaviorProject> implements IBaseStudentBehaviorProjectService {
-}
+package com.xjrsoft.module.student.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorProjectMapper;
+import com.xjrsoft.module.student.service.IBaseStudentBehaviorProjectService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 学生操行分考核项目
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseStudentBehaviorProjectServiceImpl extends ServiceImpl<BaseStudentBehaviorProjectMapper, BaseStudentBehaviorProject> implements IBaseStudentBehaviorProjectService {
+}

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

@@ -1,12 +1,31 @@
 package com.xjrsoft.module.student.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseSemester;
+import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoMobileDetailDto;
+import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoMobilePageDto;
+import com.xjrsoft.module.student.dto.BaseStudentPunishmentInfoPageDto;
 import com.xjrsoft.module.student.entity.BasePunishmentStudentRelation;
+import com.xjrsoft.module.student.entity.BasePunishmentType;
 import com.xjrsoft.module.student.mapper.BasePunishmentStudentRelationMapper;
 import com.xjrsoft.module.student.entity.BaseStudentPunishmentInfo;
 import com.xjrsoft.module.student.mapper.BaseStudentPunishmentInfoMapper;
+import com.xjrsoft.module.student.service.IBasePunishStudentRelationService;
 import com.xjrsoft.module.student.service.IBaseStudentPunishmentInfoService;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoDetailVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobileDetailVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentPunishmentInfoPageVo;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +47,139 @@ public class BaseStudentPunishmentInfoServiceImpl extends MPJBaseServiceImpl<Bas
 
     private final BasePunishmentStudentRelationMapper baseStudentPunishmentInfoBasePunishmentStudentRelationMapper;
 
+    IBasePunishStudentRelationService basePunishStudentRelationService;
+
+    @Override
+    public IPage<BaseStudentPunishmentInfoPageVo> selectJoinListPagePc(BaseStudentPunishmentInfoPageDto dto) {
+        MPJLambdaWrapper<BaseStudentPunishmentInfo> wrapper = MPJWrappers.<BaseStudentPunishmentInfo>lambdaJoin()
+                .select(BaseStudentPunishmentInfo::getId)
+                .selectAs(BaseSemester::getName, BaseStudentPunishmentInfoPageVo::getBaseSemesterName)
+                .selectAs(BasePunishmentType::getPunishmentType, BaseStudentPunishmentInfoPageVo::getPunishmentType)
+                .selectAs(BaseClass::getName, BaseStudentPunishmentInfoPageVo::getClassName)
+                .select(BaseStudentPunishmentInfo::getStartTime)
+                .select(BaseStudentPunishmentInfo::getEndTime)
+                .select(BaseStudentPunishmentInfo::getIsPublicity)
+                .select(BaseStudentPunishmentInfo::getPushMessageObject)
+                .select(BaseStudentPunishmentInfo::getReason)
+                .innerJoin(BaseSemester.class, BaseSemester::getId, BaseStudentPunishmentInfo::getBaseSemesterId)
+                .innerJoin(BasePunishmentType.class, BasePunishmentType::getId, BaseStudentPunishmentInfo::getPunishmentTypeId)
+                .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentPunishmentInfo::getClassId)
+                .eq(ObjectUtil.isNotNull(dto.getSemesterId()) && dto.getSemesterId() > 0, BaseStudentPunishmentInfo::getBaseSemesterId, dto.getSemesterId())
+                .eq(ObjectUtil.isNotNull(dto.getPunishmentTypeId()) && dto.getPunishmentTypeId() > 0, BaseStudentPunishmentInfo::getPunishmentTypeId, dto.getPunishmentTypeId())
+                .eq(StrUtil.isNotBlank(dto.getStartTime()), BaseStudentPunishmentInfo::getStartTime, dto.getStartTime())
+                .eq(StrUtil.isNotBlank(dto.getEndTime()), BaseStudentPunishmentInfo::getEndTime, dto.getEndTime())
+                .eq(BaseStudentPunishmentInfo::getDeleteMark, 0)
+                .orderByDesc(BaseStudentPunishmentInfo::getId);
+
+        IPage<BaseStudentPunishmentInfoPageVo> pageList = this.selectJoinListPage(ConventPage.getPage(dto), BaseStudentPunishmentInfoPageVo.class, wrapper);
+
+        return pageList;
+    }
+
+    @Override
+    public IPage<BaseStudentPunishmentInfoMobilePageVo> selectJoinListPageMobile(BaseStudentPunishmentInfoMobilePageDto dto) {
+
+        MPJLambdaWrapper<BaseStudentPunishmentInfo> wrapper = MPJWrappers.<BaseStudentPunishmentInfo>lambdaJoin()
+                .select(BaseStudentPunishmentInfo::getId)
+                .select(BasePunishmentStudentRelation::getStudentId)
+                .select(BasePunishmentStudentRelation::getUserId)
+                .selectAs(BasePunishmentType::getPunishmentType, BaseStudentPunishmentInfoMobilePageVo::getPunishmentType)
+                .select(BaseStudentPunishmentInfo::getStartTime)
+                .selectAs(BasePunishmentStudentRelation::getName, BaseStudentPunishmentInfoMobilePageVo::getStudentName)
+                .select(BasePunishmentStudentRelation::getGender)
+                .select(BaseStudentPunishmentInfo::getReason)
+                .innerJoin(BasePunishmentStudentRelation.class, BasePunishmentStudentRelation::getPunishmentInfoId, BaseStudentPunishmentInfo::getId)
+                .innerJoin(BasePunishmentType.class, BasePunishmentType::getId, BaseStudentPunishmentInfo::getPunishmentTypeId)
+                .eq(ObjectUtil.isNotNull(dto.getIsPublicity()), BaseStudentPunishmentInfo::getIsPublicity, dto.getIsPublicity())
+                .eq(ObjectUtil.isNotNull(dto.getPunishmentTypeId()) && dto.getPunishmentTypeId() > 0, BaseStudentPunishmentInfo::getPunishmentTypeId, dto.getPunishmentTypeId())
+                .eq(ObjectUtil.isNotNull(dto.getClassId()) && dto.getClassId() > 0, BaseStudentPunishmentInfo::getClassId, dto.getClassId())
+                .eq(StrUtil.isNotBlank(dto.getStartTime()), BaseStudentPunishmentInfo::getStartTime, dto.getStartTime())
+                .eq(StrUtil.isNotBlank(dto.getEndTime()), BaseStudentPunishmentInfo::getEndTime, dto.getEndTime())
+                .like(StrUtil.isNotBlank(dto.getStudentName()), BasePunishmentStudentRelation::getName, dto.getStudentName())
+                .eq(BaseStudentPunishmentInfo::getDeleteMark, 0)
+                .orderByDesc(BaseStudentPunishmentInfo::getId);
+
+        IPage<BaseStudentPunishmentInfoMobilePageVo> pageList = this.selectJoinListPage(ConventPage.getPage(dto), BaseStudentPunishmentInfoMobilePageVo.class, wrapper);
+
+        return pageList;
+    }
+
+    /**
+     * 学生处分信息详情
+     *
+     * @param id 处分管理信息id
+     * @return
+     */
+    @Override
+    public BaseStudentPunishmentInfoDetailVo getDetailById(Long id) {
+        MPJLambdaWrapper<BaseStudentPunishmentInfo> wrapper = MPJWrappers.<BaseStudentPunishmentInfo>lambdaJoin()
+                .select(BaseStudentPunishmentInfo::getId)
+                .selectAs(BaseSemester::getName, BaseStudentPunishmentInfoPageVo::getBaseSemesterName)
+                .selectAs(BasePunishmentType::getPunishmentType, BaseStudentPunishmentInfoPageVo::getPunishmentType)
+                .selectAs(BaseClass::getName, BaseStudentPunishmentInfoPageVo::getClassName)
+                .select(BaseStudentPunishmentInfo::getStartTime)
+                .select(BaseStudentPunishmentInfo::getEndTime)
+                .select(BaseStudentPunishmentInfo::getIsPublicity)
+                .select(BaseStudentPunishmentInfo::getPushMessageObject)
+                .select(BaseStudentPunishmentInfo::getReason)
+                .innerJoin(BaseSemester.class, BaseSemester::getId, BaseStudentPunishmentInfo::getBaseSemesterId)
+                .innerJoin(BasePunishmentType.class, BasePunishmentType::getId, BaseStudentPunishmentInfo::getPunishmentTypeId)
+                .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentPunishmentInfo::getClassId)
+                .eq(BaseStudentPunishmentInfo::getId, id)
+                .eq(BaseStudentPunishmentInfo::getDeleteMark, 0);
+
+        BaseStudentPunishmentInfoDetailVo baseStudentPunishmentInfoDetailVo = this.selectJoinOne(BaseStudentPunishmentInfoDetailVo.class, wrapper);
+
+        QueryWrapper<BasePunishmentStudentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("punishment_info_id", id);
+        List<BasePunishmentStudentRelation> studentList = basePunishStudentRelationService.list(queryWrapper);
+
+        baseStudentPunishmentInfoDetailVo.setStudentList(studentList);
+
+        return baseStudentPunishmentInfoDetailVo;
+    }
+
+    /**
+     * 学生处分信息详情
+     * @param dto 学生处分信息管理详情入参（移动端）
+     * @return
+     */
+    @Override
+    public BaseStudentPunishmentInfoMobileDetailVo getDetailById(BaseStudentPunishmentInfoMobileDetailDto dto) {
+        MPJLambdaWrapper<BaseStudentPunishmentInfo> wrapper = MPJWrappers.<BaseStudentPunishmentInfo>lambdaJoin()
+                .select(BaseStudentPunishmentInfo::getId)
+                .selectAs(BaseSemester::getName, BaseStudentPunishmentInfoPageVo::getBaseSemesterName)
+                .selectAs(BasePunishmentType::getPunishmentType, BaseStudentPunishmentInfoPageVo::getPunishmentType)
+                .selectAs(BaseClass::getName, BaseStudentPunishmentInfoPageVo::getClassName)
+                .select(BaseStudentPunishmentInfo::getStartTime)
+                .select(BaseStudentPunishmentInfo::getEndTime)
+                .select(BaseStudentPunishmentInfo::getIsPublicity)
+                .select(BaseStudentPunishmentInfo::getPushMessageObject)
+                .select(BaseStudentPunishmentInfo::getReason)
+                .selectAs(BasePunishmentStudentRelation::getName, BaseStudentPunishmentInfoMobileDetailVo::getStudentName)
+                .select(BasePunishmentStudentRelation::getGender)
+                .select(BasePunishmentStudentRelation::getStudentId)
+                .select(BasePunishmentStudentRelation::getStudentId)
+                .select(XjrUser::getCredentialNumber)
+                .select(BasePunishmentStudentRelation::getMajor)
+                .select(BasePunishmentStudentRelation::getAdjustType)
+                .select(BasePunishmentStudentRelation::getAdjustDate)
+                .select(BasePunishmentStudentRelation::getAdjustReason)
+                .select(BasePunishmentStudentRelation::getModifyDate)
+                .innerJoin(BaseSemester.class, BaseSemester::getId, BaseStudentPunishmentInfo::getBaseSemesterId)
+                .innerJoin(BasePunishmentType.class, BasePunishmentType::getId, BaseStudentPunishmentInfo::getPunishmentTypeId)
+                .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentPunishmentInfo::getClassId)
+                .innerJoin(BasePunishmentStudentRelation.class, BasePunishmentStudentRelation::getPunishmentInfoId, BaseStudentPunishmentInfo::getId)
+                .innerJoin(XjrUser.class, XjrUser::getId, BasePunishmentStudentRelation::getUserId)
+                .eq(BaseStudentPunishmentInfo::getId, dto.getId())
+                .eq(BasePunishmentStudentRelation::getUserId, dto.getUserId())
+                .eq(BaseStudentPunishmentInfo::getDeleteMark, 0);
+
+        BaseStudentPunishmentInfoMobileDetailVo baseStudentPunishmentInfoMobileDetailVo = this.selectJoinOne(BaseStudentPunishmentInfoMobileDetailVo.class, wrapper);
+
+        return baseStudentPunishmentInfoMobileDetailVo;
+    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentCategoryListVo.java

@@ -1,84 +1,84 @@
-package com.xjrsoft.module.student.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* @title: 学生考核类别列表列表入参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class BaseStudentAssessmentCategoryListVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 总分
-    */
-    @ApiModelProperty("总分")
-    private Double totalScore;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生考核类别列表列表入参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentCategoryListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentCategoryVo.java

@@ -1,54 +1,54 @@
-package com.xjrsoft.module.student.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-/**
-* @title: 学生考核类别表单出参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class BaseStudentAssessmentCategoryVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 总分
-    */
-    @ApiModelProperty("总分")
-    private Double totalScore;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-
-
-}
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 学生考核类别表单出参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentCategoryVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentClassListVo.java

@@ -1,44 +1,44 @@
-package com.xjrsoft.module.student.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
-* @title: 学生班级巡查考核-关联班级列表列表入参
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-public class BaseStudentAssessmentClassListVo {
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 班级编号id
-    */
-    @ApiModelProperty("班级编号id")
-    private Long classId;
-    /**
-     * 班级编号id
-     */
-    @ApiModelProperty("班级编号id")
-    private String className;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 班主任姓名
-    */
-    @ApiModelProperty("班主任姓名")
-    private String teacherName;
-    /**
-     * 班主任电话
-     */
-    @ApiModelProperty("班主任电话")
-    private String mobile;
-}
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 学生班级巡查考核-关联班级列表列表入参
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentClassListVo {
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+     * 班级编号id
+     */
+    @ApiModelProperty("班级编号id")
+    private String className;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+    /**
+     * 班主任电话
+     */
+    @ApiModelProperty("班主任电话")
+    private String mobile;
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentClassRelationListVo.java

@@ -1,49 +1,49 @@
-package com.xjrsoft.module.student.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* @title: 学生班级巡查考核-关联班级列表列表入参
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-public class BaseStudentAssessmentClassRelationListVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 班级编号id
-    */
-    @ApiModelProperty("班级编号id")
-    private Long classId;
-    /**
-    * 学生班级巡查考核id
-    */
-    @ApiModelProperty("学生班级巡查考核id")
-    private Long baseStudentAssessmentInspectionId;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 班主任姓名
-    */
-    @ApiModelProperty("班主任姓名")
-    private String teacherName;
-
-}
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生班级巡查考核-关联班级列表列表入参
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentClassRelationListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentClassRelationVo.java

@@ -1,49 +1,49 @@
-package com.xjrsoft.module.student.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-/**
-* @title: 学生班级巡查考核-关联班级表单出参
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-public class BaseStudentAssessmentClassRelationVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-    /**
-    * 班级编号id
-    */
-    @ApiModelProperty("班级编号id")
-    private Long classId;
-    /**
-    * 学生班级巡查考核id
-    */
-    @ApiModelProperty("学生班级巡查考核id")
-    private Long baseStudentAssessmentInspectionId;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 班主任姓名
-    */
-    @ApiModelProperty("班主任姓名")
-    private String teacherName;
-
-
-
-}
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 学生班级巡查考核-关联班级表单出参
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentClassRelationVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+    * 学生班级巡查考核id
+    */
+    @ApiModelProperty("学生班级巡查考核id")
+    private Long baseStudentAssessmentInspectionId;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+
+
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentProjectListVo.java

@@ -1,149 +1,149 @@
-package com.xjrsoft.module.student.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* @title: 学生考核项目列表列表入参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class BaseStudentAssessmentProjectListVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学生考核类别(base_student_assessment_category)
-    */
-    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
-    private Long baseStudentAssessmentCategoryId;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 基础分
-    */
-    @ApiModelProperty("基础分")
-    private Double basicPoints;
-    /**
-    * 扣分范围（最小）
-    */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-    * 扣分范围（最大）
-    */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-    * 加分范围（最小）
-    */
-    @ApiModelProperty("加分范围（最小）")
-    private Double addPointsMin;
-    /**
-    * 加分范围（最大）
-    */
-    @ApiModelProperty("加分范围（最大）")
-    private Double addPointsMax;
-    /**
-    * 所属机构(xjr_department)
-    */
-    @ApiModelProperty("所属机构(xjr_department)")
-    private Long departmentId;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 是否影响(1:是 0:否)
-    */
-    @ApiModelProperty("是否影响(1:是 0:否)")
-    private Integer isAffect;
-    /**
-    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
-    */
-    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
-    private String processingMethod;
-    /**
-    * 折算操行分要求
-    */
-    @ApiModelProperty("折算操行分要求")
-    private Double behaviorScore;
-    /**
-    * 操行项目编号
-    */
-    @ApiModelProperty("操行项目编号")
-    private Long baseStudentBehaviorProjectId;
-    /**
-    * 是否允许班主任修改项目(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
-    private Integer isTeacherEdit;
-    /**
-    * 手动处理学生操行分说明
-    */
-    @ApiModelProperty("手动处理学生操行分说明")
-    private String behaviorScoreRemark;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生考核项目列表列表入参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentProjectListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别(base_student_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围（最小）
+    */
+    @ApiModelProperty("加分范围（最小）")
+    private Double addPointsMin;
+    /**
+    * 加分范围（最大）
+    */
+    @ApiModelProperty("加分范围（最大）")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentProjectPageVo.java

@@ -1,148 +1,148 @@
-package com.xjrsoft.module.student.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
-* @title: 学生考核项目分页列表出参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class BaseStudentAssessmentProjectPageVo {
-
-    /**
-     * 主键编号
-     */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-     * 修改人
-     */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-     * 删除标记
-     */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-     * 有效标志
-     */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-     * 序号
-     */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-     * 学生考核类别(base_student_assessment_category)
-     */
-    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
-    private Long baseStudentAssessmentCategoryId;
-    /**
-     * 学生考核类别名称(base_student_assessment_category)
-     */
-    @ApiModelProperty("学生考核类别名称(base_student_assessment_category)")
-    private String baseStudentAssessmentCategoryName;
-    /**
-     * 名称
-     */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-     * 编码
-     */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-     * 基础分
-     */
-    @ApiModelProperty("基础分")
-    private Double basicPoints;
-    /**
-     * 扣分范围（最小）
-     */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-     * 扣分范围（最大）
-     */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-     * 加分范围（最小）
-     */
-    @ApiModelProperty("加分范围（最小）")
-    private Double addPointsMin;
-    /**
-     * 加分范围（最大）
-     */
-    @ApiModelProperty("加分范围（最大）")
-    private Double addPointsMax;
-    /**
-     * 所属机构(xjr_department)
-     */
-    @ApiModelProperty("所属机构(xjr_department)")
-    private Long departmentId;
-    /**
-     * 是否启用(1:是 0:否)
-     */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-     * 是否影响(1:是 0:否)
-     */
-    @ApiModelProperty("是否影响(1:是 0:否)")
-    private Integer isAffect;
-    /**
-     * 学生操行分处理方式(xjr_dictionary_item[ap_method])
-     */
-    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
-    private String processingMethod;
-    /**
-     * 折算操行分要求
-     */
-    @ApiModelProperty("折算操行分要求")
-    private Double behaviorScore;
-    /**
-     * 操行项目编号
-     */
-    @ApiModelProperty("操行项目编号")
-    private Long baseStudentBehaviorProjectId;
-    /**
-     * 是否允许班主任修改项目(1:是 0:否)
-     */
-    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
-    private Integer isTeacherEdit;
-    /**
-     * 手动处理学生操行分说明
-     */
-    @ApiModelProperty("手动处理学生操行分说明")
-    private String behaviorScoreRemark;
-    /**
-     * 备注
-     */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学生考核项目分页列表出参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentProjectPageVo {
+
+    /**
+     * 主键编号
+     */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+     * 修改人
+     */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+     * 删除标记
+     */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+     * 有效标志
+     */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+     * 序号
+     */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+     * 学生考核类别(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+     * 学生考核类别名称(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别名称(base_student_assessment_category)")
+    private String baseStudentAssessmentCategoryName;
+    /**
+     * 名称
+     */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+     * 编码
+     */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+     * 基础分
+     */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+     * 扣分范围（最小）
+     */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+     * 扣分范围（最大）
+     */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+     * 加分范围（最小）
+     */
+    @ApiModelProperty("加分范围（最小）")
+    private Double addPointsMin;
+    /**
+     * 加分范围（最大）
+     */
+    @ApiModelProperty("加分范围（最大）")
+    private Double addPointsMax;
+    /**
+     * 所属机构(xjr_department)
+     */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+     * 是否启用(1:是 0:否)
+     */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+     * 是否影响(1:是 0:否)
+     */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+     * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+     */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+     * 折算操行分要求
+     */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+     * 操行项目编号
+     */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+     * 是否允许班主任修改项目(1:是 0:否)
+     */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+     * 手动处理学生操行分说明
+     */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentProjectVo.java

@@ -1,119 +1,119 @@
-package com.xjrsoft.module.student.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-/**
-* @title: 学生考核项目表单出参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class BaseStudentAssessmentProjectVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学生考核类别(base_student_assessment_category)
-    */
-    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
-    private Long baseStudentAssessmentCategoryId;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 基础分
-    */
-    @ApiModelProperty("基础分")
-    private Double basicPoints;
-    /**
-    * 扣分范围（最小）
-    */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-    * 扣分范围（最大）
-    */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-    * 加分范围（最小）
-    */
-    @ApiModelProperty("加分范围（最小）")
-    private Double addPointsMin;
-    /**
-    * 加分范围（最大）
-    */
-    @ApiModelProperty("加分范围（最大）")
-    private Double addPointsMax;
-    /**
-    * 所属机构(xjr_department)
-    */
-    @ApiModelProperty("所属机构(xjr_department)")
-    private Long departmentId;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 是否影响(1:是 0:否)
-    */
-    @ApiModelProperty("是否影响(1:是 0:否)")
-    private Integer isAffect;
-    /**
-    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
-    */
-    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
-    private String processingMethod;
-    /**
-    * 折算操行分要求
-    */
-    @ApiModelProperty("折算操行分要求")
-    private Double behaviorScore;
-    /**
-    * 操行项目编号
-    */
-    @ApiModelProperty("操行项目编号")
-    private Long baseStudentBehaviorProjectId;
-    /**
-    * 是否允许班主任修改项目(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
-    private Integer isTeacherEdit;
-    /**
-    * 手动处理学生操行分说明
-    */
-    @ApiModelProperty("手动处理学生操行分说明")
-    private String behaviorScoreRemark;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-
-
-}
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 学生考核项目表单出参
+* @Author fanxp
+* @Date: 2023-11-14
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentProjectVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别(base_student_assessment_category)
+    */
+    @ApiModelProperty("学生考核类别(base_student_assessment_category)")
+    private Long baseStudentAssessmentCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 基础分
+    */
+    @ApiModelProperty("基础分")
+    private Double basicPoints;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 加分范围（最小）
+    */
+    @ApiModelProperty("加分范围（最小）")
+    private Double addPointsMin;
+    /**
+    * 加分范围（最大）
+    */
+    @ApiModelProperty("加分范围（最大）")
+    private Double addPointsMax;
+    /**
+    * 所属机构(xjr_department)
+    */
+    @ApiModelProperty("所属机构(xjr_department)")
+    private Long departmentId;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 学生操行分处理方式(xjr_dictionary_item[ap_method])
+    */
+    @ApiModelProperty("学生操行分处理方式(xjr_dictionary_item[ap_method])")
+    private String processingMethod;
+    /**
+    * 折算操行分要求
+    */
+    @ApiModelProperty("折算操行分要求")
+    private Double behaviorScore;
+    /**
+    * 操行项目编号
+    */
+    @ApiModelProperty("操行项目编号")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 是否允许班主任修改项目(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许班主任修改项目(1:是 0:否)")
+    private Integer isTeacherEdit;
+    /**
+    * 手动处理学生操行分说明
+    */
+    @ApiModelProperty("手动处理学生操行分说明")
+    private String behaviorScoreRemark;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentBehaviorCategoryListVo.java

@@ -1,84 +1,84 @@
-package com.xjrsoft.module.student.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* @title: 学生考核类别列表列表入参
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class BaseStudentBehaviorCategoryListVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生考核类别列表列表入参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorCategoryListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentBehaviorCategoryPageVo.java

@@ -1,84 +1,84 @@
-package com.xjrsoft.module.student.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* @title: 学生考核类别分页列表出参
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class BaseStudentBehaviorCategoryPageVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生考核类别分页列表出参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorCategoryPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentBehaviorCategoryVo.java

@@ -1,54 +1,54 @@
-package com.xjrsoft.module.student.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-/**
-* @title: 学生考核类别表单出参
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class BaseStudentBehaviorCategoryVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-
-
-}
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 学生考核类别表单出参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorCategoryVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentBehaviorProjectPageVo.java

@@ -1,134 +1,134 @@
-package com.xjrsoft.module.student.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* @title: 学生操行分考核项目分页列表出参
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class BaseStudentBehaviorProjectPageVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学生考核类别编号(base_student_behavior_category)
-    */
-    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
-    private Long baseStudentBehaviorCategoryId;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 考核类型(xjr_dictionary_item[score_type])
-    */
-    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
-    private String scoreType;
-    /**
-    * 分值
-    */
-    @ApiModelProperty("分值")
-    private Double score;
-    /**
-    * 是否允许调整(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许调整(1:是 0:否)")
-    private Integer isAdjustment;
-    /**
-    * 扣分范围（最小）
-    */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-    * 扣分范围（最大）
-    */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-    * 是否影响班级考核(1:是 0:否)
-    */
-    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
-    private Integer isImpactAssessment;
-    /**
-    * 换算方式(1:手动换算 2:自动换算)
-    */
-    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
-    private Integer conversionMethod;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 班级考核项目编号（base_student_assessment_project）
-    */
-    @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
-    private Long baseStudentAssessmentProjectId;
-    /**
-    * 自动换算考核类型(xjr_dictionary_item[score_type])
-    */
-    @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")
-    private String automaticScoreType;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-}
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生操行分考核项目分页列表出参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorProjectPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别编号(base_student_behavior_category)
+    */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+    /**
+    * 分值
+    */
+    @ApiModelProperty("分值")
+    private Double score;
+    /**
+    * 是否允许调整(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许调整(1:是 0:否)")
+    private Integer isAdjustment;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 是否影响班级考核(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
+    private Integer isImpactAssessment;
+    /**
+    * 换算方式(1:手动换算 2:自动换算)
+    */
+    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
+    private Integer conversionMethod;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 班级考核项目编号（base_student_assessment_project）
+    */
+    @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
+    private Long baseStudentAssessmentProjectId;
+    /**
+    * 自动换算考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")
+    private String automaticScoreType;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentBehaviorProjectVo.java

@@ -1,104 +1,104 @@
-package com.xjrsoft.module.student.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
-/**
-* @title: 学生操行分考核项目表单出参
-* @Author fanxp
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class BaseStudentBehaviorProjectVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-    /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 学生考核类别编号(base_student_behavior_category)
-    */
-    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
-    private Long baseStudentBehaviorCategoryId;
-    /**
-    * 名称
-    */
-    @ApiModelProperty("名称")
-    private String name;
-    /**
-    * 编码
-    */
-    @ApiModelProperty("编码")
-    private String code;
-    /**
-    * 考核类型(xjr_dictionary_item[score_type])
-    */
-    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
-    private String scoreType;
-    /**
-    * 分值
-    */
-    @ApiModelProperty("分值")
-    private Double score;
-    /**
-    * 是否允许调整(1:是 0:否)
-    */
-    @ApiModelProperty("是否允许调整(1:是 0:否)")
-    private Integer isAdjustment;
-    /**
-    * 扣分范围（最小）
-    */
-    @ApiModelProperty("扣分范围（最小）")
-    private Double pointsDeductedMin;
-    /**
-    * 扣分范围（最大）
-    */
-    @ApiModelProperty("扣分范围（最大）")
-    private Double pointsDeductedMax;
-    /**
-    * 是否影响班级考核(1:是 0:否)
-    */
-    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
-    private Integer isImpactAssessment;
-    /**
-    * 换算方式(1:手动换算 2:自动换算)
-    */
-    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
-    private Integer conversionMethod;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-    /**
-    * 班级考核项目编号（base_student_assessment_project）
-    */
-    @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
-    private Long baseStudentAssessmentProjectId;
-    /**
-    * 自动换算考核类型(xjr_dictionary_item[score_type])
-    */
-    @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")
-    private String automaticScoreType;
-    /**
-    * 备注
-    */
-    @ApiModelProperty("备注")
-    private String remark;
-
-
-
-}
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 学生操行分考核项目表单出参
+* @Author fanxp
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorProjectVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生考核类别编号(base_student_behavior_category)
+    */
+    @ApiModelProperty("学生考核类别编号(base_student_behavior_category)")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 编码
+    */
+    @ApiModelProperty("编码")
+    private String code;
+    /**
+    * 考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("考核类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+    /**
+    * 分值
+    */
+    @ApiModelProperty("分值")
+    private Double score;
+    /**
+    * 是否允许调整(1:是 0:否)
+    */
+    @ApiModelProperty("是否允许调整(1:是 0:否)")
+    private Integer isAdjustment;
+    /**
+    * 扣分范围（最小）
+    */
+    @ApiModelProperty("扣分范围（最小）")
+    private Double pointsDeductedMin;
+    /**
+    * 扣分范围（最大）
+    */
+    @ApiModelProperty("扣分范围（最大）")
+    private Double pointsDeductedMax;
+    /**
+    * 是否影响班级考核(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响班级考核(1:是 0:否)")
+    private Integer isImpactAssessment;
+    /**
+    * 换算方式(1:手动换算 2:自动换算)
+    */
+    @ApiModelProperty("换算方式(1:手动换算 2:自动换算)")
+    private Integer conversionMethod;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+    /**
+    * 班级考核项目编号（base_student_assessment_project）
+    */
+    @ApiModelProperty("班级考核项目编号（base_student_assessment_project）")
+    private Long baseStudentAssessmentProjectId;
+    /**
+    * 自动换算考核类型(xjr_dictionary_item[score_type])
+    */
+    @ApiModelProperty("自动换算考核类型(xjr_dictionary_item[score_type])")
+    private String automaticScoreType;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPostListVo.java

@@ -1,118 +1,118 @@
-package com.xjrsoft.module.student.vo;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
-* @title: 学生职务设置列表列表入参
-* @Author dzx
-* @Date: 2023-11-16
-* @Version 1.0
-*/
-@Data
-public class BaseStudentPostListVo {
-
-    /**
-    * 主键编号
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("主键编号")
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-    * 创建人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建人")
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建时间")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改人")
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改时间")
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("删除标记")
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("有效标志")
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("序号")
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-    * 职务
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("职务")
-    @ApiModelProperty("职务")
-    private String post;
-    /**
-    * 职务级别
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("职务级别")
-    @ApiModelProperty("职务级别")
-    private String level;
-    /**
-    * 是否允许德育检查(1:是 0:否)
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("是否允许德育检查(1:是 0:否)")
-    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
-    private Integer isAllowedCheck;
-    /**
-    * 职责描述
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("职责描述")
-    @ApiModelProperty("职责描述")
-    private String explains;
-    /**
-    * 是否启用(1:是 0:否)
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("是否启用(1:是 0:否)")
-    @ApiModelProperty("是否启用(1:是 0:否)")
-    private Integer status;
-
-}
+package com.xjrsoft.module.student.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 学生职务设置列表列表入参
+* @Author dzx
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentPostListVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改时间")
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标志")
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("序号")
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 职务
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务")
+    @ApiModelProperty("职务")
+    private String post;
+    /**
+    * 职务级别
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职务级别")
+    @ApiModelProperty("职务级别")
+    private String level;
+    /**
+    * 是否允许德育检查(1:是 0:否)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("是否允许德育检查(1:是 0:否)")
+    @ApiModelProperty("是否允许德育检查(1:是 0:否)")
+    private Integer isAllowedCheck;
+    /**
+    * 职责描述
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("职责描述")
+    @ApiModelProperty("职责描述")
+    private String explains;
+    /**
+    * 是否启用(1:是 0:否)
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("是否启用(1:是 0:否)")
+    @ApiModelProperty("是否启用(1:是 0:否)")
+    private Integer status;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPunishmentInfoDetailVo.java

@@ -0,0 +1,27 @@
+package com.xjrsoft.module.student.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xjrsoft.module.student.entity.BasePunishmentStudentRelation;
+import com.xjrsoft.module.student.entity.BaseStudentPunishmentInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 学生处分信息管理表单出参
+* @Author dzx
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentPunishmentInfoDetailVo extends BaseStudentPunishmentInfoPageVo{
+
+    /**
+     * 该处分信息下的学生集合
+     */
+    @ApiModelProperty("学生集合")
+    private List<BasePunishmentStudentRelation> studentList;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPunishmentInfoMobileDetailVo.java

@@ -0,0 +1,77 @@
+package com.xjrsoft.module.student.vo;
+
+import com.xjrsoft.module.student.entity.BasePunishmentStudentRelation;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @title: 学生处分信息管理表单出参
+* @Author dzx
+* @Date: 2023-11-15
+* @Version 1.0
+*/
+@Data
+public class BaseStudentPunishmentInfoMobileDetailVo extends BaseStudentPunishmentInfoPageVo{
+
+    /**
+     * 学生姓名
+     */
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+
+    /**
+     * 学生性别
+     */
+    @ApiModelProperty("学生性别")
+    private Integer gender;
+
+    /**
+     * 学生学号
+     */
+    @ApiModelProperty("学生学号")
+    private String studentId;
+
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty("证件号码")
+    private String credentialNumber;
+
+    /**
+     * 所在班级
+     */
+    @ApiModelProperty("所在班级")
+    private String className;
+
+    /**
+     * 在读专业
+     */
+    @ApiModelProperty("在读专业")
+    private String major;
+
+    /**
+     * 调整类型
+     */
+    @ApiModelProperty("调整类型")
+    private String adjustType;
+
+    /**
+     * 调整日期
+     */
+    @ApiModelProperty("调整日期")
+    private String adjustDate;
+
+    /**
+     * 调整原因
+     */
+    @ApiModelProperty("调整原因")
+    private String adjustReason;
+
+    /**
+     * 操作时间
+     */
+    @ApiModelProperty("操作时间")
+    private String modifyTime;
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPunishmentInfoMobilePageVo.java

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: 学生处分信息管理分页列表出参（移动端）
+ * @Author dzx
+ * @Date: 2023-11-15
+ * @Version 1.0
+ */
+@Data
+public class BaseStudentPunishmentInfoMobilePageVo {
+
+    /**
+     * 主键编号
+     */
+    @ApiModelProperty("主键编号")
+    private String id;
+
+    /**
+     * 处分类型
+     */
+    @ApiModelProperty("处分类型")
+    private String punishmentType;
+
+    /**
+     * 处分开始时间
+     */
+    @ApiModelProperty("处分开始时间")
+    private String startTime;
+
+    /**
+     * 处分原因
+     */
+    @ApiModelProperty("处分原因")
+    private String reason;
+
+    @ApiModelProperty("用户id")
+    private String userId;
+
+    @ApiModelProperty("学生id")
+    private String studentId;
+
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+
+    @ApiModelProperty("性别")
+    private String gender;
+
+}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPunishmentInfoMobliePageVo.java

@@ -1,147 +0,0 @@
-package com.xjrsoft.module.student.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
-* @title: 学生考核项目分页列表出参
-* @Author fanxp
-* @Date: 2023-11-14
-* @Version 1.0
-*/
-@Data
-public class BaseStudentPunishmentInfoMobliePageVo {
-
-    /**
-     * 主键编号
-     */
-    @ApiModelProperty("主键编号")
-    private String id;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-     * 修改人
-     */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty("修改时间")
-    private String modifyDate;
-    /**
-     * 删除标记
-     */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-     * 有效标志
-     */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-     * 学期ID(base_semester)
-     */
-    @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterId;
-    /**
-     * 处分类型id
-     */
-    @ApiModelProperty("处分类型id")
-    private Long punishmentTypeId;
-    /**
-     * 处分开始日期
-     */
-    @ApiModelProperty("处分开始日期")
-    private String startTime;
-    /**
-     * 处分结束日期
-     */
-    @ApiModelProperty("处分结束日期")
-    private String endTime;
-    /**
-     * 是否公示(1:是 0:否)
-     */
-    @ApiModelProperty("是否公示(1:是 0:否)")
-    private Integer isPublicity;
-    /**
-     * 发送处分(1:班主任 2:学生 3:家长)
-     */
-    @ApiModelProperty("发送处分(1:班主任 2:学生 3:家长)")
-    private Integer pushMessageObject;
-    /**
-     * 处分原因
-     */
-    @ApiModelProperty("处分原因")
-    private String reason;
-    /**
-     * 班级id
-     */
-    @ApiModelProperty("班级id")
-    private String classId;
-    /**
-     * 附件文件id
-     */
-    @ApiModelProperty("附件文件id")
-    private Long fileId;
-
-    /**
-     * 处分类型
-     */
-    @ApiModelProperty("处分类型")
-    private String punishmentType;
-
-    /**
-     * 处分类型
-     */
-    @ApiModelProperty("学籍状态")
-    private String archivesStatus;
-
-    /**
-     * 调整类型
-     */
-    @ApiModelProperty("调整类型")
-    private String adjustType;
-
-    /**
-     * 调整时间
-     */
-    @ApiModelProperty("调整时间")
-    private Date adjustDate;
-
-    /**
-     * 调整原因
-     */
-    @ApiModelProperty("调整原因")
-    private String adjustReason;
-
-
-    @ApiModelProperty("学号")
-    private String studentId;
-
-    @ApiModelProperty("姓名")
-    private String name;
-
-    @ApiModelProperty("性别")
-    private String gender;
-
-    @ApiModelProperty("所学专业")
-    private String major;
-
-    @ApiModelProperty("所在班级")
-    private String className;
-
-    @ApiModelProperty("处分学期")
-    private String semesterName;
-
-}

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPunishmentInfoPageVo.java

@@ -1,9 +1,11 @@
 package com.xjrsoft.module.student.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
 * @title: 学生处分信息管理分页列表出参
@@ -13,90 +15,57 @@ import java.util.Date;
 */
 @Data
 public class BaseStudentPunishmentInfoPageVo {
-
     /**
-    * 主键编号
-    */
+     * 学生处分主键编号
+     */
     @ApiModelProperty("主键编号")
     private String id;
+
     /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private String modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
+     * 处分学期(base_semester)
+     */
+    @ApiModelProperty("处分学期")
+    private String baseSemesterName;
+
     /**
-    * 学期ID(base_semester)
-    */
-    @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterId;
+     * 处分类型id(base_punishment_type)
+     */
+    @ApiModelProperty("处分类型")
+    private String punishmentType;
+
     /**
-    * 处分类型id
-    */
-    @ApiModelProperty("处分类型id")
-    private Long punishmentTypeId;
+     * 学生班级(base_class)
+     */
+    @ApiModelProperty("学生班级")
+    private String className;
+
     /**
-    * 处分开始日期
-    */
+     * 处分开始日期
+     */
     @ApiModelProperty("处分开始日期")
     private String startTime;
+
     /**
-    * 处分结束日期
-    */
+     * 处分结束日期
+     */
     @ApiModelProperty("处分结束日期")
     private String endTime;
+
     /**
-    * 是否公示(1:是 0:否)
-    */
+     * 是否公示(1:是 0:否)
+     */
     @ApiModelProperty("是否公示(1:是 0:否)")
     private Integer isPublicity;
+
     /**
-    * 发送处分(1:班主任 2:学生 3:家长)
-    */
+     * 发送处分消息(1:班主任 2:学生 3:家长)
+     */
     @ApiModelProperty("发送处分(1:班主任 2:学生 3:家长)")
     private Integer pushMessageObject;
-    /**
-    * 处分原因
-    */
-    @ApiModelProperty("处分原因")
-    private String reason;
-    /**
-    * 附件文件id
-    */
-    @ApiModelProperty("附件文件id")
-    private Long fileId;
 
     /**
-     * 处分类型
+     * 处分原因
      */
-    @ApiModelProperty("处分类型")
-    private String punishmentType;
-
-    @ApiModelProperty("处分学期")
-    private String semesterName;
-
+    @ApiModelProperty("处分原因")
+    private String reason;
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPunishmentInfoVo.java

@@ -1,88 +0,0 @@
-package com.xjrsoft.module.student.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
-* @title: 学生处分信息管理表单出参
-* @Author dzx
-* @Date: 2023-11-15
-* @Version 1.0
-*/
-@Data
-public class BaseStudentPunishmentInfoVo {
-
-    /**
-    * 主键编号
-    */
-    @ApiModelProperty("主键编号")
-    private Long id;
-    /**
-    * 学期ID(base_semester)
-    */
-    @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterId;
-    /**
-    * 处分类型id
-    */
-    @ApiModelProperty("处分类型id")
-    private Long punishmentTypeId;
-    /**
-    * 处分开始日期
-    */
-    @ApiModelProperty("处分开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date startTime;
-    /**
-    * 处分结束日期
-    */
-    @ApiModelProperty("处分结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date endTime;
-    /**
-    * 是否公示(1:是 0:否)
-    */
-    @ApiModelProperty("是否公示(1:是 0:否)")
-    private Integer isPublicity;
-    /**
-    * 发送处分(1:班主任 2:学生 3:家长)
-    */
-    @ApiModelProperty("发送处分(1:班主任 2:学生 3:家长)")
-    private Integer pushMessageObject;
-    /**
-    * 处分原因
-    */
-    @ApiModelProperty("处分原因")
-    private String reason;
-    /**
-    * 班级id
-    */
-    @ApiModelProperty("班级id")
-    private String classId;
-    /**
-    * 附件文件id
-    */
-    @ApiModelProperty("附件文件id")
-    private Long fileId;
-
-
-    /**
-    * basePunishmentStudentRelation
-    */
-    @ApiModelProperty("basePunishmentStudentRelation子表")
-    private List<BasePunishmentStudentRelationVo> basePunishmentStudentRelationList;
-
-    /**
-     * 处分类型
-     */
-    @ApiModelProperty("处分类型")
-    private String punishmentType;
-
-    @ApiModelProperty("处分学期")
-    private String semesterName;
-
-}