From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 21aa0c5..0909f0b 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -17,6 +17,7 @@
package org.springblade.modules.permit.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -89,6 +90,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入permit")
public R<IPage<Permit>> list(Permit permit, Query query) {
+ permit.setStorage("1");
IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
return R.data(pages);
}
@@ -111,11 +113,15 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入permit")
public R save(@Valid @RequestBody Permit permit) {
- BladeUser user = AuthUtil.getUser();
+ String cardid = permit.getCardid();
+ Map map = permitService.selectIn(cardid);
+ if (map!=null){
+ String id = map.get("id").toString();
+ permitService.removeByIds(Func.toLongList(id));
+ }
permit.setType("2");
permit.setStorage("1");
permit.setPermitime(new Date());
- permit.setDeptid(user.getDeptId());
return R.status(permitService.save(permit));
}
@@ -125,9 +131,18 @@
@PostMapping("/storage")
@ApiOperation(value = "新增", notes = "传入permit")
public R storage(@Valid @RequestBody Permit permit) {
- permit.setStorage("0");
- permit.setPermitime(new Date());
- return R.status(permitService.save(permit));
+ String cardid = permit.getCardid();
+ Map map = permitService.selectIn(cardid);
+ if (map!=null){
+ permit.setStorage("0");
+ permitService.updateById(permit);
+ }
+ else {
+ permit.setStorage("0");
+ permit.setPermitime(new Date());
+ permitService.save(permit);
+ }
+ return R.success("暂存成功");
}
--
Gitblit v1.9.3