diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java index 79ebf8e..30a7385 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java @@ -25,6 +25,8 @@ public class AdminManager extends DisasterInfo{ private String researchField; + private String vordmId; + private Date reviewTime; private Date applyTime; 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 eef1bb7..72150c5 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 @@ -34,7 +34,8 @@ di.disaster_time, di.disaster_level, di.disaster_country, - di.sponsor_organization + di.sponsor_organization, + di.vordm_id as vordmId from guest_manage_disaster_ref gmdr left join disaster_info di on gmdr.disaster_id = di.id left join blade_user bu on gmdr.manager_id = bu.id 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 8db7b09..87e60c8 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 @@ -114,7 +114,13 @@ public class EntityDataServiceImpl extends ServiceImpl