Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party

src/main/java/cn/chnmuseum/party/web/controller/TBoardStatisticController.java

@@ -56,6 +56,10 @@ public class TBoardStatisticController extends BaseController {
         } catch (Exception e) {
             survey.setOrganCode(null);
         }
+        // 默认当月
+        if (StringUtils.isEmpty(survey.getStatisticDate())) {
+            survey.setStatisticDate(DateUtil.getCurrentDate("yyyyMM"));
+        }
         TBoardSurvey result = this.tBoardStatisticService.getBoardSurvey(survey);
 
         return getResult(result);
@@ -78,10 +82,11 @@ public class TBoardStatisticController extends BaseController {
         } catch (Exception e) {
             rank.setOrganCode(null);
         }
-        Page<TBoardPlayRank> page = this.tBoardStatisticService.getBoardRankPageList(getPage(), rank);
-        for (TBoardPlayRank tBoardStatistic : page.getRecords()) {
-
+        // 默认当月
+        if (StringUtils.isEmpty(rank.getPlayDate())) {
+            rank.setPlayDate(DateUtil.getCurrentDate("yyyyMM"));
         }
+        Page<TBoardPlayRank> page = this.tBoardStatisticService.getBoardRankPageList(getPage(), rank);
         return getResult(page);
     }
 
@@ -189,11 +194,11 @@ public class TBoardStatisticController extends BaseController {
         } catch (Exception e) {
             district.setOrganCode(null);
         }
-
-        Page<TDistrictBoardStatistic> page = this.tBoardStatisticService.getBoardDistrictPageList(getPage(), district);
-        for (TDistrictBoardStatistic tBoardStatistic : page.getRecords()) {
-
+        // 默认当月
+        if (StringUtils.isEmpty(district.getPlayDate())) {
+            district.setPlayDate(DateUtil.getCurrentDate("yyyyMM"));
         }
+        Page<TDistrictBoardStatistic> page = this.tBoardStatisticService.getBoardDistrictPageList(getPage(), district);
         return getResult(page);
     }