From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
index 0be0606..e978d53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
@@ -320,15 +320,12 @@
private List<DynamicWorkVO> listHalfYearByDyn() {
List<DynamicWorkVO> dateList = new ArrayList<>();
Date now = new Date();
- for (int i = 6; i >= 1; i--) {
+ for (int i = 5; i >= 0; i--) {
Date date = DateUtils.getDateM(now, -i);
DateTime endDay = DateUtil.endOfMonth(date);
int m = DateUtil.month(endDay);
m++;
- if (m == 12) {
- m = 0;
- }
int day = DateUtil.dayOfMonth(endDay);
int half = day / 2;
String month = DateUtil.format(date, moth_format_str);
@@ -346,4 +343,5 @@
return dateList;
}
+
}
--
Gitblit v1.7.1