From ad5de299c6aacd7e6273917e27a07c79987cfad8 Mon Sep 17 00:00:00 2001
From: glj <管理局23456>
Date: Sat, 8 Apr 2023 14:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/kening/vordm/entity/DisasterInfo.java | 1 -
.../com/kening/vordm/entity/GuestInfo.java | 10 +++++++++
.../vordm/entity/GuestManageDisasterRef.java | 5 +++++
.../com/kening/vordm/vo/EntityDataUserVo.java | 10 +++++++++
.../vordm/mapper/DisasterInfoMapper.xml | 3 ++-
.../kening/vordm/mapper/GuestInfoMapper.xml | 22 ++++++++++---------
.../mapper/GuestManageDisasterRefMapper.xml | 3 ++-
.../service/impl/EntityDataServiceImpl.java | 16 ++++++--------
8 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
index 201e02e..09a382a 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
@@ -114,7 +114,6 @@ public class DisasterInfo implements Serializable {
/**
* 发起机构
*/
- @TableField(exist = false)
private String sponsorOrganization;
/**
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java
index 405bf9d..3c7a47e 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestInfo.java
@@ -51,6 +51,16 @@ public class GuestInfo implements Serializable {
*/
private Integer isManage;
+ /**
+ * 职业
+ */
+ private String occupation;
+
+ /**
+ * 职称
+ */
+ private String professionalTitle;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java
index a77d85b..b75f64a 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java
@@ -40,6 +40,11 @@ public class GuestManageDisasterRef implements Serializable {
*/
private Long disasterId;
+ /**
+ * 灾害id
+ */
+ private String responseOrganization;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
index 5ecbcd1..9828532 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java
@@ -121,4 +121,14 @@ public class EntityDataUserVo {
* 验证码
*/
private Integer Verification;
+
+ /**
+ * 职业
+ */
+ private String occupation;
+
+ /**
+ * 职称
+ */
+ private String professionalTitle;
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index f78e524..0db5224 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -22,6 +22,7 @@
+
@@ -30,7 +31,7 @@
di.disaster_level,di.disaster_country,di.respond_status,
di.visit_count,di.spider_type,di.tempend_time,
di.temp_start_time,di.create_time,di.vordm_id,
- di.respond_time,di.download_count
+ di.respond_time,di.download_count,di.sponsor_organization
d.disaster_type,d.disaster_time,d.disaster_country,
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
index 6dcedb9..a0b1982 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
@@ -1,22 +1,24 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
id,username,email,
organization,research_field,create_time,
- is_manage
+ is_manage,occupation,professional_title
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
index 7b1106c..c24283a 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
@@ -10,10 +10,11 @@
+
id,sponsor_id,uploader_id,
- manager_id,disaster_id
+ manager_id,disaster_id,response_organization
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
index 4cbad72..1424673 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
@@ -37,6 +37,7 @@ public class EntityDataServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>();
- qw.eq(GuestInfo::getEmail,entityDataUserVo.getEmail());
+ qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail());
GuestInfo guestInfo1 = guestInfoMapper.selectOne(qw);
- if (guestInfo1==null){
+ if (guestInfo1 == null) {
GuestInfo guestInfo = new GuestInfo();
guestInfo.setEmail(entityDataUserVo.getEmail());
guestInfo.setOrganization(entityDataUserVo.getOrganization());
@@ -61,9 +62,11 @@ public class EntityDataServiceImpl extends ServiceImpl1;
}