yanghui
2022-11-18 2dff7f26adc08af4fcf0b77ff0ddda99d75c77c4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
@@ -320,31 +320,28 @@
    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);
            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;
    }
}