From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 a7ed2ae..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);
}
@@ -93,7 +109,7 @@
@ApiOperation(value = "新增", notes = "传入revoke")
public R save(@Valid @RequestBody Revoke revoke) {
revoke.setType("2");
- revoke.setCtime(new Date());
+ revoke.setPermitime(new Date());
return R.status(revokeService.save(revoke));
}
--
Gitblit v1.9.3