bug 3328\3326

This commit is contained in:
13036795865 2025-06-17 15:35:38 +08:00
parent 4a07c4b8d3
commit 47cb86ad7c
1 changed files with 28 additions and 34 deletions

View File

@ -251,22 +251,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getTjByAreas" resultType="com.microservices.dms.achievementLibrary.domain.KeyValueVo"> <select id="getTjByAreas" resultType="com.microservices.dms.achievementLibrary.domain.KeyValueVo">
select c.id as "key", c.name as "name", f.value as "value" select r.name as "name",count(1) as "value" from (
from (select a.domain_value as "name", sum(a.countResult) as "value" select c.name,a.source, a.field_1,c.remark
from (select 'field_1' as domain_type, field_1 as domain_value, count(field_1) as countResult from achievements a
from achievements left join project_categories c on a.field_1 = c.id
group by field_1 where a.source='1' and a.field_1 is not null and a.field_1 !=""
union all union all
select 'field_2' as domain_type, field_2 as domain_value, count(field_2) as countResult select c.name, a.source, a.field_1, c.remark
from achievements from achievements a
group by field_2 left join categories c on a.field_1 = c.id
union all where a.source in ('2','3','4') and a.field_1 is not null and a.field_1 !=""
select 'field_3' as domain_type, field_3 as domain_value, count(field_3) as countResult )r
from achievements group by r.name
group by field_3) a order by count(1) desc
group by a.domain_value
order by sum(a.countResult) desc) f
right join categories c on c.id = f.name
limit 0,5 limit 0,5
</select> </select>
@ -533,23 +530,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getAchievementDomain" resultType="java.util.Map"> <select id="getAchievementDomain" resultType="java.util.Map">
select c.id as "key", c.name as "name", f.value as "value" select r.name as "name",count(1) as "value" from (
from (select a.domain_value as "name", sum(a.countResult) as "value" select
from (select 'field_1' as domain_type, field_1 as domain_value, count(field_1) as countResult c.name,a.source, a.field_1,c.remark
from achievements from achievements a
group by field_1 left join project_categories c on a.field_1 = c.id
union all where a.source='1' and a.field_1 is not null and a.field_1 !=""
select 'field_2' as domain_type, field_2 as domain_value, count(field_2) as countResult union all
from achievements select
group by field_2 c.name, a.source, a.field_1, c.remark
union all from achievements a
select 'field_3' as domain_type, field_3 as domain_value, count(field_3) as countResult left join categories c on a.field_1 = c.id
from achievements where a.source in ('2','3','4') and a.field_1 is not null and a.field_1 !=""
group by field_3) a )r
group by a.domain_value group by r.name
order by sum(a.countResult) desc) f
right join categories c on c.id = f.name where f.value is not null
</select> </select>
<select id="getAchievementAddYearly" resultType="java.util.Map"> <select id="getAchievementAddYearly" resultType="java.util.Map">
@ -559,7 +553,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by DATE_FORMAT(create_time, '%Y') order by DATE_FORMAT(create_time, '%Y')
</select> </select>
<select id="getAchievementHotRank" resultType="java.util.Map"> <select id="getAchievementHotRank" resultType="java.util.Map">
select achievement_name as name, create_time as reelaseTime, hot_rank from achievements select IFNULL(show_ach_name,achievement_name) as name, create_time as reelaseTime, hot_rank from achievements
order by hot_rank desc order by hot_rank desc
</select> </select>