|
@@ -90,48 +90,37 @@ public class UserController extends AbstractApiController {
|
|
|
PageHelper.startPage(param.getPage(), param.getSize());
|
|
|
Condition condition = new Condition(User.class);
|
|
|
Example.Criteria criteria = condition.createCriteria();
|
|
|
- Example.Criteria criteria2 = condition.or();
|
|
|
if (param.getType() == null){
|
|
|
param.setType(0);
|
|
|
}
|
|
|
if (param.getHasWithdraw() != null){
|
|
|
criteria.andEqualTo("hasWithdraw",param.getHasWithdraw());
|
|
|
- criteria2.andEqualTo("hasWithdraw",param.getHasWithdraw());
|
|
|
}
|
|
|
if (param.getHasLogin() != null){
|
|
|
criteria.andEqualTo("hasLogin",param.getHasLogin());
|
|
|
- criteria2.andEqualTo("hasLogin",param.getHasLogin());
|
|
|
}
|
|
|
if (param.getHasOrder() != null){
|
|
|
criteria.andEqualTo("hasOrder",param.getHasOrder());
|
|
|
- criteria2.andEqualTo("hasOrder",param.getHasOrder());
|
|
|
}
|
|
|
if (param.getType() == 1){
|
|
|
criteria.andEqualTo("pid",param.getUserId());
|
|
|
- criteria2.andEqualTo("pid",param.getUserId());
|
|
|
} else if (param.getType() == 2){
|
|
|
criteria.andEqualTo("ppid",param.getUserId());
|
|
|
- criteria2.andEqualTo("ppid",param.getUserId());
|
|
|
}
|
|
|
if (param.getStatus() != null){
|
|
|
criteria.andEqualTo("status",param.getStatus());
|
|
|
- criteria2.andEqualTo("status",param.getStatus());
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(param.getName())) {
|
|
|
criteria.andLike("name", "%" + param.getName() + "%");
|
|
|
- criteria2.andLike("name", "%" + param.getName() + "%");
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(param.getPhone())) {
|
|
|
criteria.andEqualTo("phoneNo", param.getPhone());
|
|
|
- criteria2.andEqualTo("phoneNo", param.getPhone());
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(param.getStartTime())) {
|
|
|
criteria.andGreaterThanOrEqualTo("createTime", param.getStartTime());
|
|
|
- criteria2.andGreaterThanOrEqualTo("createTime", param.getStartTime());
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(param.getEndTime())) {
|
|
|
criteria.andLessThanOrEqualTo("createTime", param.getEndTime());
|
|
|
- criteria2.andLessThanOrEqualTo("createTime", param.getEndTime());
|
|
|
}
|
|
|
|
|
|
PageInfo pageInfo = null;
|
|
@@ -259,51 +248,52 @@ public class UserController extends AbstractApiController {
|
|
|
|
|
|
@GetMapping("/report")
|
|
|
@ApiOperation(value = "导出", httpMethod = "GET")
|
|
|
- public void report(@RequestParam MyUserParam param , HttpServletResponse response) {
|
|
|
+ public void report(
|
|
|
+ @RequestParam(required = false) Integer hasWithdraw ,
|
|
|
+ @RequestParam(required = false) Integer hasLogin ,
|
|
|
+ @RequestParam(required = false) Integer hasOrder ,
|
|
|
+ @RequestParam(required = false) Long userId ,
|
|
|
+ @RequestParam(required = false) String name ,
|
|
|
+ @RequestParam(required = false) String phoneNo ,
|
|
|
+ @RequestParam(required = false) Integer status ,
|
|
|
+ @RequestParam(required = false,value = "0") Integer type ,
|
|
|
+ @RequestParam(required = false) String startTime ,
|
|
|
+ @RequestParam(required = false) String endTime ,
|
|
|
+ HttpServletResponse response) {
|
|
|
Condition condition = new Condition(User.class);
|
|
|
Example.Criteria criteria = condition.createCriteria();
|
|
|
- Example.Criteria criteria2 = condition.or();
|
|
|
- if (param.getType() == null){
|
|
|
- param.setType(0);
|
|
|
+ if (hasWithdraw != null){
|
|
|
+ criteria.andEqualTo("hasWithdraw",hasWithdraw);
|
|
|
}
|
|
|
- if (param.getHasWithdraw() != null){
|
|
|
- criteria.andEqualTo("hasWithdraw",param.getHasWithdraw());
|
|
|
- criteria2.andEqualTo("hasWithdraw",param.getHasWithdraw());
|
|
|
+ if (hasLogin != null){
|
|
|
+ criteria.andEqualTo("hasLogin",hasLogin);
|
|
|
}
|
|
|
- if (param.getHasLogin() != null){
|
|
|
- criteria.andEqualTo("hasLogin",param.getHasLogin());
|
|
|
- criteria2.andEqualTo("hasLogin",param.getHasLogin());
|
|
|
+ if (hasOrder != null){
|
|
|
+ criteria.andEqualTo("hasOrder",hasOrder);
|
|
|
}
|
|
|
- if (param.getHasOrder() != null){
|
|
|
- criteria.andEqualTo("hasOrder",param.getHasOrder());
|
|
|
- criteria2.andEqualTo("hasOrder",param.getHasOrder());
|
|
|
- }
|
|
|
- if (param.getType() == 1){
|
|
|
- criteria.andEqualTo("pid",param.getUserId());
|
|
|
- criteria2.andEqualTo("pid",param.getUserId());
|
|
|
- } else if (param.getType() == 2){
|
|
|
- criteria.andEqualTo("ppid",param.getUserId());
|
|
|
- criteria2.andEqualTo("ppid",param.getUserId());
|
|
|
+ if (type == 1){
|
|
|
+ if (userId != null){
|
|
|
+ criteria.andEqualTo("pid",userId);
|
|
|
+ }
|
|
|
+ } else if (type == 2){
|
|
|
+ if (userId != null){
|
|
|
+ criteria.andEqualTo("ppid",userId);
|
|
|
+ }
|
|
|
}
|
|
|
- if (param.getStatus() != null){
|
|
|
- criteria.andEqualTo("status",param.getStatus());
|
|
|
- criteria2.andEqualTo("status",param.getStatus());
|
|
|
+ if (status != null){
|
|
|
+ criteria.andEqualTo("status",status);
|
|
|
}
|
|
|
- if (StrUtil.isNotBlank(param.getName())) {
|
|
|
- criteria.andLike("name", "%" + param.getName() + "%");
|
|
|
- criteria2.andLike("name", "%" + param.getName() + "%");
|
|
|
+ if (StrUtil.isNotBlank(name)) {
|
|
|
+ criteria.andLike("name", "%" + name + "%");
|
|
|
}
|
|
|
- if (StrUtil.isNotBlank(param.getPhone())) {
|
|
|
- criteria.andEqualTo("phoneNo", param.getPhone());
|
|
|
- criteria2.andEqualTo("phoneNo", param.getPhone());
|
|
|
+ if (StrUtil.isNotBlank(phoneNo)) {
|
|
|
+ criteria.andEqualTo("phoneNo", phoneNo);
|
|
|
}
|
|
|
- if (StrUtil.isNotBlank(param.getStartTime())) {
|
|
|
- criteria.andGreaterThanOrEqualTo("createTime", param.getStartTime());
|
|
|
- criteria2.andGreaterThanOrEqualTo("createTime", param.getStartTime());
|
|
|
+ if (StrUtil.isNotBlank(startTime)) {
|
|
|
+ criteria.andGreaterThanOrEqualTo("createTime", startTime);
|
|
|
}
|
|
|
- if (StrUtil.isNotBlank(param.getEndTime())) {
|
|
|
- criteria.andLessThanOrEqualTo("createTime", param.getEndTime());
|
|
|
- criteria2.andLessThanOrEqualTo("createTime", param.getEndTime());
|
|
|
+ if (StrUtil.isNotBlank(endTime)) {
|
|
|
+ criteria.andLessThanOrEqualTo("createTime", endTime);
|
|
|
}
|
|
|
condition.setOrderByClause("create_time desc");
|
|
|
List<User> users = userService.findByCondition(condition);
|