From 97f4c8f1aeea0b973d302d25bbf60c82dddf9a8d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 26 Aug 2021 09:56:50 +0800
Subject: [PATCH] 1.备案
---
src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml | 3 ++-
src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/revoke/entity/Revoke.java | 1 -
src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml | 2 +-
src/main/java/org/springblade/modules/record/entity/Record.java | 1 -
src/main/java/org/springblade/modules/permit/entity/Permit.java | 1 -
src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java | 2 +-
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml | 2 +-
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 10 ++++++----
src/main/java/org/springblade/modules/recordk/entity/Recordk.java | 2 +-
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml | 2 +-
src/main/java/org/springblade/modules/recordk/service/IRecordkService.java | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/entity/Permit.java b/src/main/java/org/springblade/modules/permit/entity/Permit.java
index 0195dd4..7692d55 100644
--- a/src/main/java/org/springblade/modules/permit/entity/Permit.java
+++ b/src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -64,7 +64,6 @@
* 成立日期
*/
@ApiModelProperty(value = "成立日期")
- @TableField("establishTime")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date establishtime;
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 f184a12..decae77 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -8,7 +8,7 @@
<result column="creditCode" property="creditcode"/>
<result column="enterpriseName" property="enterprisename"/>
<result column="representative" property="representative"/>
- <result column="establishTime" property="establishtime"/>
+ <result column="establishtime" property="establishtime"/>
<result column="registeredCapital" property="registeredcapital"/>
<result column="organizationCode" property="organizationcode"/>
<result column="registrationNumber" property="registrationnumber"/>
diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index c0d86ee..e796d9f 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -63,7 +63,6 @@
* 成立日期
*/
@ApiModelProperty(value = "注册时间")
- @TableField("establishTime")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date establishtime;
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 0ee7960..36f2757 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -8,7 +8,7 @@
<result column="creditCode" property="creditcode"/>
<result column="enterpriseName" property="enterprisename"/>
<result column="representative" property="representative"/>
- <result column="establishTime" property="establishtime"/>
+ <result column="establishtime" property="establishtime"/>
<result column="registeredCapital" property="registeredcapital"/>
<result column="organizationCode" property="organizationcode"/>
<result column="registrationNumber" property="registrationnumber"/>
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 da93d93..d0e30b1 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -92,7 +92,8 @@
@ApiOperation(value = "新增", notes = "传入recordk")
public R save(@Valid @RequestBody Recordk recordk) {
String cardid = recordk.getCardid();
- Map map = recordkService.selectIn(cardid);
+ String ptype = recordk.getPtype();
+ Map map = recordkService.selectIn(cardid,ptype);
if (map!=null){
String id = map.get("id").toString();
recordkService.removeByIds(Func.toLongList(id));
@@ -110,7 +111,8 @@
@ApiOperation(value = "新增", notes = "传入permit")
public R recorkstorage(@Valid @RequestBody Recordk recordk) {
String cardid = recordk.getCardid();
- Map map = recordkService.selectIn(cardid);
+ String ptype = recordk.getPtype();
+ Map map = recordkService.selectIn(cardid,ptype);
if (map!=null){
recordk.setStorage("0");
recordkService.updateById(recordk);
@@ -156,8 +158,8 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid) {
- Map map = recordkService.selectIn(cardid);
+ public R selectIn(String cardid,String type) {
+ Map map = recordkService.selectIn(cardid,type);
return R.data(map);
}
diff --git a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
index b21991b..b7074db 100644
--- a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
+++ b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
@@ -153,12 +153,12 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date permitime;
- private String reason;
private String cardid;
private String representativecell;
private String contacts;
private String contactscell;
private String storage;
+ private String approve;
}
diff --git a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java
index a7bed85..5279c5b 100644
--- a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java
+++ b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java
@@ -40,5 +40,5 @@
* @return
*/
List<RecordkVO> selectRecordkPage(IPage page, RecordkVO recordk);
- Map selectIn(String cardid);
+ Map selectIn(String cardid,String type);
}
diff --git a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
index d33162c..3de1cfe 100644
--- a/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
+++ b/src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
@@ -31,6 +31,7 @@
<result column="contacts" property="contacts"/>
<result column="contactscell" property="contactscell"/>
<result column="storage" property="storage"/>
+ <result column="approve" property="approve"/>
</resultMap>
@@ -39,6 +40,6 @@
</select>
<select id="selectIn" resultType="java.util.HashMap">
- select * from sys_recordk where storage=0 and cardid=#{cardid}
+ select * from sys_recordk where cardid=#{cardid} and ptype=#{type}
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/recordk/service/IRecordkService.java b/src/main/java/org/springblade/modules/recordk/service/IRecordkService.java
index 02dd096..420cbb8 100644
--- a/src/main/java/org/springblade/modules/recordk/service/IRecordkService.java
+++ b/src/main/java/org/springblade/modules/recordk/service/IRecordkService.java
@@ -39,5 +39,5 @@
* @return
*/
IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, RecordkVO recordk);
- Map selectIn(String cardid);
+ Map selectIn(String cardid,String type);
}
diff --git a/src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java b/src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java
index e176df2..2781e19 100644
--- a/src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java
+++ b/src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.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/entity/Revoke.java b/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
index 35fa5ac..6fc2780 100644
--- a/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
+++ b/src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -63,7 +63,6 @@
* 成立日期
*/
@ApiModelProperty(value = "成立日期")
- @TableField("establishTime")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date establishtime;
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 b93f60a..0fa164b 100644
--- a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
+++ b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -8,7 +8,7 @@
<result column="creditCode" property="creditcode"/>
<result column="enterpriseName" property="enterprisename"/>
<result column="representative" property="representative"/>
- <result column="establishTime" property="establishtime"/>
+ <result column="establishtime" property="establishtime"/>
<result column="registeredCapital" property="registeredcapital"/>
<result column="organizationCode" property="organizationcode"/>
<result column="registrationNumber" property="registrationnumber"/>
--
Gitblit v1.9.3