1、修改入库记录表名等相关

2、增加教材管理-详情-领取记录

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

@@ -1,19 +1,14 @@
 package com.xjrsoft.module.textbook.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.textbook.dto.AddTextbookClassWarehouseDto;
-import com.xjrsoft.module.textbook.dto.UpdateTextbookClassWarehouseDto;
+import com.xjrsoft.module.textbook.dto.AddTextbookWarehouseRecordDto;
+import com.xjrsoft.module.textbook.dto.UpdateTextbookWarehouseRecordDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
@@ -21,19 +16,18 @@ import org.springframework.http.ResponseEntity;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 
-import com.xjrsoft.module.textbook.dto.TextbookClassWarehousePageDto;
-import com.xjrsoft.module.textbook.entity.TextbookClassWarehouse;
+import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
+import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
 import com.xjrsoft.module.textbook.service.ITextbookClassWarehouseService;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehousePageVo;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
 
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordVo;
 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;
 
 /**
@@ -54,45 +48,45 @@ public class TextbookClassWarehouseController {
     @GetMapping(value = "/page")
     @ApiOperation(value="教材入库列表(分页)")
     @SaCheckPermission("textbookclasswarehouse:detail")
-    public RT<PageOutput<TextbookClassWarehousePageVo>> page(@Valid TextbookClassWarehousePageDto dto){
+    public RT<PageOutput<TextbookWarehouseRecordPageVo>> page(@Valid TextbookWarehouseRecordPageDto dto){
 
-        LambdaQueryWrapper<TextbookClassWarehouse> queryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<TextbookWarehouseRecord> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
-                    .orderByDesc(TextbookClassWarehouse::getId)
-                .select(TextbookClassWarehouse.class,x -> VoToColumnUtil.fieldsToColumns(TextbookClassWarehousePageVo.class).contains(x.getProperty()));
-        IPage<TextbookClassWarehouse> page = textbookClassWarehouseService.page(ConventPage.getPage(dto), queryWrapper);
-        PageOutput<TextbookClassWarehousePageVo> pageOutput = ConventPage.getPageOutput(page, TextbookClassWarehousePageVo.class);
+                    .orderByDesc(TextbookWarehouseRecord::getId)
+                .select(TextbookWarehouseRecord.class, x -> VoToColumnUtil.fieldsToColumns(TextbookWarehouseRecordPageVo.class).contains(x.getProperty()));
+        IPage<TextbookWarehouseRecord> page = textbookClassWarehouseService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<TextbookWarehouseRecordPageVo> pageOutput = ConventPage.getPageOutput(page, TextbookWarehouseRecordPageVo.class);
         return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询教材入库信息")
     @SaCheckPermission("textbookclasswarehouse:detail")
-    public RT<TextbookClassWarehouseVo> info(@RequestParam Long id){
-        TextbookClassWarehouse textbookClassWarehouse = textbookClassWarehouseService.getById(id);
-        if (textbookClassWarehouse == null) {
+    public RT<TextbookWarehouseRecordVo> info(@RequestParam Long id){
+        TextbookWarehouseRecord textbookWarehouseRecord = textbookClassWarehouseService.getById(id);
+        if (textbookWarehouseRecord == null) {
            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(textbookClassWarehouse, TextbookClassWarehouseVo.class));
+        return RT.ok(BeanUtil.toBean(textbookWarehouseRecord, TextbookWarehouseRecordVo.class));
     }
 
 
     @PostMapping
     @ApiOperation(value = "新增教材入库")
     @SaCheckPermission("textbookclasswarehouse:add")
-    public RT<Boolean> add(@Valid @RequestBody AddTextbookClassWarehouseDto dto){
-        TextbookClassWarehouse textbookClassWarehouse = BeanUtil.toBean(dto, TextbookClassWarehouse.class);
-        boolean isSuccess = textbookClassWarehouseService.save(textbookClassWarehouse);
+    public RT<Boolean> add(@Valid @RequestBody AddTextbookWarehouseRecordDto dto){
+        TextbookWarehouseRecord textbookWarehouseRecord = BeanUtil.toBean(dto, TextbookWarehouseRecord.class);
+        boolean isSuccess = textbookClassWarehouseService.save(textbookWarehouseRecord);
     return RT.ok(isSuccess);
     }
 
     @PutMapping
     @ApiOperation(value = "修改教材入库")
     @SaCheckPermission("textbookclasswarehouse:edit")
-    public RT<Boolean> update(@Valid @RequestBody UpdateTextbookClassWarehouseDto dto){
+    public RT<Boolean> update(@Valid @RequestBody UpdateTextbookWarehouseRecordDto dto){
 
-        TextbookClassWarehouse textbookClassWarehouse = BeanUtil.toBean(dto, TextbookClassWarehouse.class);
-        return RT.ok(textbookClassWarehouseService.updateById(textbookClassWarehouse));
+        TextbookWarehouseRecord textbookWarehouseRecord = BeanUtil.toBean(dto, TextbookWarehouseRecord.class);
+        return RT.ok(textbookClassWarehouseService.updateById(textbookWarehouseRecord));
 
     }
 
@@ -106,10 +100,10 @@ public class TextbookClassWarehouseController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid TextbookClassWarehousePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
-        List<TextbookClassWarehousePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookClassWarehousePageVo>) page(dto).getData()).getList();
+    public ResponseEntity<byte[]> exportData(@Valid TextbookWarehouseRecordPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<TextbookWarehouseRecordPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookWarehouseRecordPageVo>) page(dto).getData()).getList();
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
-        EasyExcel.write(bot, TextbookClassWarehousePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+        EasyExcel.write(bot, TextbookWarehouseRecordPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
 
         return RT.fileStream(bot.toByteArray(), "TextbookClassWarehouse" + ExcelTypeEnum.XLSX.getValue());
     }

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

@@ -8,17 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.module.textbook.dto.AddTextbookClassWarehouseDto;
+import com.xjrsoft.module.textbook.dto.AddTextbookWarehouseRecordDto;
 import com.xjrsoft.module.textbook.dto.AddTextbookDto;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.dto.UpdateTextbookDto;
 import com.xjrsoft.module.textbook.entity.Textbook;
 import com.xjrsoft.module.textbook.service.ITextbookService;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseListVo;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordListVo;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
 import com.xjrsoft.module.textbook.vo.TextbookVo;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimListVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -91,8 +92,8 @@ public class TextbookController {
     @GetMapping(value = "/info-warehouse-list")
     @ApiOperation(value="教材管理-详情-入库记录")
     @SaCheckPermission("textbook:detail")
-    public RT<List<TextbookClassWarehouseListVo>> warehouseList(@RequestParam Long id){
-        List<TextbookClassWarehouseListVo> result = textbookService.warehouseList(id);
+    public RT<List<TextbookWarehouseRecordListVo>> warehouseList(@RequestParam Long id){
+        List<TextbookWarehouseRecordListVo> result = textbookService.warehouseList(id);
         if (result == null) {
             return RT.error("找不到此数据！");
         }
@@ -110,6 +111,17 @@ public class TextbookController {
         return RT.ok(result);
     }
 
+    @GetMapping(value = "/info-claim-list")
+    @ApiOperation(value="教材管理-详情-领取记录")
+    @SaCheckPermission("textbook:detail")
+    public RT<List<WfTextbookClaimListVo>> claimList(@RequestParam Long id){
+        List<WfTextbookClaimListVo> result = textbookService.claimList(id);
+        if (result == null) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(result);
+    }
+
 
     @PostMapping
     @ApiOperation(value = "新增教材管理")
@@ -151,7 +163,7 @@ public class TextbookController {
     @PostMapping("deliver-warehouse")
     @ApiOperation(value = "教材管理入库")
     @SaCheckPermission("textbook:add")
-    public RT<Boolean> deliverWarehouse(@Valid @RequestBody AddTextbookClassWarehouseDto dto){
+    public RT<Boolean> deliverWarehouse(@Valid @RequestBody AddTextbookWarehouseRecordDto dto){
         Boolean isSuccess = textbookService.deliverWarehouse(dto);
         return RT.ok(isSuccess);
     }

src/main/java/com/xjrsoft/module/textbook/dto/AddTextbookClassWarehouseDto.java → src/main/java/com/xjrsoft/module/textbook/dto/AddTextbookWarehouseRecordDto.java

@@ -3,14 +3,8 @@ package com.xjrsoft.module.textbook.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;
-
 
 
 /**
@@ -20,7 +14,7 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-public class AddTextbookClassWarehouseDto implements Serializable {
+public class AddTextbookWarehouseRecordDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,26 +0,0 @@
-package com.xjrsoft.module.textbook.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-26
-* @Version 1.0
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class TextbookClassWarehousePageDto extends PageInput {
-
-
-}

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

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.textbook.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 教材入库分页查询入参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TextbookWarehouseRecordPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/UpdateTextbookClassWarehouseDto.java → src/main/java/com/xjrsoft/module/textbook/dto/UpdateTextbookWarehouseRecordDto.java

@@ -2,15 +2,6 @@ package com.xjrsoft.module.textbook.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;
-
 
 
 /**
@@ -20,7 +11,7 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-public class UpdateTextbookClassWarehouseDto extends AddTextbookClassWarehouseDto {
+public class UpdateTextbookWarehouseRecordDto extends AddTextbookWarehouseRecordDto {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/xjrsoft/module/textbook/entity/TextbookClassWarehouse.java → src/main/java/com/xjrsoft/module/textbook/entity/TextbookWarehouseRecord.java

@@ -5,15 +5,11 @@ 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;
 
 
@@ -24,9 +20,9 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-@TableName("textbook_class_warehouse")
-@ApiModel(value = "textbook_class_warehouse", description = "教材入库")
-public class TextbookClassWarehouse implements Serializable {
+@TableName("textbook_warehouse_record")
+@ApiModel(value = "textbook_warehouse_record", description = "教材入库")
+public class TextbookWarehouseRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -5,13 +5,13 @@ import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.entity.Textbook;
 import com.xjrsoft.module.textbook.entity.TextbookClassRelation;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseListVo;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordListVo;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
 import com.xjrsoft.module.textbook.vo.TextbookVo;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimListVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -61,7 +61,7 @@ public interface TextbookMapper extends MPJBaseMapper<Textbook> {
      * @param id
      * @return
      */
-    List<TextbookClassWarehouseListVo> warehouseList(Long id);
+    List<TextbookWarehouseRecordListVo> warehouseList(Long id);
 
 
     List<TextbookClassRelation> getClassRelation(Long id);
@@ -73,4 +73,11 @@ public interface TextbookMapper extends MPJBaseMapper<Textbook> {
      */
     List<TextbookIssueRecordListVo> issueList(Long id);
 
+    /**
+     * 领取记录
+     * @param id
+     * @return
+     */
+    List<WfTextbookClaimListVo> claimList(Long id);
+
 }

src/main/java/com/xjrsoft/module/textbook/mapper/TextbookClassWarehouseMapper.java → src/main/java/com/xjrsoft/module/textbook/mapper/TextbookWarehouseRecordMapper.java

@@ -1,8 +1,7 @@
 package com.xjrsoft.module.textbook.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.textbook.entity.TextbookClassWarehouse;
+import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface TextbookClassWarehouseMapper extends MPJBaseMapper<TextbookClassWarehouse> {
+public interface TextbookWarehouseRecordMapper extends MPJBaseMapper<TextbookWarehouseRecord> {
 
 }

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

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.textbook.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.textbook.entity.TextbookClassWarehouse;
-import lombok.Data;
-import java.util.List;
+import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
 
 /**
 * @title: 教材入库
@@ -13,5 +10,5 @@ import java.util.List;
 * @Version 1.0
 */
 
-public interface ITextbookClassWarehouseService extends MPJBaseService<TextbookClassWarehouse> {
+public interface ITextbookClassWarehouseService extends MPJBaseService<TextbookWarehouseRecord> {
 }

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

@@ -2,17 +2,16 @@ package com.xjrsoft.module.textbook.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.textbook.dto.AddTextbookClassWarehouseDto;
+import com.xjrsoft.module.textbook.dto.AddTextbookWarehouseRecordDto;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.entity.Textbook;
 import com.xjrsoft.module.textbook.entity.TextbookClassRelation;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseListVo;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordListVo;
 import com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
-import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
 import com.xjrsoft.module.textbook.vo.TextbookVo;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimListVo;
 
 import java.util.List;
 
@@ -77,14 +76,14 @@ public interface ITextbookService extends MPJBaseService<Textbook> {
      * @param dto
      * @return
      */
-    Boolean deliverWarehouse(AddTextbookClassWarehouseDto dto);
+    Boolean deliverWarehouse(AddTextbookWarehouseRecordDto dto);
 
     /**
      * 入库记录
      * @param id
      * @return
      */
-    List<TextbookClassWarehouseListVo> warehouseList(Long id);
+    List<TextbookWarehouseRecordListVo> warehouseList(Long id);
 
 
     List<TextbookClassRelation> getClassRelation(Long id);
@@ -95,4 +94,11 @@ public interface ITextbookService extends MPJBaseService<Textbook> {
      * @return
      */
     List<TextbookIssueRecordListVo> issueList(Long id);
+
+    /**
+     * 领取记录
+     * @param id
+     * @return
+     */
+    List<WfTextbookClaimListVo> claimList(Long id);
 }

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

@@ -1,17 +1,11 @@
 package com.xjrsoft.module.textbook.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.module.textbook.entity.TextbookClassWarehouse;
-import com.xjrsoft.module.textbook.mapper.TextbookClassWarehouseMapper;
+import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
+import com.xjrsoft.module.textbook.mapper.TextbookWarehouseRecordMapper;
 import com.xjrsoft.module.textbook.service.ITextbookClassWarehouseService;
 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: 教材入库
@@ -21,5 +15,5 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 */
 @Service
 @AllArgsConstructor
-public class TextbookClassWarehouseServiceImpl extends MPJBaseServiceImpl<TextbookClassWarehouseMapper, TextbookClassWarehouse> implements ITextbookClassWarehouseService {
+public class TextbookClassWarehouseServiceImpl extends MPJBaseServiceImpl<TextbookWarehouseRecordMapper, TextbookWarehouseRecord> implements ITextbookClassWarehouseService {
 }

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

@@ -10,16 +10,27 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.service.IBaseClassService;
-import com.xjrsoft.module.textbook.dto.AddTextbookClassWarehouseDto;
+import com.xjrsoft.module.textbook.dto.AddTextbookWarehouseRecordDto;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
-import com.xjrsoft.module.textbook.entity.*;
+import com.xjrsoft.module.textbook.entity.Textbook;
+import com.xjrsoft.module.textbook.entity.TextbookClassRelation;
+import com.xjrsoft.module.textbook.entity.TextbookSubscriptionRecord;
+import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
+import com.xjrsoft.module.textbook.entity.WfTextbookSubscription;
+import com.xjrsoft.module.textbook.entity.WfTextbookSubscriptionItem;
 import com.xjrsoft.module.textbook.mapper.TextbookClassRelationMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookSubscriptionRecordMapper;
 import com.xjrsoft.module.textbook.service.ITextbookClassWarehouseService;
 import com.xjrsoft.module.textbook.service.ITextbookService;
 import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
-import com.xjrsoft.module.textbook.vo.*;
+import com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo;
+import com.xjrsoft.module.textbook.vo.TextbookPageVo;
+import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
+import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
+import com.xjrsoft.module.textbook.vo.TextbookVo;
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordListVo;
+import com.xjrsoft.module.textbook.vo.WfTextbookClaimListVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -166,7 +177,8 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
     @Override
     public Page<TextbookPageVo> getPage(Page<TextbookPageDto> page, TextbookPageDto dto) {
-        return textbookTextbookMapper.getPage(page, dto);
+        Page<TextbookPageVo> result = textbookTextbookMapper.getPage(page, dto);
+        return result;
     }
 
     @Override
@@ -262,8 +274,8 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
     }
 
     @Override
-    public List<TextbookClassWarehouseListVo> warehouseList(Long id) {
-        List<TextbookClassWarehouseListVo> result = textbookTextbookMapper.warehouseList(id);
+    public List<TextbookWarehouseRecordListVo> warehouseList(Long id) {
+        List<TextbookWarehouseRecordListVo> result = textbookTextbookMapper.warehouseList(id);
         if(!result.isEmpty()){
             return result;
         }
@@ -288,9 +300,18 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
         return new ArrayList<>();
     }
 
+    @Override
+    public List<WfTextbookClaimListVo> claimList(Long id) {
+        List<WfTextbookClaimListVo> result = textbookTextbookMapper.claimList(id);
+        if(!result.isEmpty()){
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
     @Override
     @Transactional
-    public Boolean deliverWarehouse(AddTextbookClassWarehouseDto dto) {
+    public Boolean deliverWarehouse(AddTextbookWarehouseRecordDto dto) {
         //根据id获取教材管理记录
         Textbook textbook = this.getById(dto.getTextbookId());
         if (ObjectUtil.isNull(textbook)) {
@@ -304,8 +325,8 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
         updateTextbook.setStock(oldStock + dto.getWarehouseNumber());
         boolean isSuccess = this.updateById(updateTextbook);
 
-        TextbookClassWarehouse textbookClassWarehouse = BeanUtil.toBean(dto, TextbookClassWarehouse.class);
-        isSuccess = textbookClassWarehouseService.save(textbookClassWarehouse);
+        TextbookWarehouseRecord textbookWarehouseRecord = BeanUtil.toBean(dto, TextbookWarehouseRecord.class);
+        isSuccess = textbookClassWarehouseService.save(textbookWarehouseRecord);
 
         return isSuccess;
     }

src/main/java/com/xjrsoft/module/textbook/vo/TextbookClassWarehouseListVo.java → src/main/java/com/xjrsoft/module/textbook/vo/TextbookWarehouseRecordListVo.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.textbook.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -13,7 +12,7 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-public class TextbookClassWarehouseListVo {
+public class TextbookWarehouseRecordListVo {
 
     /**
     * 主键编号

src/main/java/com/xjrsoft/module/textbook/vo/TextbookClassWarehousePageVo.java → src/main/java/com/xjrsoft/module/textbook/vo/TextbookWarehouseRecordPageVo.java

@@ -1,16 +1,10 @@
 package com.xjrsoft.module.textbook.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;
 
@@ -21,7 +15,7 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-public class TextbookClassWarehousePageVo {
+public class TextbookWarehouseRecordPageVo {
 
     /**
     * 主键编号

src/main/java/com/xjrsoft/module/textbook/vo/TextbookClassWarehouseVo.java → src/main/java/com/xjrsoft/module/textbook/vo/TextbookWarehouseRecordVo.java

@@ -3,11 +3,7 @@ package com.xjrsoft.module.textbook.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: 教材入库表单出参
@@ -16,7 +12,7 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-public class TextbookClassWarehouseVo {
+public class TextbookWarehouseRecordVo {
 
     /**
     * 主键编号

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

@@ -0,0 +1,48 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 教材申领分页列表出参
+* @Author szs
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class WfTextbookClaimListVo {
+
+    /**
+    * 学期
+    */
+    @ApiModelProperty("学期")
+    private String semesterName;
+    /**
+    * 领取人身份
+    */
+    @ApiModelProperty("领取人身份")
+    private String claimIdentity;
+    /**
+    * 班级
+    */
+    @ApiModelProperty("班级")
+    private String className;
+    /**
+     * 领取人员
+     */
+    @ApiModelProperty("领取人员")
+    private String name;
+    /**
+    * 学号/工号
+    */
+    @ApiModelProperty("学号/工号")
+    private String userName;
+
+    /**
+     * 领取时间
+     */
+    @ApiModelProperty("领取时间")
+    private Date claimDate;
+}

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

@@ -62,8 +62,8 @@
     <select id="getInfoByissn" resultType="com.xjrsoft.module.textbook.vo.TextbookVo">
         SELECT * FROM textbook WHERE delete_mark = 0 AND issn = #{issn} order by create_date desc limit 0,1
     </select>
-    <select id="warehouseList" resultType="com.xjrsoft.module.textbook.vo.TextbookClassWarehouseListVo">
-        SELECT t1.create_date AS warehouse_date,t2.name AS warehouse_user,t1.warehouse_number,t1.source FROM textbook_class_warehouse t1
+    <select id="warehouseList" resultType="com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordListVo">
+        SELECT t1.create_date AS warehouse_date,t2.name AS warehouse_user,t1.warehouse_number,t1.source FROM textbook_warehouse_record t1
         LEFT JOIN xjr_user t2 ON t1.create_user_id = t2.id
         WHERE t1.delete_mark = 0 AND t1.textbook_id = #{id} order by t1.sort_code
     </select>
@@ -73,6 +73,17 @@
         LEFT JOIN wf_textbook_claim_item t3 ON t1.wf_textbook_claim_item_id = t3.id
         WHERE t1.delete_mark = 0 AND t3.textbook_id = #{id} ORDER BY t1.sort_code;
     </select>
+    <select id="claimList" resultType="com.xjrsoft.module.textbook.vo.WfTextbookClaimListVo">
+        SELECT t2.name AS semester_name,t5.name AS claim_identity,t3.name AS class_name,t5.name,t5.user_name,t4.create_date FROM wf_textbook_claim t1
+        LEFT JOIN base_semester t2 ON t1.base_semester_id = t2.id
+        LEFT JOIN base_class t3 ON t1.class_id = t3.id
+        LEFT JOIN textbook_issue_record t4 ON t4.wf_textbook_claim_id = t1.id
+        LEFT JOIN xjr_user t5 ON t4.receive_user_id = t5.id
+        LEFT JOIN xjr_user_role_relation t6 ON t5.id = t6.user_id
+        LEFT JOIN xjr_role t7 ON t6.role_id = t7.id
+        LEFT JOIN wf_textbook_claim_item t8 ON t8.wf_textbook_claim_id = t1.id
+        where t1.delete_mark = 0 and t8.delete_mark = 0 and t8.textbook_id = #{id}
+    </select>
     <select id="getClassRelation" resultType="com.xjrsoft.module.textbook.entity.TextbookClassRelation">
         SELECT * FROM textbook_class_relation WHERE delete_mark = 0 AND textbook_id = #{id}
     </select>