修改bug

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

@@ -135,12 +135,12 @@ public class TextbookIssueRecordController {
         return RT.fileStream(bot.toByteArray(), fileName + ExcelTypeEnum.XLSX.getValue());
     }
 
-    @PostMapping("/claim-record-export-query")
-    @ApiOperation(value = "教材发放记录条件导出")
-    public ResponseEntity<byte[]> claimRecordExportDataQuery(@Valid @RequestBody TextbookClaimRecordExportDto dto) throws IOException {
-//    @GetMapping("/claim-record-export-query")
+//    @PostMapping("/claim-record-export-query")
 //    @ApiOperation(value = "教材发放记录条件导出")
-//    public ResponseEntity<byte[]> claimRecordExportDataQuery(@Valid TextbookClaimRecordExportDto dto) throws IOException {
+//    public ResponseEntity<byte[]> claimRecordExportDataQuery(@Valid @RequestBody TextbookClaimRecordExportDto dto) throws IOException {
+    @GetMapping("/claim-record-export-query")
+    @ApiOperation(value = "教材发放记录条件导出")
+    public ResponseEntity<byte[]> claimRecordExportDataQuery(@Valid TextbookClaimRecordExportDto dto) throws IOException {
         ByteArrayOutputStream bot = textbookIssueRecordService.claimRecordExportDataQuery(dto);
 
         String fileName = "教材发放记录";

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

@@ -68,7 +68,6 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                 .leftJoin(TextbookWarehouseRecord.class, TextbookWarehouseRecord::getId, TextbookIssueRecord::getTextbookWarehouseRecordId,
                         wrapper -> wrapper
                                 .selectAs(TextbookWarehouseRecord::getOrderNumber, TextbookIssueRecordPageVo::getWarehouseOrderNumber)
-                                .eq(StringUtils.isNotEmpty(dto.getWarehouseMode()), TextbookWarehouseRecord::getWarehouseMode, dto.getWarehouseMode())
                                 .like(StringUtils.isNotEmpty(dto.getWarehouseOrderNumber()), TextbookWarehouseRecord::getOrderNumber, dto.getWarehouseOrderNumber())
                 )
                 .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, TextbookIssueRecord::getIssueMode,
@@ -116,6 +115,7 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                                                 .selectAs(BaseGrade::getName, TextbookIssueRecordPageVo::getGradeIdCn)
                                 )
                                 .eq(ObjectUtils.isNotEmpty(dto.getClassId()), WfTextbookClaim::getClassId, dto.getClassId())
+                                .eq(StringUtils.isNotEmpty(dto.getWarehouseMode()), WfTextbookClaim::getClaimType, dto.getWarehouseMode())
                 )
                 .leftJoin(XjrUser.class, XjrUser::getId, TextbookIssueRecord::getIssueUserId,
                         wrapper -> wrapper