From e54018dbe0a58738273a4ef28ea07e892d9e85ef Mon Sep 17 00:00:00 2001
From: xia <taume@126.com>
Date: Fri, 16 Sep 2022 15:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=BD=93?=
 =?UTF-8?q?=E6=97=A5=E5=BD=93=E6=9C=88=E5=80=9F=E8=BF=98=E4=B9=A6=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archives/controller/BorrowController.java     |  7 +++++++
 .../repository/BorrowArchivesRepository.java      |  4 ++++
 .../modules/archives/service/BorrowService.java   |  2 ++
 .../archives/service/impl/BorrowServiceImpl.java  | 15 +++++++++++++++
 4 files changed, 28 insertions(+)

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<Object> 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<BorrowArchives,
             value = "select count(1) from borrow_archives t1 inner join (select ba.archives_id,max(ba.update_time) as update_time from borrow_archives ba group by ba.archives_id) t2 on t1.archives_id = t2.archives_id and t1.update_time = t2.update_time where t1.borrow_type = -1")
     Integer getAbnormalNum();
 
+    @Query(nativeQuery = true,
+        value = "select count(1) from borrow_archives where if(?1=1,if(?2=1,to_days(start_time)=to_days(now()),to_days(end_time)=to_days(now())),if(?2=1,date_format(start_time,'%Y%m')=date_format(curdate(),'%Y%m'),date_format(end_time,'%Y%m')=date_format(curdate(),'%Y%m')))")
+    Integer thisDayYearBorrowNum(Integer time,Integer type);
+
 }
diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/BorrowService.java b/archives/src/main/java/com/storeroom/modules/archives/service/BorrowService.java
index 00df396..3e0bff2 100644
--- a/archives/src/main/java/com/storeroom/modules/archives/service/BorrowService.java
+++ b/archives/src/main/java/com/storeroom/modules/archives/service/BorrowService.java
@@ -68,5 +68,7 @@ public interface BorrowService {
     List waitBorrow();
     //档案借阅数量统计
     Map<String,Integer> 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){