教材模块重构-教材基本信息，教材征订

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

@@ -181,7 +181,7 @@ public class TextbookSubscriptionController {
 
     @PostMapping("/instockroom-excel-import")
     @ApiOperation(value = "导入入库")
-    public RT<String> excelImport(@RequestParam("file") MultipartFile file,  @RequestParam(value = "textbookSubscriptionId") Long textbookSubscriptionId) throws IOException {
+    public RT<String> instockroomExcelImport(@RequestParam("file") MultipartFile file,  @RequestParam(value = "textbookSubscriptionId") Long textbookSubscriptionId) throws IOException {
         InputStream inputStream = file.getInputStream();
         return RT.ok(textbookSubscriptionService.instockroomExcelImport(inputStream, textbookSubscriptionId));
     }

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

@@ -80,10 +80,15 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
     public List<TextbookInstockroomListVo> instockroomList(TextbookInstockroomListDto dto) {
         MPJLambdaWrapper<TextbookSubscriptionItem> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
-                .select(TextbookSubscriptionItem::getId)
+                .selectAs(TextbookSubscriptionItem::getId, TextbookInstockroomListVo::getTextbookSubscriptionItemId)
                 .select(Textbook.class, x -> VoToColumnUtil.fieldsToColumns(TextbookInstockroomListVo.class).contains(x.getProperty()))
                 .select(TextbookSubscriptionItem.class, x -> VoToColumnUtil.fieldsToColumns(TextbookInstockroomListVo.class).contains(x.getProperty()))
+                .selectAs(TextbookSubscriptionItem::getStudentNum, TextbookInstockroomListVo::getStudentSubscriptionNumber)
+                .selectAs(TextbookSubscriptionItem::getTeacherNum, TextbookInstockroomListVo::getTeacherSubscriptionNumber)
+                .selectAs(TextbookSubscriptionItem::getPrice, TextbookInstockroomListVo::getActualPrice)
+                .selectAs(TextbookSubscriptionItem::getDiscount, TextbookInstockroomListVo::getDiscount)
                 .leftJoin(Textbook.class, Textbook::getId, TextbookSubscriptionItem::getTextbookId)
+
                 .leftJoin(BaseCourseSubject.class, BaseCourseSubject::getId, Textbook::getCourseSubjectId,
                         wrapper -> wrapper
                                 .selectAs(BaseCourseSubject::getName, TextbookInstockroomListVo::getCourseName)
@@ -93,6 +98,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                                 .selectAs(DictionaryDetail::getName, TextbookInstockroomListVo::getTextbookTypeCn)
                 )
                 .eq(TextbookSubscriptionItem::getTextbookSubscriptionId, dto.getTextbookSubscriptionId())
+
                 .orderByAsc(TextbookSubscriptionItem::getInStockNum)
         ;
 

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

@@ -78,6 +78,11 @@ public class TextbookInstockroomListVo {
      */
     @ApiModelProperty("使用类型(单位：学期)")
     private Integer useType;
+    /**
+     * 版本
+     */
+    @ApiModelProperty("版本")
+    private String version;
     /**
      * 定价(元)
      */

src/main/resources/sqlScript/views_sql.sql

@@ -86,4 +86,5 @@ from `smart_campus`.`base_student` `t`
     left join `smart_campus`.`base_student_graduate` `t8` on `t8`.`user_id` = `t1`.`id`
 where t.delete_mark = 0
   and t1.delete_mark = 0
-  and t2.delete_mark = 0;
+  and t2.delete_mark = 0
+and t2.archives_status = 'FB2901';