diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java index 92ce543..c74e972 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java @@ -123,6 +123,9 @@ public class EntityData implements Serializable { private String password; + //来源路径 方便查看信息来源 + private String sourceLink; + /** * 上传人姓名 */ diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java index 889ce2b..649ae28 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java @@ -27,4 +27,8 @@ public class OtherData{ private Integer visualFlag; private String sourceOrganization; + + private String sourceLink; + + private Long userId; } 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 549eb45..5254f34 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 @@ -885,7 +885,7 @@ LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id gmdr.manager_id = #{userId} - and di.respond_status > 1 + and di.respond_status = 2 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index e714d56..ac6bf50 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -27,12 +27,11 @@ + - ed - . - id + ed.id ,ed.title,ed.size, ed.type,ed.link,ed.remark, ed.upload_time,ed.disaster_id,ed.visual_flag, @@ -40,7 +39,7 @@ ed.status,ed.uploader_id,ed.manager_id, ed.review_time, ed.source_organization, ed.upload_type, ed.is_deleted, ed.is_publish, - ed.is_download, ed.account, ed.password + ed.is_download, ed.account, ed.password, ed.source_link