From 486f6cda7ccd893f7ff91c088b2f26b991a08f2b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 09 Dec 2021 11:36:18 +0800
Subject: [PATCH] 1.首页现实表现
---
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
index 47e88aa..0f045f6 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -27,12 +27,17 @@
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.permit.vo.PermitVO;
+import org.springblade.modules.record.entity.Record;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.service.IRecordkService;
import org.springblade.modules.recordk.vo.RecordkVO;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.util.Map;
/**
* 控制器
@@ -47,7 +52,7 @@
public class RecordkController extends BladeController {
private final IRecordkService recordkService;
-
+ private final IInformationService informationService;
/**
* 详情
*/
@@ -65,8 +70,8 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入recordk")
- public R<IPage<Recordk>> list(Recordk recordk, Query query) {
- IPage<Recordk> pages = recordkService.page(Condition.getPage(query), Condition.getQueryWrapper(recordk));
+ public R<IPage<Recordk>> list(@ApiIgnore @RequestParam Map<String, Object> recordk, Query query) {
+ IPage<Recordk> pages = recordkService.page(Condition.getPage(query), Condition.getQueryWrapper(recordk, Recordk.class));
return R.data(pages);
}
@@ -77,7 +82,21 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入recordk")
public R<IPage<RecordkVO>> page(RecordkVO recordk, Query query) {
- IPage<RecordkVO> pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk);
+ IPage<RecordkVO> pages;
+ if (recordk.getUsetype().equals("0")) {
+ pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
+ } else if (recordk.getUsetype().equals("1")) {
+ String childer = informationService.selJurchilder(recordk.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 = recordkService.selectRecordkPage(Condition.getPage(query), recordk,jurisdiction);
+ } else {
+ pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
+ }
return R.data(pages);
}
--
Gitblit v1.9.3