From 60dddbf3d0182c8a5220b04d3ea207b0756bc0f3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 17:35:15 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
index e5545d6..f57e400 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -27,6 +27,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.revoke.entity.Revoke;
import org.springblade.modules.revoke.service.IRevokeService;
@@ -51,7 +52,7 @@
public class RevokeController extends BladeController {
private final IRevokeService revokeService;
-
+ private final IInformationService informationService;
/**
* 详情
*/
@@ -81,7 +82,22 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入revoke")
public R<IPage<RevokeVO>> page(RevokeVO revoke, Query query) {
- IPage<RevokeVO> pages = revokeService.selectRevokePage(Condition.getPage(query), revoke);
+ IPage<RevokeVO> pages;
+ if (revoke.getUsetype().equals("0")) {
+ pages = revokeService.selectRevokePage(Condition.getPage(query), revoke,null);
+ } else if (revoke.getUsetype().equals("1")) {
+ String childer = informationService.selJurchilder(revoke.getJurisdiction());
+ String[] split = childer.split(",");
+ String strArrays = "";
+ for (int j = 0; j < split.length; j++) {
+ strArrays += "'" + split[j] + "',";
+ }
+ String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
+ pages =revokeService.selectRevokePage(Condition.getPage(query), revoke,jurisdiction);
+ } else {
+ pages =revokeService.selectRevokePage(Condition.getPage(query), revoke,null);
+ }
+
return R.data(pages);
}
--
Gitblit v1.9.3