冲突解决

This commit is contained in:
glj 2023-04-25 10:47:23 +08:00
commit 51f9a9e4e1
2 changed files with 14 additions and 11 deletions

View File

@ -37,9 +37,7 @@
</sql> </sql>
<sql id="Home_Disaster_Info"> <sql id="Home_Disaster_Info">
d d.disaster_type
.
disaster_type
,d.disaster_time,d.disaster_country, ,d.disaster_time,d.disaster_country,
m.organization m.organization
</sql> </sql>
@ -130,15 +128,18 @@
</select> </select>
<select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse"> <select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse">
SELECT bu.name AS `name`, SELECT
g.username AS `name`,
count(*) AS cnt, count(*) AS cnt,
'responseOrganization' AS `type` 'sponsorOrganization' AS `type`
FROM guest_manage_disaster_ref t FROM
INNER JOIN blade_user bu ON bu.id = t.manager_id disaster_info t
WHERE bu.name != '' INNER JOIN guest_manage_disaster_ref gm ON gm.disaster_id = t.id
AND t.`status` = '1' INNER JOIN guest_info g ON g.id = gm.sponsor_id
WHERE
gm.`status` != 2
GROUP BY GROUP BY
bu.name gm.sponsor_id
ORDER BY ORDER BY
cnt DESC cnt DESC
LIMIT 5 LIMIT 5

View File

@ -26,6 +26,7 @@
<update id="updatePassword"> <update id="updatePassword">
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}
@ -38,6 +39,7 @@
email = #{email} email = #{email}
</where> </where>
</select> </select>
<select id="getByUserStatisticsOne" resultType="java.lang.Integer"> <select id="getByUserStatisticsOne" resultType="java.lang.Integer">
select count(di.id) select count(di.id)
FROM disaster_info di FROM disaster_info di