glj-代码提交
This commit is contained in:
parent
78d40da6b8
commit
6b3dc3554b
|
@ -67,4 +67,9 @@ public class CallForHelpVo extends DisasterInfo {
|
||||||
* 受灾国家
|
* 受灾国家
|
||||||
*/
|
*/
|
||||||
private String disasterCountry;
|
private String disasterCountry;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 受灾国家
|
||||||
|
*/
|
||||||
|
private String vordmId;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
|
||||||
@SpringCloudApplication
|
@SpringCloudApplication
|
||||||
public class VoRdmApplication {
|
public class VoRdmApplication {
|
||||||
public static void main(String[] args) {
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -173,6 +173,7 @@
|
||||||
SELECT
|
SELECT
|
||||||
d.chief_id,
|
d.chief_id,
|
||||||
d.chief_name,
|
d.chief_name,
|
||||||
|
d.vordm_id,
|
||||||
u.username ,
|
u.username ,
|
||||||
u.last_name AS lastName,
|
u.last_name AS lastName,
|
||||||
u.first_name AS firstName,
|
u.first_name AS firstName,
|
||||||
|
|
|
@ -40,8 +40,8 @@
|
||||||
ms.vordm_id,
|
ms.vordm_id,
|
||||||
ms.name AS msName
|
ms.name AS msName
|
||||||
from entity_data ed
|
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>
|
<where>
|
||||||
<if test="entityData.disasterId != null and entityData.disasterId != ''">
|
<if test="entityData.disasterId != null and entityData.disasterId != ''">
|
||||||
ed.disaster_id = #{entityData.disasterId}
|
ed.disaster_id = #{entityData.disasterId}
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
update blade_user t set t.password = #{password} where t.email = #{email}
|
update blade_user t set t.password = #{password} where t.email = #{email}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateAccount">
|
<update id="updateAccount">
|
||||||
|
|
||||||
update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization},
|
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}
|
t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country}
|
||||||
where t.id = #{id}
|
where t.id = #{id}
|
||||||
|
|
Loading…
Reference in New Issue