glj-代码提交

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java

@@ -114,6 +114,24 @@ public class EntityData implements Serializable {
 	@TableField(exist = false)
 	private String uploaderName;
 
+	/**
+	 * 图层名称
+	 */
+	@TableField(exist = false)
+	private String layerName;
+
+	/**
+	 * vordmId
+	 */
+	@TableField(exist = false)
+	private String vordmId;
+
+	/**
+	 * 图层名称
+	 */
+	@TableField(exist = false)
+	private String msName;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml

@@ -35,9 +35,13 @@
     <select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
         select
         <include refid="Base_Column_List"/>,
-               gi.username AS uploaderName
+               gi.username AS uploaderName,
+               ms.layer_name,
+               ms.vordm_id,
+               ms.name AS msName
         from entity_data ed
-        left join guest_info gi on gi.id = ed.uploader_id
+        inner join guest_info gi on gi.id = ed.uploader_id
+            inner join map_server ms on ms.disaster_id = ed.disaster_id
         <where>
             <if test="entityData.disasterId != null and entityData.disasterId != ''">
                 ed.disaster_id = #{entityData.disasterId}