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

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

@@ -69,15 +69,6 @@ public class TextbookController {
         return RT.ok(pageOutput);
     }
 
-//    @GetMapping(value = "/page-subscription")
-//    @ApiOperation(value="教材管理列表(分页，教材征订用)")
-//    @SaCheckPermission("textbook:detail")
-//    public RT<PageOutput<TextbookSubscriptionListVo>> pageSubscription(@Valid TextbookSubscriptionListDto dto){
-//        IPage<TextbookSubscriptionListVo> page = textbookService.getSubscriptionPageByClass(dto);
-//        PageOutput<TextbookSubscriptionListVo> pageOutput = ConventPage.getPageOutput(page, TextbookSubscriptionListVo.class);
-//        return RT.ok(pageOutput);
-//    }
-
     @GetMapping(value = "/page-consumption")
     @ApiOperation(value="学生确认领取教材列表(分页，学生收费用)")
     @SaCheckPermission("textbook:detail")

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

@@ -146,7 +146,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                                         wp -> wp
                                                 .selectAs(BaseCourseSubject::getName, TextbookSubscriptionItemVo::getCourseSubjectIdCn)
                                 )
-                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getId, Textbook::getTextbookType,
+                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Textbook::getTextbookType,
                                         wp -> wp
                                                 .selectAs(DictionaryDetail::getName, TextbookSubscriptionItemVo::getTextbookTypeCn)
                                 )