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/recordk/controller/RecordkController.java | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 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 1132c80..0f045f6 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -16,23 +16,28 @@
*/
package org.springblade.modules.recordk.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.permit.vo.PermitVO;
+import org.springblade.modules.record.entity.Record;
import org.springblade.modules.recordk.entity.Recordk;
-import org.springblade.modules.recordk.vo.RecordkVO;
import org.springblade.modules.recordk.service.IRecordkService;
-import org.springblade.core.boot.ctrl.BladeController;
+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;
/**
* 控制器
@@ -42,12 +47,12 @@
*/
@RestController
@AllArgsConstructor
-@RequestMapping("blade-recordk/recordk")
+@RequestMapping("/recordk")
@Api(value = "", tags = "接口")
public class RecordkController extends BladeController {
private final IRecordkService recordkService;
-
+ private final IInformationService informationService;
/**
* 详情
*/
@@ -60,39 +65,54 @@
}
/**
- * 分页
+ * 分页
*/
@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);
}
/**
- * 自定义分页
+ * 自定义分页
*/
@GetMapping("/page")
@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);
}
/**
- * 新增
+ * 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入recordk")
public R save(@Valid @RequestBody Recordk recordk) {
+ recordk.setType("2");
return R.status(recordkService.save(recordk));
}
/**
- * 修改
+ * 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@@ -102,7 +122,7 @@
}
/**
- * 新增或修改
+ * 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@@ -111,9 +131,9 @@
return R.status(recordkService.saveOrUpdate(recordk));
}
-
+
/**
- * 删除
+ * 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@@ -122,5 +142,5 @@
return R.status(recordkService.removeByIds(Func.toLongList(ids)));
}
-
+
}
--
Gitblit v1.9.3