From c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:15:08 +0800
Subject: [PATCH] redis关键词
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
index 5a5094a..4932359 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -124,7 +124,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,Integer userType,
Integer days, String startTime, String endTime, Integer orderMode, Integer type, PrintWriter out) {
try {
@@ -174,14 +174,14 @@
}
List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType,
- userRank, days, startTime, endTime, orderField, orderMode);
+ userRank, days, startTime, endTime, orderField, orderMode,userType);
if (userList == null || userList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
return;
}
- long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime);
+ long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -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);
--
Gitblit v1.8.0