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 map = new HashMap(); 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 map = new HashMap(); try { List resList = new ArrayList<>(); + beginTime = beginTime + " 00:00:00"; + endTime = endTime + " 23:59:59"; List 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 resList = new ArrayList(); List 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 map = new HashMap(); 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);