融办分类数据统计，增加名称和搜索

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;
+    }
 }

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;
     }

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);
 }

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

microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml

@@ -338,6 +338,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test='areaQuery != null  and areaQuery != "" '>
                     and (a.field_1 = #{areaQuery} or a.field_2 = #{areaQuery} or a.field_3 = #{areaQuery})
                 </if>
+                <if test="rongbanName != null  and rongbanName != ''"> and a.field_2 = #{rongbanName}</if>
             </where>
             order by a.create_time desc
         </if>
@@ -955,4 +956,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             achievements.source = '5' and achievements.field_2 = #{name}
     </select>
 
+    <select id="getSource5Field2" parameterType="String"  resultType="com.microservices.dms.achievementLibrary.domain.AchievementSourceStatisticVo">
+        SELECT field_2 as rongbanName, field_3 as rongbanDesc FROM achievements  WHERE achievements.source = '5' and achievements.field_2 = #{name}
+    </select>
 </mapper>