出入库新页面

src/main/java/com/neotel/smfcore/common/init/MenuInit.java

@@ -174,7 +174,8 @@ public class MenuInit {
 
         //报表：出入库、库存
         Menu pMenuReport = Menu.CreatePMenu("报表", 7, "report","inOutData",null);
-        addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutData", "neolight/inOutData/index", "outPut");
+        //addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutData", "neolight/inOutData/index", "outPut");
+        addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutDataCount", "neolight/inOutDataCount/index", "outPut");
         addDefaultFunctionMenu(72, pMenuReport,"库存", "inventory", "neolight/inventory/index", "inventory");
         addDefaultFunctionMenu(73, pMenuReport,"温湿度", "humiture", "humiture/humitureReport/index", "humiture");
 

src/main/java/com/neotel/smfcore/core/report/ReportController.java

@@ -153,7 +153,7 @@ public class ReportController {
         Date endDate = DateUtil.parse(currentDateStr, "yyyy-MM-dd HH");
 
         BetweenData<Date> updateDate = query.getUpdateDate();
-        if (updateDate != null) {
+        if (updateDate != null && updateDate.size() > 0) {
             Date from = updateDate.getFrom();
             Date to = updateDate.getTo();
             if (from != null) {
@@ -164,6 +164,7 @@ public class ReportController {
             }
         } else {
             endDate = DateUtil.parse(currentDateStr, "yyyy-MM-dd");
+            endDate = DateUtil.offsetDay(endDate, 1);
             startDate = DateUtil.offsetDay(endDate, -7);
         }
         //判断相差小时数,是否超过48小时