大数据与最优化研究所 9 ay önce
ebeveyn
işleme
b90b0e7647

+ 5 - 5
src/main/java/com/xjrsoft/module/textbook/controller/TextbookWarehouseRecordController.java

@@ -111,12 +111,12 @@ public class TextbookWarehouseRecordController {
         return RT.fileStream(bot.toByteArray(), "TextbookClassWarehouse" + ExcelTypeEnum.XLSX.getValue());
     }
 
-//    @PostMapping("/export-query")
-//    @ApiOperation(value = "教材入库记录条件导出")
-//    public ResponseEntity<byte[]> exportDataQuery(@Valid @RequestBody TextbookWarehouseRecordExportDto dto) {
-    @GetMapping("/export-query")
+    @PostMapping("/export-query")
     @ApiOperation(value = "教材入库记录条件导出")
-    public ResponseEntity<byte[]> exportDataQuery(@Valid TextbookWarehouseRecordExportDto dto) {
+    public ResponseEntity<byte[]> exportDataQuery(@Valid @RequestBody TextbookWarehouseRecordExportDto dto) {
+//    @GetMapping("/export-query")
+//    @ApiOperation(value = "教材入库记录条件导出")
+//    public ResponseEntity<byte[]> exportDataQuery(@Valid TextbookWarehouseRecordExportDto dto) {
         ByteArrayOutputStream bot = textbookClassWarehouseService.exportDataQuery(dto);
 
         String fileName = "教材入库记录";

+ 1 - 0
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookIssueRecordServiceImpl.java

@@ -128,6 +128,7 @@ public class TextbookIssueRecordServiceImpl extends MPJBaseServiceImpl<TextbookI
                 .le(ObjectUtils.isNotEmpty(dto.getEndCreateDate()), TextbookIssueRecord::getCreateDate, dto.getEndCreateDate())
                 .gt(ObjectUtils.isNotEmpty(dto.getReturnState()) && dto.getReturnState() == 1, TextbookIssueRecord::getRecedeNumber, 0)
                 .eq(ObjectUtils.isNotEmpty(dto.getReturnState()) && dto.getReturnState() == 0, TextbookIssueRecord::getRecedeNumber, 0)
+                .orderByDesc(TextbookIssueRecord::getCreateDate)
                 ;
 
         return textbookIssueRecordMapper.selectJoinPage(ConventPage.getPage(dto), TextbookIssueRecordPageVo.class, textbookIssueRecordMPJLambdaWrapper);

+ 1 - 1
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookWarehouseRecordServiceImpl.java

@@ -111,7 +111,7 @@ public class TextbookWarehouseRecordServiceImpl extends MPJBaseServiceImpl<Textb
                 .le(ObjectUtils.isNotEmpty(dto.getEndCreateDate()), TextbookWarehouseRecord::getCreateDate, dto.getEndCreateDate())
                 .gt(ObjectUtils.isNotEmpty(dto.getReturnBookstore()) && dto.getReturnBookstore() == 1, TextbookWarehouseRecord::getReturnBookstoreNumber, 0)
                 .gt(ObjectUtils.isNotEmpty(dto.getReturnState()) && dto.getReturnState() == 1, TextbookWarehouseRecord::getRecedeNumber, 0)
-//                .orderByDesc(TextbookWarehouseRecord::getCreateDate)
+                .orderByDesc(TextbookWarehouseRecord::getCreateDate)
                 ;
         return this.selectJoinListPage(ConventPage.getPage(dto), TextbookWarehouseRecordPageVo.class, textbookWarehouseRecordMPJLambdaWrapper);
 //        return textbookWarehouseRecordMapper.getPage(page, dto);