From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 99a8c83..0be0606 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
@@ -333,18 +333,17 @@
int half = day / 2;
String month = DateUtil.format(date, moth_format_str);
DynamicWorkVO dynamicWorkVO = new DynamicWorkVO();
- dynamicWorkVO.setMonth(monthStr[m] + "月上旬");
+ dynamicWorkVO.setMonth(monthStr[m-1] + "月上旬");
dynamicWorkVO.setStart(month + "-01 00:00:00");
dynamicWorkVO.setEnd(month + "-" + half + " 23:59:58");
dateList.add(dynamicWorkVO);
DynamicWorkVO dynamicWorkVO1 = new DynamicWorkVO();
- dynamicWorkVO1.setMonth(monthStr[m] + "月下旬");
+ dynamicWorkVO1.setMonth(monthStr[m-1] + "月下旬");
dynamicWorkVO1.setStart(month + "-" + half + " 23:59:58");
dynamicWorkVO1.setEnd(DateUtils.getDateFormatString(endDay, "yyyy-MM-dd HH:mm:ss"));
dateList.add(dynamicWorkVO1);
}
return dateList;
-
}
}
--
Gitblit v1.7.1