glj-代码提交

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java

@@ -67,4 +67,9 @@ public class CallForHelpVo extends DisasterInfo {
 	 * 受灾国家
 	 */
 	private String disasterCountry;
+
+	/**
+	 * 受灾国家
+	 */
+	private String vordmId;
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java

@@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @SpringCloudApplication
 public class VoRdmApplication {
 	public static void main(String[] args) {
-		BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
+		BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
 	}
 }

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

@@ -173,6 +173,7 @@
         SELECT
         d.chief_id,
         d.chief_name,
+        d.vordm_id,
         u.username ,
         u.last_name AS lastName,
         u.first_name AS firstName,

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

@@ -40,8 +40,8 @@
                ms.vordm_id,
                ms.name AS msName
         from entity_data ed
-        inner join guest_info gi on gi.id = ed.uploader_id
+        left join guest_info gi on gi.id = ed.uploader_id
-            inner join map_server ms on ms.disaster_id = ed.disaster_id
+        left 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}

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

@@ -27,7 +27,6 @@
         update blade_user t set t.password = #{password} where t.email = #{email}
     </update>
     <update id="updateAccount">
-
         update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization},
                                 t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country}
         where t.id = #{id}