控制台

src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -470,17 +470,34 @@ public class ConsoleByDeptFacade {
         String endDate = "";
         Date date = new Date();
 
-        //1-本月，2-本年，3-上月，4-去年本月，5-去年
-        if (filterPageByDeptVO.getType().equals(1) || filterPageByDeptVO.getType().equals(2)) {
-            startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
-            endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
-        } else if (filterPageByDeptVO.getType().equals(3) || filterPageByDeptVO.getType().equals(5)) {
-            startDate = filterFacade.getLastStartDateStr(filterPageByDeptVO.getType());
-            endDate = filterFacade.getLastEndDateStr(filterPageByDeptVO.getType());
-        } else if (filterPageByDeptVO.getType().equals(4)) {
-            String year = DateUtil.getYear(date);
-            startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), Integer.valueOf(year) - 1);
-            endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), Integer.valueOf(year) - 1);
+        //统计维度 1-本月，2-本年
+        //时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
+        if (filterPageByDeptVO.getType().equals(1)) {
+            if (filterPageByDeptVO.getDateType() == null) {
+                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
+                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
+            } else if (filterPageByDeptVO.getDateType().equals(2)) {
+                startDate = filterFacade.getLastStartDateStr(filterPageByDeptVO.getType());
+                endDate = filterFacade.getLastEndDateStr(filterPageByDeptVO.getType());
+            } else if (filterPageByDeptVO.getDateType().equals(3)) {
+                String year = DateUtil.getYear(date);
+                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), Integer.valueOf(year) - 1);
+                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), Integer.valueOf(year) - 1);
+            } else {
+                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
+                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
+            }
+        } else if (filterPageByDeptVO.getType().equals(2)) {
+            if (filterPageByDeptVO.getDateType() == null) {
+                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
+                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
+            } else if (filterPageByDeptVO.getDateType().equals(2) || filterPageByDeptVO.getDateType().equals(3)) {
+                startDate = filterFacade.getLastStartDateStr(filterPageByDeptVO.getType());
+                endDate = filterFacade.getLastEndDateStr(filterPageByDeptVO.getType());
+            } else {
+                startDate = filterFacade.getStartDateStr(filterPageByDeptVO.getType(), null);
+                endDate = filterFacade.getEndDateStr(filterPageByDeptVO.getType(), null);
+            }
         }
 
         filterPageByDeptVO.setStartDate(startDate);

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -315,7 +315,10 @@ public class ConsoleFacade {
         //统计维度 1-本月，2-本年
         //时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
         if (filterPageVO.getType().equals(1)) {
-            if (filterPageVO.getDateType().equals(2)) {
+            if (filterPageVO.getDateType() == null) {
+                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
+                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
+            } else if (filterPageVO.getDateType().equals(2)) {
                 startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
                 endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
             } else if (filterPageVO.getDateType().equals(3)) {
@@ -327,7 +330,10 @@ public class ConsoleFacade {
                 endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
             }
         } else if (filterPageVO.getType().equals(2)) {
-            if (filterPageVO.getDateType().equals(2) || filterPageVO.getDateType().equals(3)) {
+            if (filterPageVO.getDateType() == null) {
+                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
+                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
+            } else if (filterPageVO.getDateType().equals(2) || filterPageVO.getDateType().equals(3)) {
                 startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
                 endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
             } else {