yujian
2019-12-14 66ce041f0f1077bb75d1b5265da9065511f5e6ca
统计
1个文件已修改
17 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -1254,13 +1254,16 @@
                beginDate = TimeUtil.parse(startTime);
                endDate = TimeUtil.parse(endTime);
            } else if (dateType == 2) {
               Calendar calendar=Calendar.getInstance();
               int currentYear = calendar.get(Calendar.YEAR);
               calendar.clear();
               calendar.set(Calendar.YEAR, currentYear);
               beginDate =calendar.getTime();
                Calendar calendar=Calendar.getInstance();
                int currentYear = calendar.get(Calendar.YEAR);
                if (!StringUtil.isNullOrEmpty(year)) {
                    currentYear = Integer.parseInt(year);
                }
                calendar.clear();
                calendar.set(Calendar.YEAR, currentYear);
                beginDate =calendar.getTime();
                calendar.clear();
                calendar.set(Calendar.YEAR, currentYear);
                calendar.roll(Calendar.DAY_OF_YEAR, -1);