Browse Source

/student/basestudentpost/list 学生职务设置列表(不分页) 增加status字段判断,为职务分配学生页面中,当某一个职务停用时,不应该出现在职务列表中

phoenix 1 year ago
parent
commit
162dff1136

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseStudentPostController.java

@@ -71,9 +71,9 @@ public class BaseStudentPostController {
         LambdaQueryWrapper<BaseStudentPost> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                 .eq(ObjectUtil.isNotNull(dto.getLevel()), BaseStudentPost::getLevel, dto.getLevel())
+                .eq(BaseStudentPost::getStatus,0)
                 .orderByDesc(BaseStudentPost::getId)
-                .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostListVo.class).contains(x.getProperty()))
-                .select(BaseStudentPost::getId);
+                .select(BaseStudentPost.class,x -> VoToColumnUtil.fieldsToColumns(BaseStudentPostListVo.class).contains(x.getProperty()));
 
         List<BaseStudentPost> list = baseStudentPostService.list(queryWrapper);
         List<BaseStudentPostListVo> listVos = BeanUtil.copyToList(list, BaseStudentPostListVo.class);

+ 0 - 71
src/main/java/com/xjrsoft/module/student/vo/BaseStudentPostListVo.java

@@ -31,48 +31,6 @@ public class BaseStudentPostListVo {
     @ApiModelProperty("主键编号")
     private Long 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)
@@ -86,33 +44,4 @@ public class BaseStudentPostListVo {
     @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;
-
 }

+ 1 - 29
src/main/java/com/xjrsoft/module/student/vo/BaseStudentPostPageVo.java

@@ -29,35 +29,7 @@ public class BaseStudentPostPageVo {
     @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;
+    private Long id;
     /**
     * 删除标记
     */