From f66856f80d0db11adff5c6dd5f86aa375f86c199 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 15:28:19 +0800
Subject: [PATCH] 1.备案
---
src/main/java/org/springblade/modules/record/mapper/RecordMapper.java | 2 +-
src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.java | 2 +-
src/main/java/org/springblade/modules/record/service/IRecordService.java | 2 +-
src/main/java/org/springblade/modules/revoke/service/IRevokeService.java | 2 +-
src/main/java/org/springblade/modules/record/controller/RecordController.java | 10 ++++++----
src/main/java/org/springblade/modules/revoke/service/impl/RevokeServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml | 2 +-
src/main/java/org/springblade/modules/permit/service/IPermitService.java | 2 +-
src/main/java/org/springblade/modules/record/service/impl/RecordServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.java | 2 +-
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml | 2 +-
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java | 10 ++++++----
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 10 ++++++----
src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml | 2 +-
15 files changed, 33 insertions(+), 27 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 5ddacf5..e895d74 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -132,7 +132,8 @@
@ApiOperation(value = "新增", notes = "传入permit")
public R save(@Valid @RequestBody Permit permit) throws FileNotFoundException {
String cardid = permit.getCardid();
- Map map = permitService.selectIn(cardid);
+ String type = permit.getPtype();
+ Map map = permitService.selectIn(cardid,type);
if (map != null) {
String id = map.get("id").toString();
permitService.removeByIds(Func.toLongList(id));
@@ -167,7 +168,8 @@
@ApiOperation(value = "新增", notes = "传入permit")
public R storage(@Valid @RequestBody Permit permit) {
String cardid = permit.getCardid();
- Map map = permitService.selectIn(cardid);
+ String type = permit.getPtype();
+ Map map = permitService.selectIn(cardid,type);
if (map != null) {
permit.setStorage("0");
permitService.updateById(permit);
@@ -181,8 +183,8 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid) {
- Map map = permitService.selectIn(cardid);
+ public R selectIn(String cardid ,String type) {
+ Map map = permitService.selectIn(cardid,type);
return R.data(map);
}
diff --git a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.java b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.java
index 248ca8a..a8a51e0 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.java
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.java
@@ -43,6 +43,6 @@
*/
List<PermitVO> selectPermitPage(IPage page, PermitVO permit);
- Map selectIn(String cardid);
+ Map selectIn(String cardid,String type);
void insertPer(@Param("permit") Permit permit);
}
diff --git a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
index 241dec3..a96ab6c 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -42,7 +42,7 @@
select *
from sys_permit
where storage = 0
- and cardid = #{cardid}
+ and cardid = #{cardid} and ptype=#{type }
</select>
<insert id="insertPer" useGeneratedKeys="true" keyProperty="id">
diff --git a/src/main/java/org/springblade/modules/permit/service/IPermitService.java b/src/main/java/org/springblade/modules/permit/service/IPermitService.java
index 42c2c6a..c406701 100644
--- a/src/main/java/org/springblade/modules/permit/service/IPermitService.java
+++ b/src/main/java/org/springblade/modules/permit/service/IPermitService.java
@@ -40,6 +40,6 @@
* @return
*/
IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, PermitVO permit);
- Map selectIn(String cardid);
+ Map selectIn(String cardid,String type);
void insertPer(@Param("permit") Permit permit);
}
diff --git a/src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java b/src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java
index 83b05b2..caa4c3a 100644
--- a/src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java
@@ -41,8 +41,8 @@
}
@Override
- public Map selectIn(String cardid) {
- return baseMapper.selectIn(cardid);
+ public Map selectIn(String cardid,String type) {
+ return baseMapper.selectIn(cardid,type);
}
@Override
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index cca2d00..272ad62 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -93,7 +93,8 @@
@ApiOperation(value = "新增", notes = "传入record")
public R save(@Valid @RequestBody Record record) {
String cardid = record.getCardid();
- Map map = recordService.selectIn(cardid);
+ String type = record.getPtype();
+ Map map = recordService.selectIn(cardid,type);
if (map != null) {
String id = map.get("id").toString();
recordService.removeByIds(Func.toLongList(id));
@@ -129,7 +130,8 @@
@ApiOperation(value = "新增", notes = "传入record")
public R rocordsave(@Valid @RequestBody Record record) {
String cardid = record.getCardid();
- Map map = recordService.selectIn(cardid);
+ String type = record.getPtype();
+ Map map = recordService.selectIn(cardid,type);
if (map != null) {
record.setStorage("0");
record.setPermitime(new Date());
@@ -177,8 +179,8 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid) {
- Map map = recordService.selectIn(cardid);
+ public R selectIn(String cardid,String type) {
+ Map map = recordService.selectIn(cardid,type);
return R.data(map);
}
}
diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.java b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.java
index 773c7ef..6ee02ee 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.java
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.java
@@ -40,5 +40,5 @@
* @return
*/
List<RecordVO> selectRecordPage(IPage page, RecordVO record);
- Map selectIn(String cardid);
+ Map selectIn(String cardid,String type);
}
diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index 819ab3c..8073e0a 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -41,7 +41,7 @@
</select>
<select id="selectIn" resultType="java.util.HashMap">
- select * from sys_record where storage=0 and cardid=#{cardid}
+ select * from sys_record where storage=0 and cardid=#{cardid} and ptype=#{type}
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/record/service/IRecordService.java b/src/main/java/org/springblade/modules/record/service/IRecordService.java
index cdb278f..c9773c0 100644
--- a/src/main/java/org/springblade/modules/record/service/IRecordService.java
+++ b/src/main/java/org/springblade/modules/record/service/IRecordService.java
@@ -39,5 +39,5 @@
* @return
*/
IPage<RecordVO> selectRecordPage(IPage<RecordVO> page, RecordVO record);
- Map selectIn(String cardid);
+ Map selectIn(String cardid,String type);
}
diff --git a/src/main/java/org/springblade/modules/record/service/impl/RecordServiceImpl.java b/src/main/java/org/springblade/modules/record/service/impl/RecordServiceImpl.java
index 8fd74d0..996a5b2 100644
--- a/src/main/java/org/springblade/modules/record/service/impl/RecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/record/service/impl/RecordServiceImpl.java
@@ -41,8 +41,8 @@
}
@Override
- public Map selectIn(String cardid) {
- return baseMapper.selectIn(cardid);
+ public Map selectIn(String cardid,String type) {
+ return baseMapper.selectIn(cardid,type);
}
}
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 2dca31c..8d4643e 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -93,7 +93,8 @@
@ApiOperation(value = "新增", notes = "传入revoke")
public R save(@Valid @RequestBody Revoke revoke) {
String cardid = revoke.getCardid();
- Map map = revokeService.selectIn(cardid);
+ String type = revoke.getPtype();
+ Map map = revokeService.selectIn(cardid,type);
if (map != null) {
String id = map.get("id").toString();
revokeService.removeByIds(Func.toLongList(id));
@@ -131,7 +132,8 @@
@ApiOperation(value = "新增", notes = "传入revoke")
public R revokesave(@Valid @RequestBody Revoke revoke) {
String cardid = revoke.getCardid();
- Map map = revokeService.selectIn(cardid);
+ String type = revoke.getPtype();
+ Map map = revokeService.selectIn(cardid,type);
if (map != null) {
revoke.setStorage("0");
revokeService.updateById(revoke);
@@ -177,8 +179,8 @@
}
@PostMapping("/selectIn")
- public R selectIn(String cardid) {
- Map map = revokeService.selectIn(cardid);
+ public R selectIn(String cardid,String type) {
+ Map map = revokeService.selectIn(cardid,type);
return R.data(map);
}
diff --git a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.java b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.java
index 43e3f79..3ee5f80 100644
--- a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.java
+++ b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.java
@@ -40,5 +40,5 @@
* @return
*/
List<RevokeVO> selectRevokePage(IPage page, RevokeVO revoke);
- Map selectIn(String cardid);
+ Map selectIn(String cardid,String type);
}
diff --git a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
index 7bc3146..11c7b42 100644
--- a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
+++ b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -39,6 +39,6 @@
select * from sys_revoke
</select>
<select id="selectIn" resultType="java.util.HashMap">
- select * from sys_revoke where storage=0 and cardid=#{cardid}
+ select * from sys_revoke where storage=0 and cardid=#{cardid} and ptype=#{type}
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/revoke/service/IRevokeService.java b/src/main/java/org/springblade/modules/revoke/service/IRevokeService.java
index 77a7406..d320306 100644
--- a/src/main/java/org/springblade/modules/revoke/service/IRevokeService.java
+++ b/src/main/java/org/springblade/modules/revoke/service/IRevokeService.java
@@ -39,5 +39,5 @@
* @return
*/
IPage<RevokeVO> selectRevokePage(IPage<RevokeVO> page, RevokeVO revoke);
- Map selectIn(String cardid);
+ Map selectIn(String cardid,String type);
}
diff --git a/src/main/java/org/springblade/modules/revoke/service/impl/RevokeServiceImpl.java b/src/main/java/org/springblade/modules/revoke/service/impl/RevokeServiceImpl.java
index f08a259..564c736 100644
--- a/src/main/java/org/springblade/modules/revoke/service/impl/RevokeServiceImpl.java
+++ b/src/main/java/org/springblade/modules/revoke/service/impl/RevokeServiceImpl.java
@@ -41,8 +41,8 @@
}
@Override
- public Map selectIn(String cardid) {
- return baseMapper.selectIn(cardid);
+ public Map selectIn(String cardid,String type) {
+ return baseMapper.selectIn(cardid,type);
}
}
--
Gitblit v1.9.3