diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchQueryVo.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchQueryVo.java index 67bae1209..9f4570082 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchQueryVo.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchQueryVo.java @@ -7,6 +7,7 @@ public class AchQueryVo { private String achievementName;//名称 private Long userId; private String showAchievementName; + private String rongbanName; public String getAreaQuery() { return areaQuery; } @@ -46,4 +47,12 @@ public class AchQueryVo { public void setShowAchievementName(String showAchievementName) { this.showAchievementName = showAchievementName; } + + public String getRongbanName() { + return rongbanName; + } + + public void setRongbanName(String rongbanName) { + this.rongbanName = rongbanName; + } } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchievementSourceStatisticVo.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchievementSourceStatisticVo.java index c71c0143a..387849cb9 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchievementSourceStatisticVo.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/AchievementSourceStatisticVo.java @@ -1,11 +1,30 @@ package com.microservices.dms.achievementLibrary.domain; public class AchievementSourceStatisticVo { + private String rongbanName; + + private String ronbanDesc; //成果数 private Long achievementSum; //点击量(浏览量) private Long clickSum; + public String getRongbanName() { + return rongbanName; + } + + public void setRongbanName(String rongbanName) { + this.rongbanName = rongbanName; + } + + public String getRonbanDesc() { + return ronbanDesc; + } + + public void setRonbanDesc(String ronbanDesc) { + this.ronbanDesc = ronbanDesc; + } + public Long getAchievementSum() { return achievementSum; } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java index e84bcf2c7..de955be2b 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java @@ -175,4 +175,5 @@ public interface AchievementsMapper { String getField1RemarkByParam(@Param("source")String source,@Param("areaKey") String areaKey); AchievementSourceStatisticVo getSource5Statistic(@Param("name") String name); + AchievementSourceStatisticVo getSource5Field2(@Param("name") String name); } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java index dce9c29c0..6819e369d 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java @@ -617,7 +617,11 @@ public class AchievementsServiceImpl implements IAchievementsService { @Override public AchievementSourceStatisticVo getSource5Statistic(String name) { - return achievementsMapper.getSource5Statistic(name); + AchievementSourceStatisticVo statisticVo = achievementsMapper.getSource5Field2(name); + AchievementSourceStatisticVo ronbanVo = achievementsMapper.getSource5Statistic(name); + ronbanVo.setClickSum(statisticVo.getClickSum()); + ronbanVo.setAchievementSum(statisticVo.getAchievementSum()); + return ronbanVo; } @Override diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml index 01198a716..4ef4fa908 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml @@ -338,6 +338,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (a.field_1 = #{areaQuery} or a.field_2 = #{areaQuery} or a.field_3 = #{areaQuery}) + and a.field_2 = #{rongbanName} order by a.create_time desc @@ -955,4 +956,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" achievements.source = '5' and achievements.field_2 = #{name} + \ No newline at end of file