教材详情-入库记录

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

@@ -13,6 +13,7 @@ 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.TextbookClassWarehouseVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
 import com.xjrsoft.module.textbook.vo.TextbookVo;
@@ -81,7 +82,7 @@ public class TextbookController {
     }
 
     @GetMapping(value = "/info-subscription-list")
-    @ApiOperation(value="查看详情信息-征订记录")
+    @ApiOperation(value="教材管理-详情-征订记录")
     @SaCheckPermission("textbook:detail")
     public RT<List<TextbookSubscriptionRecordVo>> subscriptionList(@RequestParam Long id){
         List<TextbookSubscriptionRecordVo> result = textbookService.subscriptionList(id);
@@ -91,6 +92,17 @@ public class TextbookController {
         return RT.ok(result);
     }
 
+    @GetMapping(value = "/info-warehouse-list")
+    @ApiOperation(value="教材管理-详情-入库记录")
+    @SaCheckPermission("textbook:detail")
+    public RT<List<TextbookClassWarehouseVo>> warehouseList(@RequestParam Long id){
+        List<TextbookClassWarehouseVo> result = textbookService.warehouseList(id);
+        if (result == null) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(result);
+    }
+
 
     @PostMapping
     @ApiOperation(value = "新增教材管理")

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

@@ -0,0 +1,89 @@
+package com.xjrsoft.module.textbook.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 教材教辅班级引用
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+@TableName("textbook_class_warehouse")
+@ApiModel(value = "textbook_class_warehouse", description = "教材教辅出库记录")
+public class TextbookClassWarehouse 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;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 教材管理编号
+    */
+    @ApiModelProperty("教材管理编号")
+    private Long textbookId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.vo.TextbookClassWarehouseVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
@@ -47,10 +48,16 @@ public interface TextbookMapper extends MPJBaseMapper<Textbook> {
     List<TextbookSubscriptionClassVo> getClassInfo(List<String> ids);
     /**
      * 根据书号查询最新一条信息
-     * @param isnn
+     * @param issn
      * @return
      */
     TextbookVo getInfoByissn(String issn);
 
+    /**
+     * 入库记录
+     * @param id
+     * @return
+     */
+    List<TextbookClassWarehouseVo> warehouseList(Long id);
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.entity.Textbook;
+import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
@@ -67,4 +68,11 @@ public interface ITextbookService extends MPJBaseService<Textbook> {
      */
     TextbookVo getInfoByissn(String issn);
 
+    /**
+     * 入库记录
+     * @param id
+     * @return
+     */
+    List<TextbookClassWarehouseVo> warehouseList(Long id);
+
 }

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

@@ -13,6 +13,7 @@ import com.xjrsoft.module.textbook.mapper.TextbookMapper;
 import com.xjrsoft.module.textbook.mapper.TextbookSubscriptionRecordMapper;
 import com.xjrsoft.module.textbook.service.ITextbookService;
 import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
+import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
@@ -224,5 +225,10 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
         return textbookTextbookMapper.getInfoByissn(issn);
     }
 
+    @Override
+    public List<TextbookClassWarehouseVo> warehouseList(Long id) {
+        return textbookTextbookMapper.warehouseList(id);
+    }
+
 
 }

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

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.textbook.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 教材教辅征订记录表单出参
+* @Author szs
+* @Date: 2023-12-25
+* @Version 1.0
+*/
+@Data
+public class TextbookClassWarehouseVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("入库时间")
+    private Date warehouseDate;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("入库人")
+    private String warehouseUser;
+
+    /**
+     * 国际标准刊号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("入库数量")
+    @ApiModelProperty("入库数量")
+    private Integer warehouseNumber;
+    /**
+     * 书名
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("来源")
+    @ApiModelProperty("来源")
+    private String source;
+
+}

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

@@ -44,7 +44,9 @@
     <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="isnnExist" resultType="java.lang.Integer">
-
+    <select id="warehouseList" resultType="com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo">
+        SELECT t1.warehouse_date,t2.name AS warehouse_user,t1.warehouse_number,t1.source FROM textbook_class_warehouse t1
+        LEFT JOIN xjr_user t2 IN t1.create_user_id = t2.id
+        WHERE t1.delete_mark = 0 AND t1.textbook_id = #{id} order by t1.sort_code
     </select>
 </mapper>