冲突解决
This commit is contained in:
commit
51f9a9e4e1
|
@ -37,9 +37,7 @@
|
|||
</sql>
|
||||
|
||||
<sql id="Home_Disaster_Info">
|
||||
d
|
||||
.
|
||||
disaster_type
|
||||
d.disaster_type
|
||||
,d.disaster_time,d.disaster_country,
|
||||
m.organization
|
||||
</sql>
|
||||
|
@ -130,15 +128,18 @@
|
|||
</select>
|
||||
|
||||
<select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse">
|
||||
SELECT bu.name AS `name`,
|
||||
count(*) AS cnt,
|
||||
'responseOrganization' AS `type`
|
||||
FROM guest_manage_disaster_ref t
|
||||
INNER JOIN blade_user bu ON bu.id = t.manager_id
|
||||
WHERE bu.name != ''
|
||||
AND t.`status` = '1'
|
||||
SELECT
|
||||
g.username AS `name`,
|
||||
count(*) AS cnt,
|
||||
'sponsorOrganization' AS `type`
|
||||
FROM
|
||||
disaster_info t
|
||||
INNER JOIN guest_manage_disaster_ref gm ON gm.disaster_id = t.id
|
||||
INNER JOIN guest_info g ON g.id = gm.sponsor_id
|
||||
WHERE
|
||||
gm.`status` != 2
|
||||
GROUP BY
|
||||
bu.name
|
||||
gm.sponsor_id
|
||||
ORDER BY
|
||||
cnt DESC
|
||||
LIMIT 5
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
<update id="updatePassword">
|
||||
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}
|
||||
|
@ -38,6 +39,7 @@
|
|||
email = #{email}
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="getByUserStatisticsOne" resultType="java.lang.Integer">
|
||||
select count(di.id)
|
||||
FROM disaster_info di
|
||||
|
|
Loading…
Reference in New Issue