Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/common/enums/ClaimTypeEnum.java

@@ -8,19 +8,14 @@ package com.xjrsoft.common.enums;
  */
 public enum ClaimTypeEnum {
     /**
-     * 笔记本
+     * 学生领取
      * */
-    ImStudent("im_student", "学生领取"),
+    ClaimStudent("claim_student", "学生领取"),
 
     /**
-     * 作业本
+     * 教师领取
      * */
-    ImTeacher("im_teacher", "教师领取"),
-
-    /**
-     * 笔记本
-     * */
-    ImRecede("im_recede", "退还");
+    ClaimTeacher("claim_teacher", "教师领取");
 
     final String code;
     final String value;

src/main/java/com/xjrsoft/common/enums/IssueModeEnum.java

@@ -8,14 +8,19 @@ package com.xjrsoft.common.enums;
  */
 public enum IssueModeEnum {
     /**
-     * 笔记本
+     * 学生
      * */
-    ClaimStudent("claim_student", "学生"),
+    Imtudent("im_student", "学生"),
 
     /**
-     * 作业本
+     * 教师
      * */
-    ClaimTeacher("claim_teacher", "教师");
+    ImTeacher("im_teacher", "教师"),
+
+    /**
+     * 退还
+     * */
+    ImRecede("im_recede", "退还");
 
     final String code;
     final String value;

src/main/java/com/xjrsoft/module/oa/dto/NewsPageDto.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.oa.dto;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -50,7 +49,6 @@ public class NewsPageDto extends PageInput {
      * 当前用户id
      */
     @ApiModelProperty(value = "当前用户id", hidden = true)
-    @JsonIgnore
     private Long loginId;
 
 }

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

@@ -0,0 +1,102 @@
+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.AddBaseClassMajorSetDto;
+import com.xjrsoft.module.student.dto.UpdateBaseClassMajorSetDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.student.dto.BaseClassMajorSetPageDto;
+import com.xjrsoft.module.student.entity.BaseClassMajorSet;
+import com.xjrsoft.module.student.service.IBaseClassMajorSetService;
+import com.xjrsoft.module.student.vo.BaseClassMajorSetPageVo;
+
+import com.xjrsoft.module.student.vo.BaseClassMajorSetVo;
+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 szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/student" + "/baseClassMajorSet")
+@Api(value = "/student"  + "/baseClassMajorSet",tags = "班级专业方向表代码")
+@AllArgsConstructor
+public class BaseClassMajorSetController {
+
+
+    private final IBaseClassMajorSetService baseClassMajorSetService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="班级专业方向表列表(分页)")
+    @SaCheckPermission("baseclassmajorset:detail")
+    public RT<PageOutput<BaseClassMajorSetPageVo>> page(@Valid BaseClassMajorSetPageDto dto){
+
+        LambdaQueryWrapper<BaseClassMajorSet> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BaseClassMajorSet::getId)
+                .select(BaseClassMajorSet.class,x -> VoToColumnUtil.fieldsToColumns(BaseClassMajorSetPageVo.class).contains(x.getProperty()));
+        IPage<BaseClassMajorSet> page = baseClassMajorSetService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BaseClassMajorSetPageVo> pageOutput = ConventPage.getPageOutput(page, BaseClassMajorSetPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询班级专业方向表信息")
+    @SaCheckPermission("baseclassmajorset:detail")
+    public RT<BaseClassMajorSetVo> info(@RequestParam Long id){
+        BaseClassMajorSet baseClassMajorSet = baseClassMajorSetService.getById(id);
+        if (baseClassMajorSet == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(baseClassMajorSet, BaseClassMajorSetVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增班级专业方向表")
+    @SaCheckPermission("baseclassmajorset:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBaseClassMajorSetDto dto){
+        BaseClassMajorSet baseClassMajorSet = BeanUtil.toBean(dto, BaseClassMajorSet.class);
+        boolean isSuccess = baseClassMajorSetService.save(baseClassMajorSet);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改班级专业方向表")
+    @SaCheckPermission("baseclassmajorset:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBaseClassMajorSetDto dto){
+
+        BaseClassMajorSet baseClassMajorSet = BeanUtil.toBean(dto, BaseClassMajorSet.class);
+        return RT.ok(baseClassMajorSetService.updateById(baseClassMajorSet));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除班级专业方向表")
+    @SaCheckPermission("baseclassmajorset:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(baseClassMajorSetService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,58 @@
+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 szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@Data
+public class AddBaseClassMajorSetDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 班级(base_class_major_set)
+    */
+    @ApiModelProperty("班级(base_class_major_set)")
+    private Long classId;
+    /**
+    * 专业方向(base_major_set)
+    */
+    @ApiModelProperty("专业方向(base_major_set)")
+    private Long majorSetId;
+    /**
+    * 计划人数
+    */
+    @ApiModelProperty("计划人数")
+    private Integer planTotalStudent;
+    /**
+    * 班级人数
+    */
+    @ApiModelProperty("班级人数")
+    private Integer totalStudent;
+    /**
+    * 男生人数
+    */
+    @ApiModelProperty("男生人数")
+    private Integer boyNum;
+    /**
+    * 女生人数
+    */
+    @ApiModelProperty("女生人数")
+    private Integer girlNum;
+
+}

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

@@ -0,0 +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 szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseClassMajorSetPageDto extends PageInput {
+
+
+}

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

@@ -0,0 +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 szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@Data
+public class UpdateBaseClassMajorSetDto extends AddBaseClassMajorSetDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+}

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

@@ -0,0 +1,108 @@
+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 szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@Data
+@TableName("base_class_major_set")
+@ApiModel(value = "base_class_major_set", description = "班级专业方向表")
+public class BaseClassMajorSet 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;
+    /**
+    * 班级(base_class_major_set)
+    */
+    @ApiModelProperty("班级(base_class_major_set)")
+    private Long classId;
+    /**
+    * 专业方向(base_major_set)
+    */
+    @ApiModelProperty("专业方向(base_major_set)")
+    private Long majorSetId;
+    /**
+    * 计划人数
+    */
+    @ApiModelProperty("计划人数")
+    private Integer planTotalStudent;
+    /**
+    * 班级人数
+    */
+    @ApiModelProperty("班级人数")
+    private Integer totalStudent;
+    /**
+    * 男生人数
+    */
+    @ApiModelProperty("男生人数")
+    private Integer boyNum;
+    /**
+    * 女生人数
+    */
+    @ApiModelProperty("女生人数")
+    private Integer girlNum;
+
+
+}

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

@@ -0,0 +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.BaseClassMajorSet;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 班级专业方向表
+* @Author szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@Mapper
+public interface BaseClassMajorSetMapper extends MPJBaseMapper<BaseClassMajorSet> {
+
+}

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

@@ -0,0 +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.BaseClassMajorSet;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 班级专业方向表
+* @Author szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+
+public interface IBaseClassMajorSetService extends MPJBaseService<BaseClassMajorSet> {
+}

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

@@ -0,0 +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.BaseClassMajorSet;
+import com.xjrsoft.module.student.mapper.BaseClassMajorSetMapper;
+import com.xjrsoft.module.student.service.IBaseClassMajorSetService;
+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 szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BaseClassMajorSetServiceImpl extends MPJBaseServiceImpl<BaseClassMajorSetMapper, BaseClassMajorSet> implements IBaseClassMajorSetService {
+}

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

@@ -0,0 +1,89 @@
+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 szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@Data
+public class BaseClassMajorSetPageVo {
+
+    /**
+    * 主键
+    */
+    @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;
+    /**
+    * 班级(base_class_major_set)
+    */
+    @ApiModelProperty("班级(base_class_major_set)")
+    private Long classId;
+    /**
+    * 专业方向(base_major_set)
+    */
+    @ApiModelProperty("专业方向(base_major_set)")
+    private Long majorSetId;
+    /**
+    * 计划人数
+    */
+    @ApiModelProperty("计划人数")
+    private Integer planTotalStudent;
+    /**
+    * 班级人数
+    */
+    @ApiModelProperty("班级人数")
+    private Integer totalStudent;
+    /**
+    * 男生人数
+    */
+    @ApiModelProperty("男生人数")
+    private Integer boyNum;
+    /**
+    * 女生人数
+    */
+    @ApiModelProperty("女生人数")
+    private Integer girlNum;
+
+}

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

@@ -0,0 +1,59 @@
+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 szs
+* @Date: 2023-12-28
+* @Version 1.0
+*/
+@Data
+public class BaseClassMajorSetVo {
+
+    /**
+    * 主键
+    */
+    @ApiModelProperty("主键")
+    private Long id;
+    /**
+    * 班级(base_class_major_set)
+    */
+    @ApiModelProperty("班级(base_class_major_set)")
+    private Long classId;
+    /**
+    * 专业方向(base_major_set)
+    */
+    @ApiModelProperty("专业方向(base_major_set)")
+    private Long majorSetId;
+    /**
+    * 计划人数
+    */
+    @ApiModelProperty("计划人数")
+    private Integer planTotalStudent;
+    /**
+    * 班级人数
+    */
+    @ApiModelProperty("班级人数")
+    private Integer totalStudent;
+    /**
+    * 男生人数
+    */
+    @ApiModelProperty("男生人数")
+    private Integer boyNum;
+    /**
+    * 女生人数
+    */
+    @ApiModelProperty("女生人数")
+    private Integer girlNum;
+
+
+
+}

src/main/java/com/xjrsoft/module/textbook/controller/TextbookStudentClaimController.java

@@ -8,15 +8,10 @@ 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.textbook.dto.AddTextbookStudentClaimDto;
-import com.xjrsoft.module.textbook.dto.TextbookClaimStudentConfirmDto;
-import com.xjrsoft.module.textbook.dto.TextbookStudentClaimPageDto;
-import com.xjrsoft.module.textbook.dto.UpdateTextbookStudentClaimDto;
+import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.TextbookStudentClaim;
 import com.xjrsoft.module.textbook.service.ITextbookStudentClaimService;
-import com.xjrsoft.module.textbook.vo.TextbookClaimStudentConfirmVo;
-import com.xjrsoft.module.textbook.vo.TextbookStudentClaimPageVo;
-import com.xjrsoft.module.textbook.vo.TextbookStudentClaimVo;
+import com.xjrsoft.module.textbook.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -61,6 +56,22 @@ public class TextbookStudentClaimController {
         return RT.ok(textbookClaimStudentConfirmVo);
     }
 
+    @GetMapping(value = "/student-semester-list")
+    @ApiOperation(value="学生教材领取学期页面")
+    @SaCheckPermission("textbookstudentclaim:detail")
+    public RT<List<TextbookStudentSemesterVo>> studentSemesterList(){
+        List<TextbookStudentSemesterVo> textbookStudentSemesterVoList = textbookStudentClaimService.getStudentSemesterList();
+        return RT.ok(textbookStudentSemesterVoList);
+    }
+
+    @GetMapping(value = "/teacher-check-byclass-list")
+    @ApiOperation(value="教师教材领取按班级查看页面")
+    @SaCheckPermission("textbookstudentclaim:detail")
+    public RT<List<TeacherCheckByclassVo>> teacherCheckByclassList(TeacherCheckByclassDto dto){
+        List<TeacherCheckByclassVo> teacherCheckByclassList = textbookStudentClaimService.getTeacherCheckByclassList(dto);
+        return RT.ok(teacherCheckByclassList);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询学生教材认领记录信息")
     @SaCheckPermission("textbookstudentclaim:detail")
@@ -92,6 +103,14 @@ public class TextbookStudentClaimController {
 
     }
 
+    @PutMapping("/confirmat")
+    @ApiOperation(value = "学生确认领取")
+    @SaCheckPermission("textbookstudentclaim:edit")
+    public RT<Boolean> confirmat(@Valid @RequestBody List<Long> textbookStudentClaimIds){
+        return RT.ok(textbookStudentClaimService.updateByIds(textbookStudentClaimIds));
+    }
+
+
     @DeleteMapping
     @ApiOperation(value = "删除学生教材认领记录")
     @SaCheckPermission("textbookstudentclaim:delete")

src/main/java/com/xjrsoft/module/textbook/dto/TeacherCheckByclassDto.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.textbook.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+* @title: 教师教材领取按班级查看页面
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class TeacherCheckByclassDto{
+    /**
+     * 班级编号
+     */
+    @ApiModelProperty(value = "班级编号",hidden = true)
+    private Long classId;
+    /**
+     * 领取情况（1=全部数据，2=该教材全部领取，3=该教材部分未领取）
+     */
+    @ApiModelProperty("领取情况")
+    private Integer notclaimNum;
+}

src/main/java/com/xjrsoft/module/textbook/dto/TextbookClaimStudentConfirmDto.java

@@ -2,7 +2,6 @@ package com.xjrsoft.module.textbook.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 
 /**
@@ -12,12 +11,21 @@ import lombok.EqualsAndHashCode;
 * @Version 1.0
 */
 @Data
-@EqualsAndHashCode(callSuper = false)
 public class TextbookClaimStudentConfirmDto {
 
     /**
      * 学期ID(base_semester)
      */
-    @ApiModelProperty("学期ID(base_semester)")
+    @ApiModelProperty(value = "学期ID(base_semester)",required = true)
     private Long baseSemesterId;
+    /**
+     * 当前用户的id
+     */
+    @ApiModelProperty(value = "学期ID(base_semester)",hidden = true)
+    private Long studentUserId;
+    /**
+     * 查看还是确认（1 = 查看，2 = 确认）
+     */
+    @ApiModelProperty(value = "查看还是确认（1 = 查看，2 = 确认）",required = true)
+    private Integer showOrConfirm;
 }

src/main/java/com/xjrsoft/module/textbook/mapper/TextbookStudentClaimMapper.java

@@ -1,9 +1,13 @@
 package com.xjrsoft.module.textbook.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.textbook.dto.TextbookClaimStudentConfirmDto;
 import com.xjrsoft.module.textbook.entity.TextbookStudentClaim;
+import com.xjrsoft.module.textbook.vo.TeacherCheckByclassVo;
 import com.xjrsoft.module.textbook.vo.TextbookClaimVO;
+import com.xjrsoft.module.textbook.vo.TextbookStudentSemesterVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,5 +20,9 @@ import java.util.List;
 @Mapper
 public interface TextbookStudentClaimMapper extends MPJBaseMapper<TextbookStudentClaim> {
 
-    List<TextbookClaimVO> queryTextbookClaimList(Long baseSemesterId, Long studentUserId);
+    List<TextbookClaimVO> getTextbookClaimList(@Param("dto")TextbookClaimStudentConfirmDto dto);
+
+    List<TeacherCheckByclassVo> getTeacherCheckByclassList(Long classId);
+
+    List<TextbookStudentSemesterVo> getStudentSemesterList(Long studentUserId);
 }

src/main/java/com/xjrsoft/module/textbook/service/ITextbookStudentClaimService.java

@@ -1,9 +1,14 @@
 package com.xjrsoft.module.textbook.service;
 
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.dto.TeacherCheckByclassDto;
 import com.xjrsoft.module.textbook.dto.TextbookClaimStudentConfirmDto;
 import com.xjrsoft.module.textbook.entity.TextbookStudentClaim;
+import com.xjrsoft.module.textbook.vo.TeacherCheckByclassVo;
 import com.xjrsoft.module.textbook.vo.TextbookClaimStudentConfirmVo;
+import com.xjrsoft.module.textbook.vo.TextbookStudentSemesterVo;
+
+import java.util.List;
 
 /**
 * @title: 学生教材认领记录
@@ -20,4 +25,10 @@ public interface ITextbookStudentClaimService extends MPJBaseService<TextbookStu
      * @return
      */
     TextbookClaimStudentConfirmVo  getStudentConfirmList(TextbookClaimStudentConfirmDto dto);
+
+    List<TextbookStudentSemesterVo> getStudentSemesterList();
+
+    List<TeacherCheckByclassVo> getTeacherCheckByclassList(TeacherCheckByclassDto dto);
+
+    Boolean updateByIds(List<Long> textbookStudentClaimIds);
 }

src/main/java/com/xjrsoft/module/textbook/service/IWfTextbookClaimService.java

@@ -18,6 +18,7 @@ import java.util.List;
 */
 
 public interface IWfTextbookClaimService extends MPJBaseService<WfTextbookClaim> {
+
     /**
     * 新增
     *

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookStudentClaimServiceImpl.java

@@ -2,26 +2,38 @@ package com.xjrsoft.module.textbook.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.enums.ClaimTypeEnum;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseSemester;
+import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseSemesterService;
 import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.teacher.entity.AttendanceRecord;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
+import com.xjrsoft.module.textbook.dto.TeacherCheckByclassDto;
 import com.xjrsoft.module.textbook.dto.TextbookClaimStudentConfirmDto;
 import com.xjrsoft.module.textbook.entity.TextbookStudentClaim;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaim;
+import com.xjrsoft.module.textbook.entity.WfTextbookClaimItem;
 import com.xjrsoft.module.textbook.mapper.TextbookStudentClaimMapper;
+import com.xjrsoft.module.textbook.mapper.WfTextbookClaimItemMapper;
+import com.xjrsoft.module.textbook.mapper.WfTextbookClaimMapper;
 import com.xjrsoft.module.textbook.service.ITextbookStudentClaimService;
+import com.xjrsoft.module.textbook.vo.TeacherCheckByclassVo;
 import com.xjrsoft.module.textbook.vo.TextbookClaimStudentConfirmVo;
 import com.xjrsoft.module.textbook.vo.TextbookClaimVO;
+import com.xjrsoft.module.textbook.vo.TextbookStudentSemesterVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,6 +51,12 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
     private final TextbookStudentClaimMapper textbookStudentClaimMapper;
     private final IBaseSemesterService baseSemesterService;
 
+    private final IBaseClassService baseClassService;
+
+    private final WfTextbookClaimMapper wfTextbookClaimMapper;
+
+    private final WfTextbookClaimItemMapper wfTextbookClaimItemMapper;
+
     @Override
     public TextbookClaimStudentConfirmVo getStudentConfirmList(TextbookClaimStudentConfirmDto dto) {
         //判断输入的合法性
@@ -85,8 +103,91 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
                 .orderByDesc(AttendanceRecord::getId);
         List<TextbookClaimVO> textbookClaimVOList = this.selectJoinList(TextbookClaimVO.class, queryTextbookClaimList);
         textbookClaimStudentConfirmVo.setTextbookClaimVoList(textbookClaimVOList);*/
-        List<TextbookClaimVO> textbookClaimVOList = textbookStudentClaimMapper.queryTextbookClaimList(dto.getBaseSemesterId(),StpUtil.getLoginIdAsLong());
+
+        dto.setStudentUserId(StpUtil.getLoginIdAsLong());
+
+        List<TextbookClaimVO> textbookClaimVOList = textbookStudentClaimMapper.getTextbookClaimList(dto);
+
         textbookClaimStudentConfirmVo.setTextbookClaimVoList(textbookClaimVOList);
         return textbookClaimStudentConfirmVo;
     }
+
+    @Override
+    public List<TextbookStudentSemesterVo> getStudentSemesterList() {
+        return textbookStudentClaimMapper.getStudentSemesterList(StpUtil.getLoginIdAsLong());
+    }
+
+    @Override
+    public List<TeacherCheckByclassVo> getTeacherCheckByclassList(TeacherCheckByclassDto dto) {
+        //根据当前班主任用户查出所管理的班级Id
+        LambdaQueryWrapper<BaseClass> queryWrapperClassId = new LambdaQueryWrapper<>();
+        queryWrapperClassId
+                .eq(BaseClass::getTeacherId,StpUtil.getLoginIdAsLong());
+        BaseClass baseClass = baseClassService.getOne(queryWrapperClassId);
+        if(ObjectUtil.isNull(baseClass)){
+            throw new MyException("班级信息获取失败");
+        }
+        Long classId = baseClass.getId();
+
+        dto.setClassId(classId);
+
+        //将班上所有发放的教材进行分组,查询出list集合
+        List<TeacherCheckByclassVo> teacherCheckByclassVoList = textbookStudentClaimMapper.getTeacherCheckByclassList(classId);
+
+        //实际领取教材数量
+        //根据班主任ID和班级ID找到所有班主任为该班申请的教材的所有申领记录，申领类型应该为学生
+        LambdaQueryWrapper<WfTextbookClaim> queryWrapperWfTextbookClaim = new LambdaQueryWrapper<>();
+        queryWrapperWfTextbookClaim
+                .eq(WfTextbookClaim::getApplicantUserId,StpUtil.getLoginIdAsLong())
+                .eq(WfTextbookClaim::getClaimType, ClaimTypeEnum.ClaimStudent.getCode())
+                .eq(WfTextbookClaim::getClassId,classId);
+        List<WfTextbookClaim> wfTextbookClaimList = wfTextbookClaimMapper.selectList(queryWrapperWfTextbookClaim);
+        if(ObjectUtil.isNull(wfTextbookClaimList) || wfTextbookClaimList.size() == 0){
+            throw new MyException("未找到教材申请数据");
+        }
+
+        List<Long> wfTextbookClaimIdList = new ArrayList<>();
+        for (WfTextbookClaim w : wfTextbookClaimList) {
+            wfTextbookClaimIdList.add(w.getId());
+        }
+
+        //根据申领记录ID找到其关联的所有申领项中当前教材的已经发放数量数据
+        for (TeacherCheckByclassVo t: teacherCheckByclassVoList) {
+            LambdaQueryWrapper<WfTextbookClaimItem> queryWrapperWfTextbookClaimItem = new LambdaQueryWrapper<>();
+            queryWrapperWfTextbookClaimItem
+                    .in(WfTextbookClaimItem::getWfTextbookClaimId,wfTextbookClaimIdList)
+                    .eq(WfTextbookClaimItem::getTextbookId, t.getTextbookId());
+            List<WfTextbookClaimItem> wfTextbookClaimItemList = wfTextbookClaimItemMapper.selectList(queryWrapperWfTextbookClaimItem);
+            Integer issueNumber =  0;
+            for (WfTextbookClaimItem w : wfTextbookClaimItemList) {
+                issueNumber += w.getIssueNumber();
+            }
+            t.setActualReceivedNum(issueNumber);
+        }
+
+        //已经确认领取人数
+        for (TeacherCheckByclassVo t: teacherCheckByclassVoList) {
+            LambdaQueryWrapper<TextbookStudentClaim> queryWrapperTextbookStudentClaimCount = new LambdaQueryWrapper<>();
+            queryWrapperTextbookStudentClaimCount
+                    .in(TextbookStudentClaim::getClassId,classId)
+                    .eq(TextbookStudentClaim::getTextbookId, t.getTextbookId())
+                    .eq(TextbookStudentClaim::getIsClaim, 1);
+            Long count = this.count(queryWrapperTextbookStudentClaimCount);
+            t.setActualClaimNum(count);
+        }
+
+        return teacherCheckByclassVoList;
+    }
+
+    @Override
+    @Transactional
+    public Boolean updateByIds(List<Long> textbookStudentClaimIds) {
+        for (Long textbookStudentClaimId : textbookStudentClaimIds) {
+            this.updateById(new TextbookStudentClaim(){{
+                setId(textbookStudentClaimId);
+                setIsClaim(1);
+            }});
+        }
+        return true;
+    }
 }

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookClaimServiceImpl.java

@@ -227,11 +227,11 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
                 setRemainingNumber(applicantNumber - issueNumber - confirmNumber);
                 setReceiveUserId(dto.getReceiveUserId());
                 setIssueUserId(StpUtil.getLoginIdAsLong());
-                if (ObjectUtil.isNotNull(wfTextbookClaim.getClaimType()) && wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ImStudent.getCode())) {
-                    setIssueMode(IssueModeEnum.ClaimStudent.getCode());
+                if (ObjectUtil.isNotNull(wfTextbookClaim.getClaimType()) && wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ClaimStudent.getCode())) {
+                    setIssueMode(IssueModeEnum.Imtudent.getCode());
                 }
-                if (ObjectUtil.isNotNull(wfTextbookClaim.getClaimType()) && wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ImTeacher.getCode())) {
-                    setIssueMode(IssueModeEnum.ClaimTeacher.getCode());
+                if (ObjectUtil.isNotNull(wfTextbookClaim.getClaimType()) && wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ClaimTeacher.getCode())) {
+                    setIssueMode(IssueModeEnum.ImTeacher.getCode());
                 }
                 setRemark(dto.getRemark());
             }});
@@ -251,7 +251,7 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
 
             //当申领类型为学生的时候,为班级每个学生生成领取（确认信息）认领记录
             //查出班上的所有学生id
-            if(ObjectUtil.isNotNull(wfTextbookClaim.getClaimType()) && wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ImStudent.getCode())){
+            if(ObjectUtil.isNotNull(wfTextbookClaim.getClaimType()) && wfTextbookClaim.getClaimType().equals(ClaimTypeEnum.ClaimStudent.getCode())){
                 List<Long> userIdList = xjrUserMapper.getUserIdByClassId(wfTextbookClaim.getClassId());
 
                 if (ObjectUtil.isNull(userIdList) && userIdList.size() <= 0) {

src/main/java/com/xjrsoft/module/textbook/vo/TeacherCheckByclassVo.java

@@ -0,0 +1,50 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 学生教材认领记录表单出参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class TeacherCheckByclassVo {
+
+    /**
+    * 教材主键编号
+    */
+    @ApiModelProperty("教材主键编号")
+    private Long textbookId;
+    /**
+     * 教材名称
+     */
+    @ApiModelProperty("教材名称")
+    private String bookName;
+    /**
+     * 学期id
+     */
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
+    /**
+     * 学期id
+     */
+    @ApiModelProperty("学期id")
+    private String baseSemesterIdCN;
+    /**
+    * 班级人数
+    */
+    @ApiModelProperty("班级人数")
+    private Integer classStudentNum;
+    /**
+     * 实际领取教材数量
+     */
+    @ApiModelProperty("实际领取教材数量")
+    private Integer actualReceivedNum;
+    /**
+     * 已经确认领取人数
+     */
+    @ApiModelProperty("已经确认领取人数")
+    private Long actualClaimNum;
+}

src/main/java/com/xjrsoft/module/textbook/vo/TextbookStudentClaimVo.java

@@ -31,7 +31,7 @@ public class TextbookStudentClaimVo {
      * 学期ID(base_semester)
      */
     @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterIdCN;
+    private String baseSemesterIdCN;
     /**
     * 班级编号
     */
@@ -41,7 +41,7 @@ public class TextbookStudentClaimVo {
      * 班级编号
      */
     @ApiModelProperty("班级编号")
-    private Long classIdCN;
+    private String classIdCN;
     /**
     * 学生用户编号
     */
@@ -51,7 +51,7 @@ public class TextbookStudentClaimVo {
      * 学生用户编号
      */
     @ApiModelProperty("学生用户编号")
-    private Long studentUserIdCN;
+    private String studentUserIdCN;
     /**
     * 教材管理编号
     */

src/main/java/com/xjrsoft/module/textbook/vo/TextbookStudentSemesterVo.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 学生教材认领学期分组出参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class TextbookStudentSemesterVo {
+
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+     * 学期ID(base_semester)
+     */
+    @ApiModelProperty("学期ID(base_semester)")
+    private String baseSemesterIdCN;
+    /**
+     * 该学生该学期未领取数量
+     */
+    @ApiModelProperty("该学生该学期未领取数量")
+    private Integer notClaimNum;
+
+}

src/main/resources/mapper/textbook/TextbookStudentClaimMapper.xml

@@ -3,20 +3,55 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.textbook.mapper.TextbookStudentClaimMapper">
-    <select id="queryTextbookClaimList"
+    <select id="getTextbookClaimList" parameterType="com.xjrsoft.module.textbook.dto.TextbookClaimStudentConfirmDto"
             resultType="com.xjrsoft.module.textbook.vo.TextbookClaimVO">
         SELECT t.id                   AS textbookStudentClaimId,
-               t1.price * t1.discount AS discountPrice,
-               t.sort_code as sortCode,
-               t.textbook_id as textbookId,
-               t.is_claim as isClaim,
-               t1.book_name as bookName,
-               t1.price as price
+        t1.price * t1.discount AS discountPrice,
+        t.sort_code as sortCode,
+        t.textbook_id as textbookId,
+        t.is_claim as isClaim,
+        t1.book_name as bookName,
+        t1.price as price
         FROM textbook_student_claim t
-                 LEFT JOIN textbook t1 ON (t1.id = t.textbook_id)
+        LEFT JOIN textbook t1 ON (t1.id = t.textbook_id)
         WHERE t.delete_mark = 0
-          AND (t.student_user_id = #{studentUserId})
-            AND (t.base_semester_id = #{baseSemesterId})
+        AND (t.student_user_id = #{dto.studentUserId})
+        AND (t.base_semester_id = #{dto.baseSemesterId})
+        <if test="dto.showOrConfirm != null and dto.showOrConfirm == 2">
+            and t.is_claim = 0
+        </if>
         ORDER BY t.id DESC
     </select>
+
+    <select id="getStudentSemesterList" parameterType="java.lang.Long"
+            resultType="com.xjrsoft.module.textbook.vo.TextbookStudentSemesterVo">
+        SELECT t.base_semester_id,
+               t1.name as baseSemesterIdCN,
+               count(*) as notClaimNum
+        FROM textbook_student_claim t
+                 LEFT JOIN base_semester t1 ON (t1.id = t.base_semester_id)
+                 LEFT JOIN (select base_semester_id
+                            from textbook_student_claim
+                            where student_user_id = #{studentUserId}
+                            GROUP BY base_semester_id) t2 ON (t2.base_semester_id = t.base_semester_id)
+        WHERE t.delete_mark = 0 and t.is_claim = 0
+          AND (t.student_user_id = #{studentUserId})
+        GROUP BY base_semester_id
+    </select>
+
+    <select id="getTeacherCheckByclassList" parameterType="java.lang.Long"
+            resultType="com.xjrsoft.module.textbook.vo.TeacherCheckByclassVo">
+        SELECT t.id               AS textbookId,
+               t.book_name        AS bookName,
+               t.base_semester_id AS baseSemesterId,
+               t3.name            AS baseSemesterIdCN,
+               t4.total_student   AS classStudentNum
+        FROM textbook t
+                 LEFT JOIN base_semester t3 ON (t3.id = t.base_semester_id)
+                 LEFT JOIN base_class_major_set t4 ON (t4.class_id = 567891198765118)
+        WHERE t.delete_mark = 0 and t.id in (SELECT textbook_id
+                                             FROM textbook_student_claim
+                                             WHERE delete_mark = 0 AND class_id = 567891198765118
+                                             GROUP BY textbook_id)
+    </select>
 </mapper>

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -1529,6 +1529,35 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    /**
+     * 学生班级详细信息维护
+     * @throws IOException
+     */
+    @Test
+    public void gcBaseClassMajorSet() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_class_major_set");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
     /**
      * 寝室维护
      * @throws IOException