作者：张哲

时间：2023/05/22
类型：优化
描述：里程碑(3) PC 12个月统计修改排序

src/main/java/com/redxun/knowledge/analysis/entity/vo/LablesVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -22,5 +23,5 @@ public class LablesVo implements Serializable {
 
     private String name;
 
-    private List<Map<String, Object>> values;
+    private List<LinkedHashMap<String, Object>> values;
 }

src/main/java/com/redxun/knowledge/analysis/service/AnalysisSearchServiceImpl.java

@@ -147,7 +147,7 @@ public class AnalysisSearchServiceImpl {
         Map<String, Object> map = new HashMap<>();
         map.put("name", "访问总量");
         map.put("value", total.get());
-        item.add(map);
+        item.add(0,map);
         organizationSearchVo.setItem(item);
         return organizationSearchVo;
     }

src/main/java/com/redxun/knowledge/service/KnowledgeServiceImpl.java

@@ -368,7 +368,7 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
         //处理组织架构
         if (!ObjectUtil.valueAllNull(entity.getOrganizationIds())){
             String organizationId = JSON.toJSON(entity.getOrganizationIds()).toString();
-            knowledge.setOrganizationId(organizationId);
+            entity.setOrganizationId(organizationId);
         }
         // 知识为待节点审核状态和待最终审核状态,修改失败;知识为最终审核通过,修改失败
         if (knowledge.getApprovalStatus() == 3 || knowledge.getApprovalStatus() == 1) {
@@ -694,7 +694,14 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
         if (CollectionUtils.isEmpty(organizationDto.getOrganizationId()) && !CollectionUtils.isEmpty(organizationDto.getGradeId()) &&
                 CollectionUtils.isEmpty(organizationDto.getGradeLevelId())) {
             // 比较当前用户的职系是否符合条件
-            if (organizationDto.getGradeId().contains(sequenceCode)) {
+            boolean flag = false;
+            for (String s : organizationDto.getGradeId()) {
+                if (s.contains(sequenceCode)) {
+                    flag = true;
+                    break;
+                }
+            }
+            if (flag) {
                 // 符合条件,增加点击量
                 if (isView) {
                     addCountViews(osUserDto.getUserId(), knowledgeVo.getPkId());
@@ -725,7 +732,14 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
         // 如果职等为空,组织架构id,职系不为空
         if (!CollectionUtils.isEmpty(organizationDto.getOrganizationId()) && !CollectionUtils.isEmpty(organizationDto.getGradeId()) &&
                 CollectionUtils.isEmpty(organizationDto.getGradeLevelId())) {
-            if (flags.get() && organizationDto.getGradeId().contains(sequenceCode)) {
+            boolean flag = false;
+            for (String s : organizationDto.getGradeId()) {
+                if (s.contains(sequenceCode)) {
+                    flag = true;
+                    break;
+                }
+            }
+            if (flags.get() && flag) {
                 // 符合条件,增加点击量
                 if (isView) {
                     addCountViews(osUserDto.getUserId(), knowledgeVo.getPkId());
@@ -755,7 +769,14 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
         // 如果组织架构id为空,职系,职等不为空
         if (CollectionUtils.isEmpty(organizationDto.getOrganizationId()) && !CollectionUtils.isEmpty(organizationDto.getGradeId()) &&
                 !CollectionUtils.isEmpty(organizationDto.getGradeLevelId())) {
-            if (organizationDto.getGradeId().contains(sequenceCode) && organizationDto.getGradeLevelId().contains(slyGrade)) {
+            boolean flag = false;
+            for (String s : organizationDto.getGradeId()) {
+                if (s.contains(sequenceCode)) {
+                    flag = true;
+                    break;
+                }
+            }
+            if (flag && organizationDto.getGradeLevelId().contains(slyGrade)) {
                 // 符合条件,增加点击量
                 if (isView) {
                     addCountViews(osUserDto.getUserId(), knowledgeVo.getPkId());
@@ -770,7 +791,14 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
         // 如果组织架构id,职系,职等都不为空
         if (!CollectionUtils.isEmpty(organizationDto.getOrganizationId()) && !CollectionUtils.isEmpty(organizationDto.getGradeId()) &&
                 !CollectionUtils.isEmpty(organizationDto.getGradeLevelId())) {
-            if (flags.get() && organizationDto.getGradeId().contains(sequenceCode) && organizationDto.getGradeLevelId().contains(slyGrade)) {
+            boolean flag = false;
+            for (String s : organizationDto.getGradeId()) {
+                if (s.contains(sequenceCode)) {
+                    flag = true;
+                    break;
+                }
+            }
+            if (flags.get() && flag && organizationDto.getGradeLevelId().contains(slyGrade)) {
                 // 符合条件,增加点击量
                 if (isView) {
                     addCountViews(osUserDto.getUserId(), knowledgeVo.getPkId());

src/main/resources/mapper/knowledge/analysis/PvLogMapper.xml

@@ -57,14 +57,14 @@
 
     <resultMap id="lablesVo" type="com.redxun.knowledge.analysis.entity.vo.LablesVo">
         <result property="name" column="name"/>
-        <collection property="values" ofType="map">
+        <collection property="values" ofType="java.util.LinkedHashMap">
             <result column="legend" property="legend"/>
             <result column="value" property="value"/>
             <result column="percentage" property="percentage"/>
         </collection>
     </resultMap>
     <select id="searchVisitHistogram" resultMap="searchVisitHistogram">
-        select nvl(value,0) value , s2.name, s2.legend, nvl(percentage,0.00) percentage,sum(value) over () total
+        select nvl(value,0) value , s2.name, s2.legend, nvl(percentage,0.00) percentage,sum(value) over () total,s2.sn
         from (
         select value, concat(ltrim(to_char(dates, 'mm'), '0'), '月') name, legend, percentage
         from (
@@ -78,6 +78,7 @@
         from KM_PV_LOG
         where to_char(CREATE_TIME_, 'yyyy-mm') &lt;= #{lastDay}
         and to_char(CREATE_TIME_, 'yyyy-mm') &gt;= #{firstDay}
+        and SUB_MODULE = '详情'
         group by to_char(CREATE_TIME_, 'yyyy-mm'), PLATFORM
         ) t1
         right join (SELECT TO_CHAR(ADD_MONTHS(TO_DATE(#{firstDay}, 'yyyy-MM'), ROWNUM - 1),
@@ -89,7 +90,7 @@
         on t1.name = t2.monthlist
         order by dates)) s1
         right join (
-        select concat(ltrim(to_char(monthlist, 'mm'), '0'), '月') name, legend,monthlist
+        select concat(ltrim(to_char(monthlist, 'mm'), '0'), '月') name, legend,monthlist,sn
         from (
         SELECT ADD_MONTHS(TO_DATE(#{firstDay}, 'yyyy-MM'), ROWNUM - 1) as monthlist
         FROM DUAL
@@ -97,11 +98,12 @@
         months_between(to_date(#{lastDay}, 'yyyy-MM'),
         to_date(#{firstDay}, 'yyyy-MM')) + 1 order by monthlist),
         (SELECT dic.NAME_ legend,
-        dic.VALUE_ legendValue
+        dic.VALUE_ legendValue,
+        dic.SN_ sn
         FROM LEARNING_SYSTEM_DEV.SYS_TREE tree
         INNER JOIN LEARNING_SYSTEM_DEV.SYS_DIC dic ON tree.TREE_ID_ = dic.TREE_ID_
         WHERE ALIAS_ = 'KNOWLEDGE_PLATFORM') order by monthlist
-        ) s2 on s1.name = s2.name and s1.legend = s2.legend order by s2.monthlist
+        ) s2 on s1.name = s2.name and s1.legend = s2.legend order by s2.monthlist,s2.sn
     </select>
 
     <select id="albumDetailVisits" resultType="com.redxun.knowledge.analysis.entity.vo.AlbumDetailVisitsVo">