diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BigScreenStatisticService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BigScreenStatisticService.java index 64b87ccf0..5da8534bd 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BigScreenStatisticService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BigScreenStatisticService.java @@ -186,6 +186,7 @@ public class BigScreenStatisticService { return competitionResourceLibraryMapper.getCompetitionHot(); } + public List> getCompetitionYearlyPaperAdd() { Date[] currentYear = DateUtil.getLast12Months(); diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml index dba346015..48d09873e 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml @@ -130,7 +130,7 @@ ci.status as competition_status, cu.works_name as competition_submission_name, cu.created_at as submission_time, - cu.leader as submitter, + IFNULL(cu.leader,us.nickname) as submitter, submission_type, cu.org_name as submitting_unit, IFNULL(crl.submission_summary,cu.sub_item) as submission_summary, @@ -151,6 +151,7 @@ ci.is_expert_audit from competition_infos ci join (select * from competition_users where `status` = 3) cu on ci.id = cu.competition_info_id + inner join users us on cu.user_id=us.id left join competition_resource_library crl on crl.competition_user_id = cu.id and open_competition_id = #{openCompetitionId} @@ -253,9 +254,9 @@