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 | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 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 dcb4f60..f57e400 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -16,23 +16,28 @@
*/
package org.springblade.modules.revoke.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+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.vo.RevokeVO;
import org.springblade.modules.revoke.service.IRevokeService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.modules.revoke.vo.RevokeVO;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.Map;
/**
* 控制器
@@ -42,12 +47,12 @@
*/
@RestController
@AllArgsConstructor
-@RequestMapping("blade-revoke/revoke")
+@RequestMapping("/revoke")
@Api(value = "", tags = "接口")
public class RevokeController extends BladeController {
private final IRevokeService revokeService;
-
+ private final IInformationService informationService;
/**
* 详情
*/
@@ -60,39 +65,56 @@
}
/**
- * 分页
+ * 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入revoke")
- public R<IPage<Revoke>> list(Revoke revoke, Query query) {
- IPage<Revoke> pages = revokeService.page(Condition.getPage(query), Condition.getQueryWrapper(revoke));
+ public R<IPage<Revoke>> list(@ApiIgnore @RequestParam Map<String, Object> revoke, Query query) {
+ IPage<Revoke> pages = revokeService.page(Condition.getPage(query), Condition.getQueryWrapper(revoke, Revoke.class));
return R.data(pages);
}
/**
- * 自定义分页
+ * 自定义分页
*/
@GetMapping("/page")
@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);
}
/**
- * 新增
+ * 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入revoke")
public R save(@Valid @RequestBody Revoke revoke) {
+ revoke.setType("2");
+ revoke.setPermitime(new Date());
return R.status(revokeService.save(revoke));
}
/**
- * 修改
+ * 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@@ -102,7 +124,7 @@
}
/**
- * 新增或修改
+ * 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@@ -111,9 +133,9 @@
return R.status(revokeService.saveOrUpdate(revoke));
}
-
+
/**
- * 删除
+ * 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@@ -122,5 +144,5 @@
return R.status(revokeService.removeByIds(Func.toLongList(ids)));
}
-
+
}
--
Gitblit v1.9.3