学生考核项目

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

@@ -6,6 +6,9 @@ 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;
@@ -18,8 +21,10 @@ 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.IBaseStudentAssessmentProjectService;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentProjectListVo;
 
@@ -50,16 +55,20 @@ public class BaseStudentAssessmentProjectController {
     private final IBaseStudentAssessmentProjectService baseStudentAssessmentProjectService;
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="学生考核项目列表(分页)")
+    @ApiOperation(value = "学生考核项目列表(分页)")
     @SaCheckPermission("basestudentassessmentproject:detail")
-    public RT<PageOutput<BaseStudentAssessmentProjectPageVo>> page(@Valid BaseStudentAssessmentProjectPageDto dto){
+    public RT<PageOutput<BaseStudentAssessmentProjectPageVo>> page(@Valid BaseStudentAssessmentProjectPageDto dto) {
 
-        LambdaQueryWrapper<BaseStudentAssessmentProject> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
+        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()));
-        IPage<BaseStudentAssessmentProject> page = baseStudentAssessmentProjectService.page(ConventPage.getPage(dto), queryWrapper);
+                .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);
     }

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

@@ -107,7 +107,7 @@ public class BaseStudentPunishmentInfoController {
     @ApiOperation(value="根据id查询学生处分信息管理信息")
     @SaCheckPermission("basestudentpunishmentinfo:detail")
     public RT<BaseStudentPunishmentInfoVo> info(@RequestParam Long id){
-        BaseStudentPunishmentInfo baseStudentPunishmentInfo = baseStudentPunishmentInfoService.getByIdDeep(id);
+        BaseStudentPunishmentInfo baseStudentPunishmentInfo = baseStudentPunishmentInfoService.getById(id);
         if (baseStudentPunishmentInfo == null) {
            return RT.error("找不到此数据！");
         }

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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface BaseStudentAssessmentProjectMapper extends BaseMapper<BaseStudentAssessmentProject> {
+public interface BaseStudentAssessmentProjectMapper extends MPJBaseMapper<BaseStudentAssessmentProject> {
 
 }

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

@@ -13,5 +13,5 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface IBaseStudentAssessmentProjectService extends IService<BaseStudentAssessmentProject> {
+public interface IBaseStudentAssessmentProjectService extends MPJBaseService<BaseStudentAssessmentProject> {
 }

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

@@ -21,5 +21,5 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 */
 @Service
 @AllArgsConstructor
-public class BaseStudentAssessmentProjectServiceImpl extends ServiceImpl<BaseStudentAssessmentProjectMapper, BaseStudentAssessmentProject> implements IBaseStudentAssessmentProjectService {
+public class BaseStudentAssessmentProjectServiceImpl extends MPJBaseServiceImpl<BaseStudentAssessmentProjectMapper, BaseStudentAssessmentProject> implements IBaseStudentAssessmentProjectService {
 }

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

@@ -65,6 +65,11 @@ public class BaseStudentAssessmentProjectPageVo {
     */
     @ApiModelProperty("学生考核类别(base_student_assessment_category)")
     private Long baseStudentAssessmentCategoryId;
+    /**
+     * 学生考核类别名称(base_student_assessment_category)
+     */
+    @ApiModelProperty("学生考核类别名称(base_student_assessment_category)")
+    private String baseStudentAssessmentCategoryName;
     /**
     * 名称
     */

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

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.student.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -38,11 +39,13 @@ public class BaseStudentPunishmentInfoVo {
     * 处分开始日期
     */
     @ApiModelProperty("处分开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
     /**
     * 处分结束日期
     */
     @ApiModelProperty("处分结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
     /**
     * 是否公示(1:是 0:否)