From c25b6dd41e1029f52fa3e1dba577fb8f8570e086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 2 Jun 2021 23:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/AccountHeadController.java   | 1 +
 .../java/com/jsh/erp/controller/DepotHeadController.java     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java
index 1573967f..6027f42e 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java
@@ -76,6 +76,7 @@ public class AccountHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             JSONObject outer = new JSONObject();
+            endTime = endTime + " 23:59:59";
             BigDecimal sum = accountHeadService.findTotalPay(supplierId, endTime, supType);
             outer.put("getAllMoney", sum);
             map.put("rows", outer);
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
index 57be1ece..39377e85 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
@@ -143,6 +143,8 @@ public class DepotHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             List<DepotHeadVo4InOutMCount> resList = new ArrayList<>();
+            beginTime = beginTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
             List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, materialParam, depotId, oId, (currentPage-1)*pageSize, pageSize);
             int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, materialParam, depotId, oId);
             map.put("total", total);
@@ -191,6 +193,8 @@ public class DepotHeadController {
             } else if (supType.equals("供应商")) { //供应商
                 j = -1;
             }
+            beginTime = beginTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
             List<DepotHeadVo4StatementAccount> resList = new ArrayList<DepotHeadVo4StatementAccount>();
             List<DepotHeadVo4StatementAccount> list = depotHeadService.findStatementAccount(beginTime, endTime, organId, supType, (currentPage-1)*pageSize, pageSize);
             int total = depotHeadService.findStatementAccountCount(beginTime, endTime, organId, supType);
@@ -273,6 +277,7 @@ public class DepotHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             JSONObject outer = new JSONObject();
+            endTime = endTime + " 23:59:59";
             BigDecimal sum = depotHeadService.findTotalPay(supplierId, endTime, supType);
             outer.put("getAllMoney", sum);
             map.put("rows", outer);