修改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/dto/TextbookIssueRecordPageDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -46,10 +47,10 @@ public class TextbookIssueRecordPageDto extends PageInput {
     private Long classId;
 
     @ApiModelProperty("发放时间")
-    private Date startCreateDate;
+    private LocalDateTime startCreateDate;
 
     @ApiModelProperty("发放时间")
-    private Date endCreateDate;
+    private LocalDateTime endCreateDate;
 
     @ApiModelProperty("领取类型")
     private String warehouseMode;

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

@@ -39,6 +39,11 @@ public class TextbookSubscriptionItemPageDto extends PageInput {
      */
     @ApiModelProperty("书名")
     private String bookName;
+    /**
+     * 书号
+     */
+    @ApiModelProperty("书号")
+    private String issn;
     /**
      * 教材分类(xjr_dictionary_item[textbook_type])
      */

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

@@ -349,7 +349,6 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                                         wra -> wra
                                                 .selectAs(BaseClassroom::getName, TextbookClaimRecordExportVo::getClassroomIdCn)
                                 )
-                                .ne(WfTextbookClaim::getTextbookScope, 1)
                 )
                 .leftJoin(Textbook.class, Textbook::getId, TextbookIssueRecord::getTextbookId,
                         wrapper -> wrapper
@@ -358,7 +357,16 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                                                 .selectAs(DictionaryDetail::getName, TextbookClaimRecordExportVo::getTextbookTypeCn)
                                 )
                 )
-                .isNotNull(WfTextbookClaim::getClassId)
+                .and(wra -> wra
+                        .eq(WfTextbookClaim::getClaimType, ClaimTypeEnum.ClaimClass.getCode())
+                        .or()
+                        .eq(WfTextbookClaim::getClaimType, ClaimTypeEnum.ClaimStudent.getCode())
+                )
+                .and(wra -> wra
+                        .ne(WfTextbookClaim::getTextbookScope, 1)
+                        .or()
+                        .isNull(WfTextbookClaim::getTextbookScope)
+                )
         ;
         List<TextbookClaimRecordExportVo> dataList = textbookIssueRecordMapper.selectJoinList(TextbookClaimRecordExportVo.class, textbookIssueRecordMPJLambdaWrapper);
 

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

@@ -296,6 +296,7 @@ public class TextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<Textbook
                                 )
                                 .like(StringUtils.isNotBlank(dto.getBookName()), Textbook::getBookName, dto.getBookName())
                                 .eq(StringUtils.isNotBlank(dto.getTextbookType()), Textbook::getTextbookType, dto.getTextbookType())
+                                .like(StringUtils.isNotBlank(dto.getIssn()), Textbook::getIssn, dto.getIssn())
                         )
                 .eq(TextbookSubscriptionItem::getTextbookSubscriptionId, dto.getTextbookSubscriptionId())
                 ;