/student/schoolRollReason/list 学籍异动原因列表(不分页) 新增

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

@@ -16,6 +16,7 @@ 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.AddSchoolRollCategoryDto;
+import com.xjrsoft.module.student.dto.SchoolRollCategoryListDto;
 import com.xjrsoft.module.student.dto.UpdateSchoolRollCategoryDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
@@ -58,15 +59,14 @@ public class SchoolRollCategoryController {
     @GetMapping(value = "/list")
     @ApiOperation(value="学籍异动类别列表(不分页)")
     @SaCheckPermission("schoolrollcategory:detail")
-    public RT<List<SchoolRollCategoryVo>> list(@Valid SchoolRollCategoryPageDto dto){
-        MPJBaseJoin<SchoolRollCategory> queryWrapper =  MPJWrappers.<SchoolRollCategory>lambdaJoin()
-                .select(SchoolRollCategory::getId)
+    public RT<List<SchoolRollCategoryVo>> list(@Valid SchoolRollCategoryListDto dto){
+        MPJLambdaWrapper<SchoolRollCategory> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.select(SchoolRollCategory::getId)
                 .selectAs(DictionaryDetail::getName,SchoolRollCategoryVo::getScholarshipSourceCN)
                 .select(SchoolRollCategory.class, x -> VoToColumnUtil.fieldsToColumns(SchoolRollCategoryVo.class).contains(x.getProperty()))
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, SchoolRollCategory::getScholarshipSource)
                 .orderByDesc(SchoolRollCategory::getId);
         List<SchoolRollCategoryVo> list = schoolRollCategoryService.selectJoinList(SchoolRollCategoryVo.class, queryWrapper);
-
         return RT.ok(list);
     }
 
@@ -75,11 +75,13 @@ public class SchoolRollCategoryController {
     @SaCheckPermission("schoolrollcategory:detail")
     public RT<PageOutput<SchoolRollCategoryPageVo>> page(@Valid SchoolRollCategoryPageDto dto){
 
-        LambdaQueryWrapper<SchoolRollCategory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(SchoolRollCategory::getId)
-                .select(SchoolRollCategory.class,x -> VoToColumnUtil.fieldsToColumns(SchoolRollCategoryPageVo.class).contains(x.getProperty()));
-        IPage<SchoolRollCategory> page = schoolRollCategoryService.page(ConventPage.getPage(dto), queryWrapper);
+        MPJLambdaWrapper<SchoolRollCategory> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.select(SchoolRollCategory::getId)
+                .selectAs(DictionaryDetail::getName,SchoolRollCategoryPageVo::getScholarshipSourceCN)
+                .select(SchoolRollCategory.class, x -> VoToColumnUtil.fieldsToColumns(SchoolRollCategoryPageVo.class).contains(x.getProperty()))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, SchoolRollCategory::getScholarshipSource)
+                .orderByDesc(SchoolRollCategory::getId);
+        IPage<SchoolRollCategoryPageVo> page = schoolRollCategoryService.selectJoinListPage(ConventPage.getPage(dto),SchoolRollCategoryPageVo.class, queryWrapper);
         PageOutput<SchoolRollCategoryPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollCategoryPageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -6,6 +6,7 @@ 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.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
@@ -13,15 +14,19 @@ 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.AddSchoolRollReasonDto;
+import com.xjrsoft.module.student.dto.SchoolRollReasonListDto;
 import com.xjrsoft.module.student.dto.UpdateSchoolRollReasonDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
 import com.xjrsoft.module.student.dto.SchoolRollReasonPageDto;
+import com.xjrsoft.module.student.entity.SchoolRollCategory;
 import com.xjrsoft.module.student.entity.SchoolRollReason;
 import com.xjrsoft.module.student.service.ISchoolRollReasonService;
+import com.xjrsoft.module.student.vo.SchoolRollCategoryPageVo;
 import com.xjrsoft.module.student.vo.SchoolRollReasonPageVo;
 
 import com.xjrsoft.module.student.vo.SchoolRollReasonVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -42,20 +47,39 @@ import java.util.List;
 @Api(value = "/student"  + "/schoolRollReason",tags = "学籍异动原因代码")
 @AllArgsConstructor
 public class SchoolRollReasonController {
-
-
     private final ISchoolRollReasonService schoolRollReasonService;
 
+    @GetMapping(value = "/list")
+    @ApiOperation(value="学籍异动原因列表(不分页)")
+    @SaCheckPermission("schoolrollreason:detail")
+    public RT<List<SchoolRollReasonVo>> list(@Valid SchoolRollReasonListDto dto){
+
+        MPJLambdaWrapper<SchoolRollReason> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAs(SchoolRollReason::getId, SchoolRollReasonVo::getId)
+                .selectAs(SchoolRollCategory::getName, SchoolRollReasonVo::getSchoolRollCategoryIdCN)
+                .select(SchoolRollReason.class, x -> VoToColumnUtil.fieldsToColumns(SchoolRollReasonVo.class).contains(x.getProperty()))
+                .leftJoin(SchoolRollCategory.class, SchoolRollCategory::getId, SchoolRollReason::getSchoolRollCategoryId)
+                .eq(ObjectUtil.isNotNull(dto) && ObjectUtil.isNotNull(dto.getSchoolRollCategoryId()) && dto.getSchoolRollCategoryId() != "",SchoolRollReason::getSchoolRollCategoryId,dto.getSchoolRollCategoryId())
+                .orderByDesc(SchoolRollReason::getId);
+
+        List<SchoolRollReasonVo> list = schoolRollReasonService.selectJoinList(SchoolRollReasonVo.class, queryWrapper);
+        return RT.ok(list);
+    }
+
     @GetMapping(value = "/page")
     @ApiOperation(value="学籍异动原因列表(分页)")
     @SaCheckPermission("schoolrollreason:detail")
     public RT<PageOutput<SchoolRollReasonPageVo>> page(@Valid SchoolRollReasonPageDto dto){
 
-        LambdaQueryWrapper<SchoolRollReason> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(SchoolRollReason::getId)
-                .select(SchoolRollReason.class,x -> VoToColumnUtil.fieldsToColumns(SchoolRollReasonPageVo.class).contains(x.getProperty()));
-        IPage<SchoolRollReason> page = schoolRollReasonService.page(ConventPage.getPage(dto), queryWrapper);
+        MPJLambdaWrapper<SchoolRollReason> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAs(SchoolRollReason::getId, SchoolRollReasonPageVo::getId)
+                .selectAs(SchoolRollCategory::getName, SchoolRollReasonPageVo::getSchoolRollCategoryIdCN)
+                .select(SchoolRollReason.class, x -> VoToColumnUtil.fieldsToColumns(SchoolRollReasonPageVo.class).contains(x.getProperty()))
+                .leftJoin(SchoolRollCategory.class, SchoolRollCategory::getId, SchoolRollReason::getSchoolRollCategoryId)
+                .eq(ObjectUtil.isNotNull(dto) && ObjectUtil.isNotNull(dto.getSchoolRollCategoryId()) && dto.getSchoolRollCategoryId() != "",SchoolRollReason::getSchoolRollCategoryId,dto.getSchoolRollCategoryId())
+                .orderByDesc(SchoolRollReason::getId);
+
+        IPage<SchoolRollReasonPageVo> page = schoolRollReasonService.selectJoinListPage(ConventPage.getPage(dto),SchoolRollReasonPageVo.class, queryWrapper);
         PageOutput<SchoolRollReasonPageVo> pageOutput = ConventPage.getPageOutput(page, SchoolRollReasonPageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 学籍异动类别不分页查询入参
+* @Author szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SchoolRollCategoryListDto implements Serializable {
+
+
+}

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

@@ -0,0 +1,27 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 学籍异动原因不分页查询入参
+* @Author szs
+* @Date: 2023-11-29
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SchoolRollReasonListDto implements Serializable {
+
+    /**
+     * 学籍异动类别ID(school_roll_category)
+     */
+    @ApiModelProperty("学籍异动类别ID(school_roll_category)")
+    private String schoolRollCategoryId;
+
+}

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

@@ -22,5 +22,10 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 public class SchoolRollReasonPageDto extends PageInput {
 
+    /**
+     * 学籍异动类别ID(school_roll_category)
+     */
+    @ApiModelProperty("学籍异动类别ID(school_roll_category)")
+    private String schoolRollCategoryId;
 
 }

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

@@ -26,26 +26,6 @@ public class SchoolRollReasonPageVo {
     @ApiModelProperty("主键编号")
     private String id;
     /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
     * 删除标记
     */
     @ApiModelProperty("删除标记")
@@ -70,6 +50,11 @@ public class SchoolRollReasonPageVo {
     */
     @ApiModelProperty("学籍异动类别ID(school_roll_category)")
     private Long schoolRollCategoryId;
+    /**
+     * 学籍异动类别ID中文(school_roll_category)
+     */
+    @ApiModelProperty("学籍异动类别ID中文(school_roll_category)")
+    private String schoolRollCategoryIdCN;
     /**
     * 备注
     */

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

@@ -38,6 +38,11 @@ public class SchoolRollReasonVo {
     */
     @ApiModelProperty("学籍异动类别ID(school_roll_category)")
     private Long schoolRollCategoryId;
+    /**
+     * 学籍异动类别ID中文(school_roll_category)
+     */
+    @ApiModelProperty("学籍异动类别中文ID(school_roll_category)")
+    private String schoolRollCategoryIdCN;
     /**
     * 备注
     */