diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java index cb6bb0a..8a2a03a 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java @@ -256,6 +256,13 @@ public class BorrowController { return ApiResponse.success(borrowService.initBorrowerNumStatistics()); } + @ApiOperation("当天当月借还数") + @GetMapping("/thisDayYearBorrowNum") + public ApiResponse thisDayYearBorrowNum() + { + return ApiResponse.success(borrowService.thisDayYearBorrowNum()); + } + @ApiOperation("导出借阅信息") @AnonymousGetMapping("/exportBorrow") @ResponseBody diff --git a/archives/src/main/java/com/storeroom/modules/archives/repository/BorrowArchivesRepository.java b/archives/src/main/java/com/storeroom/modules/archives/repository/BorrowArchivesRepository.java index 84dc842..011ba72 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/repository/BorrowArchivesRepository.java +++ b/archives/src/main/java/com/storeroom/modules/archives/repository/BorrowArchivesRepository.java @@ -182,4 +182,8 @@ public interface BorrowArchivesRepository extends JpaRepository initBorrowerNumStatistics(); + //当天当月借还数 + Object thisDayYearBorrowNum(); } diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/BorrowServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/BorrowServiceImpl.java index cb47a89..d96ac88 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/BorrowServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/BorrowServiceImpl.java @@ -1,6 +1,7 @@ package com.storeroom.modules.archives.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.storeroom.modules.archives.domain.BorrowArchives; import com.storeroom.modules.archives.domain.BorrowBill; @@ -335,6 +336,20 @@ public class BorrowServiceImpl implements BorrowService { return map; } + @Override + public Object thisDayYearBorrowNum() { + Integer dayBorrow = borrowArchivesRepository.thisDayYearBorrowNum(1,1); + Integer dayReturn = borrowArchivesRepository.thisDayYearBorrowNum(1,2); + Integer monthBorrow = borrowArchivesRepository.thisDayYearBorrowNum(2,1); + Integer monthReturn = borrowArchivesRepository.thisDayYearBorrowNum(2,2); + JSONObject json = new JSONObject(); + json.put("dayBorrow",dayBorrow); + json.put("dayReturn",dayReturn); + json.put("monthBorrow",monthBorrow); + json.put("monthReturn",monthReturn); + return json; + } + //生成清单 public BorrowBill createBill(Integer borrowNum,String borrowerId,Timestamp startTime,Timestamp endTime,String purpose,Integer loop){