1、教材管理-详情-入库记录

2、教材管理-详情-出库记录

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

@@ -13,7 +13,8 @@ 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.TextbookClassWarehouseListVo;
+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;
@@ -96,8 +97,19 @@ public class TextbookController {
     @GetMapping(value = "/info-warehouse-list")
     @ApiOperation(value="教材管理-详情-入库记录")
     @SaCheckPermission("textbook:detail")
-    public RT<List<TextbookClassWarehouseVo>> warehouseList(@RequestParam Long id){
-        List<TextbookClassWarehouseVo> result = textbookService.warehouseList(id);
+    public RT<List<TextbookClassWarehouseListVo>> warehouseList(@RequestParam Long id){
+        List<TextbookClassWarehouseListVo> result = textbookService.warehouseList(id);
+        if (result == null) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(result);
+    }
+
+    @GetMapping(value = "/info-issue-list")
+    @ApiOperation(value="教材管理-详情-出库记录")
+    @SaCheckPermission("textbook:detail")
+    public RT<List<TextbookIssueRecordListVo>> issueList(@RequestParam Long id){
+        List<TextbookIssueRecordListVo> result = textbookService.issueList(id);
         if (result == null) {
             return RT.error("找不到此数据！");
         }

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

@@ -23,15 +23,21 @@ import java.util.Date;
 public class TextbookPageDto extends PageInput {
 
     @ApiModelProperty("教材类型")
-    public String textbook_type;
+    public String textbookType;
 
     @ApiModelProperty("学期id")
-    public Long base_semester_id;
+    public Long baseSemesterId;
 
     @ApiModelProperty("学科id")
-    public Long subject_group_id;
+    public Long subjectGroupId;
 
     @ApiModelProperty("课程id")
-    public Long course_subject_id;
+    public Long courseSubjectId;
+
+    @ApiModelProperty("书名")
+    public String bookName;
+
+    @ApiModelProperty("书号")
+    public String isTextbookPlan;
 
 }

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

@@ -5,7 +5,9 @@ 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.TextbookIssueRecordListVo;
 import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionClassVo;
 import com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo;
@@ -59,9 +61,16 @@ public interface TextbookMapper extends MPJBaseMapper<Textbook> {
      * @param id
      * @return
      */
-    List<TextbookClassWarehouseVo> warehouseList(Long id);
+    List<TextbookClassWarehouseListVo> warehouseList(Long id);
 
 
     List<TextbookClassRelation> getClassRelation(Long id);
 
+    /**
+     * 入库记录
+     * @param id
+     * @return
+     */
+    List<TextbookIssueRecordListVo> issueList(Long id);
+
 }

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

@@ -5,7 +5,9 @@ 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.entity.TextbookClassRelation;
+import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseListVo;
 import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
+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;
@@ -74,8 +76,15 @@ public interface ITextbookService extends MPJBaseService<Textbook> {
      * @param id
      * @return
      */
-    List<TextbookClassWarehouseVo> warehouseList(Long id);
+    List<TextbookClassWarehouseListVo> warehouseList(Long id);
 
 
     List<TextbookClassRelation> getClassRelation(Long id);
+
+    /**
+     * 入库记录
+     * @param id
+     * @return
+     */
+    List<TextbookIssueRecordListVo> issueList(Long id);
 }

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

@@ -10,13 +10,18 @@ import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.base.service.IBaseClassService;
 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.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.ITextbookService;
 import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
-import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseVo;
+import com.xjrsoft.module.textbook.vo.TextbookClassWarehouseListVo;
+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;
@@ -247,8 +252,12 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
     }
 
     @Override
-    public List<TextbookClassWarehouseVo> warehouseList(Long id) {
-        return textbookTextbookMapper.warehouseList(id);
+    public List<TextbookClassWarehouseListVo> warehouseList(Long id) {
+        List<TextbookClassWarehouseListVo> result = textbookTextbookMapper.warehouseList(id);
+        if(!result.isEmpty()){
+            return result;
+        }
+        return new ArrayList<>();
     }
 
     @Override
@@ -260,5 +269,14 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
         return new ArrayList<>();
     }
 
+    @Override
+    public List<TextbookIssueRecordListVo> issueList(Long id) {
+        List<TextbookIssueRecordListVo> result = textbookTextbookMapper.issueList(id);
+        if(!result.isEmpty()){
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
 
 }

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

@@ -0,0 +1,41 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 教材入库表单出参
+* @Author dzx
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class TextbookClassWarehouseListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("入库时间")
+    private Date warehouseDate;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("入库人员")
+    private String warehouseUser;
+    /**
+    * 入库数量
+    */
+    @ApiModelProperty("入库数量")
+    private Integer warehouseNumber;
+    /**
+    * 来源
+    */
+    @ApiModelProperty("来源")
+    private String source;
+
+
+
+}

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

@@ -0,0 +1,40 @@
+package com.xjrsoft.module.textbook.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 教材入库表单出参
+* @Author dzx
+* @Date: 2023-12-26
+* @Version 1.0
+*/
+@Data
+public class TextbookIssueRecordListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("入库时间")
+    private Date warehouseDate;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("入库人员")
+    private String warehouseUser;
+    /**
+    * 入库数量
+    */
+    @ApiModelProperty("入库数量")
+    private Integer warehouseNumber;
+    /**
+    * 来源
+    */
+    @ApiModelProperty("来源")
+    private String source;
+
+
+
+}

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

@@ -18,6 +18,24 @@
         LEFT JOIN base_grade t6 ON t1.grade_id = t6.id
         LEFT JOIN xjr_dictionary_detail t7 ON t1.is_textbook_plan = t7.code AND t7.item_id = 1737360269850038273
         WHERE t1.delete_mark = 0
+        <if test="dto.textbookType != null and dto.textbookType != ''">
+            and t1.textbook_type = #{dto.textbookType}
+        </if>
+        <if test="dto.baseSemesterId != null">
+            and t1.base_semester_id = #{dto.baseSemesterId}
+        </if>
+        <if test="dto.subjectGroupId != null">
+            and t1.subject_group_id = #{dto.subjectGroupId}
+        </if>
+        <if test="dto.courseSubjectId != null">
+            and t1.course_subject_id = #{dto.courseSubjectId}
+        </if>
+        <if test="dto.bookName != null and dto.bookName != ''">
+            and t1.book_name like concat('%',#{dto.bookName}, '%')
+        </if>
+        <if test="dto.isTextbookPlan != null and dto.isTextbookPlan != ''">
+            and t1.is_textbook_plan = #{dto.isTextbookPlan}
+        </if>
     </select>
 
     <select id="subscriptionList" resultType="com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo">
@@ -44,12 +62,17 @@
     <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.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
+    <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
+        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>
-
+    <select id="issueList" resultType="com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo">
+        SELECT t1.create_date AS issue_date,t2.name AS issue_user,t1.issue_number FROM textbook_issue_record t1
+        LEFT JOIN xjr_user t2 ON t1.create_user_id = t2.id
+        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="getClassRelation" resultType="com.xjrsoft.module.textbook.entity.TextbookClassRelation">
         SELECT * FROM textbook_class_relation WHERE delete_mark = 0 AND textbook_id = #{id}
     </select>