导出

cif-service/src/main/java/com/txz/cif/web/mng/RechargeRecordController.java

@@ -139,32 +139,40 @@ public class RechargeRecordController {
 
 	@GetMapping("/report")
 	@ApiOperation(value = "导出", httpMethod = "GET")
-	public void report(@RequestParam RecordParam param , HttpServletResponse response) {
+	public void report(@RequestParam(required = false) String orderNo ,
+					   @RequestParam(required = false) String channel ,
+					   @RequestParam(required = false) String userName ,
+					   @RequestParam(required = false) String userPhone ,
+					   @RequestParam(required = false) Integer status ,
+					   @RequestParam(required = false) Integer timeType ,
+					   @RequestParam(required = false) String startTime ,
+					   @RequestParam(required = false) String endTime ,
+					   HttpServletResponse response) {
 		Condition condition = new Condition(RechargeRecord.class);
 		Criteria criteria = condition.createCriteria();
-		if (StrUtil.isNotBlank(param.getChannel())){
-			criteria.andEqualTo("channel", param.getChannel());
+		if (StrUtil.isNotBlank(channel)){
+			criteria.andEqualTo("channel", channel);
 		}
-		if (StrUtil.isNotBlank(param.getUserName())){
-			criteria.andEqualTo("userName", param.getUserName());
+		if (StrUtil.isNotBlank(userName)){
+			criteria.andEqualTo("userName", userName);
 		}
-		if (StrUtil.isNotBlank(param.getUserPhone())){
-			criteria.andEqualTo("userPhone", param.getUserPhone());
+		if (StrUtil.isNotBlank(userPhone)){
+			criteria.andEqualTo("userPhone", userPhone);
 		}
-		if (StrUtil.isNotBlank(param.getOrderNo())){
-			criteria.andEqualTo("orderNo", param.getOrderNo());
+		if (StrUtil.isNotBlank(orderNo)){
+			criteria.andEqualTo("orderNo", orderNo);
 		}
-		if (param.getStatus() != null){
-			criteria.andEqualTo("status", param.getStatus());
+		if (status != null){
+			criteria.andEqualTo("status", status);
 		}
-		if (param.getTimeType() != null){
-			if (param.getTimeType() ==1 ){
-				if (StrUtil.isNotBlank(param.getStartTime())){
-					criteria.andBetween("createTime", param.getStartTime(),param.getEndTime());
+		if (timeType != null){
+			if (timeType ==1 ){
+				if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
+					criteria.andBetween("createTime", startTime,endTime);
 				}
-			} else  if (param.getTimeType() ==2 ){
-				if (StrUtil.isNotBlank(param.getStartTime())){
-					criteria.andBetween("successTime", param.getStartTime(),param.getEndTime());
+			} else  if (timeType ==2 ){
+				if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
+					criteria.andBetween("successTime", startTime,endTime);
 				}
 			}
 		}

cif-service/src/main/java/com/txz/cif/web/mng/RedEnvelopeController.java

@@ -110,26 +110,34 @@ public class RedEnvelopeController {
 
 	@GetMapping("/report")
 	@ApiOperation(value = "导出", httpMethod = "GET")
-	public void report(@RequestParam RedEnvelopeListParam2 param , HttpServletResponse response) {
+	public void report(
+			@RequestParam(required = false) String name ,
+			@RequestParam(required = false) String phoneNo ,
+			@RequestParam(required = false) String orderNo ,
+			@RequestParam(required = false) Integer status ,
+			@RequestParam(required = false) Integer type ,
+			@RequestParam(required = false) String startTime ,
+			@RequestParam(required = false) String endTime ,
+			HttpServletResponse response) {
 		Condition condition = new Condition(RedEnvelope.class);
 		Criteria criteria = condition.createCriteria();
-		if (param.getType() != null){
-			criteria.andEqualTo("type", param.getType());
+		if (type != null){
+			criteria.andEqualTo("type", type);
 		}
-		if (StrUtil.isNotBlank(param.getName()) ){
-			criteria.andEqualTo("name", param.getName());
+		if (StrUtil.isNotBlank(name) ){
+			criteria.andEqualTo("name", name);
 		}
-		if (StrUtil.isNotBlank(param.getPhoneNo()) ){
-			criteria.andEqualTo("phoneNo", param.getPhoneNo());
+		if (StrUtil.isNotBlank(phoneNo) ){
+			criteria.andEqualTo("phoneNo", phoneNo);
 		}
-		if (StrUtil.isNotBlank(param.getOrderNo()) ){
-			criteria.andEqualTo("orderNo", param.getOrderNo());
+		if (StrUtil.isNotBlank(orderNo) ){
+			criteria.andEqualTo("orderNo", orderNo);
 		}
-		if (param.getStatus() != null){
-			criteria.andEqualTo("status", param.getStatus());
+		if (status!= null){
+			criteria.andEqualTo("status", status);
 		}
-		if (StrUtil.isNotBlank(param.getStartTime()) &&  StrUtil.isNotBlank(param.getEndTime())){
-			criteria.andBetween("createTime", param.getStartTime(),param.getEndTime());
+		if (StrUtil.isNotBlank(startTime) &&  StrUtil.isNotBlank(endTime)){
+			criteria.andBetween("createTime", startTime,endTime);
 		}
 		condition.setOrderByClause("create_time desc");
 		List<RedEnvelope> list = redEnvelopeService.findByCondition(condition);

cif-service/src/main/java/com/txz/cif/web/mng/UserController.java

@@ -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);

cif-service/src/main/java/com/txz/cif/web/mng/WithdrawRecordController.java

@@ -172,32 +172,40 @@ public class WithdrawRecordController {
 
 	@GetMapping("/report")
 	@ApiOperation(value = "导出", httpMethod = "GET")
-	public void report(@RequestParam RecordParam param , HttpServletResponse response) {
+	public void report(@RequestParam(required = false) String orderNo ,
+					   @RequestParam(required = false) String channel ,
+					   @RequestParam(required = false) String userName ,
+					   @RequestParam(required = false) String userPhone ,
+					   @RequestParam(required = false) Integer status ,
+					   @RequestParam(required = false) Integer timeType ,
+					   @RequestParam(required = false) String startTime ,
+					   @RequestParam(required = false) String endTime ,
+					   HttpServletResponse response) {
 		Condition condition = new Condition(RechargeRecord.class);
 		Criteria criteria = condition.createCriteria();
-		if (StrUtil.isNotBlank(param.getChannel())){
-			criteria.andEqualTo("channel", param.getChannel());
+		if (StrUtil.isNotBlank(channel)){
+			criteria.andEqualTo("channel", channel);
 		}
-		if (StrUtil.isNotBlank(param.getUserName())){
-			criteria.andEqualTo("userName", param.getUserName());
+		if (StrUtil.isNotBlank(userName)){
+			criteria.andEqualTo("userName", userName);
 		}
-		if (StrUtil.isNotBlank(param.getUserPhone())){
-			criteria.andEqualTo("userPhone", param.getUserPhone());
+		if (StrUtil.isNotBlank(userPhone)){
+			criteria.andEqualTo("userPhone", userPhone);
 		}
-		if (StrUtil.isNotBlank(param.getOrderNo())){
-			criteria.andEqualTo("orderNo", param.getOrderNo());
+		if (StrUtil.isNotBlank(orderNo)){
+			criteria.andEqualTo("orderNo", orderNo);
 		}
-		if (param.getStatus() != null){
-			criteria.andEqualTo("status", param.getStatus());
+		if (status != null){
+			criteria.andEqualTo("status", status);
 		}
-		if (param.getTimeType() != null){
-			if (param.getTimeType() ==1 ){
-				if (StrUtil.isNotBlank(param.getStartTime())){
-					criteria.andBetween("createTime", param.getStartTime(),param.getEndTime());
+		if (timeType != null){
+			if (timeType ==1 ){
+				if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
+					criteria.andBetween("createTime", startTime,endTime);
 				}
-			} else  if (param.getTimeType() ==2 ){
-				if (StrUtil.isNotBlank(param.getStartTime())){
-					criteria.andBetween("successTime", param.getStartTime(),param.getEndTime());
+			} else  if (timeType ==2 ){
+				if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
+					criteria.andBetween("successTime", startTime,endTime);
 				}
 			}
 		}