From 85d104564863e5df7b032b8dadd06fb13482051f Mon Sep 17 00:00:00 2001 From: gjq Date: Tue, 7 Dec 2021 18:52:18 +0800 Subject: [PATCH] .... --- .../controller/ContentController.java | 40 +++- .../activity/mapper/ContentMapper.java | 7 + .../com/nbclass/activity/model/Census.java | 12 + .../activity/service/ContentService.java | 4 +- .../service/impl/ContentServiceImpl.java | 10 +- .../mapper/activity/ContentMapper.xml | 42 +++- .../resources/templates/content/census.html | 226 +++++++++++++++--- .../resources/templates/content/edit2.html | 2 +- .../resources/templates/content/list2.html | 9 +- .../resources/templates/index/workdest.html | 4 +- 10 files changed, 310 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/nbclass/activity/model/Census.java diff --git a/src/main/java/com/nbclass/activity/controller/ContentController.java b/src/main/java/com/nbclass/activity/controller/ContentController.java index 55bc260..502d172 100644 --- a/src/main/java/com/nbclass/activity/controller/ContentController.java +++ b/src/main/java/com/nbclass/activity/controller/ContentController.java @@ -1,8 +1,7 @@ package com.nbclass.activity.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.text.Collator; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -14,6 +13,7 @@ import com.nbclass.activity.service.DataDictService; import com.nbclass.exception.ParameterException; import com.nbclass.system.service.UserService; import com.nbclass.util.JWTUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -293,7 +293,7 @@ public class ContentController extends BaseController { service.update(entity); if(entity.getApplicationId()!=null){ //更新审核申请单状态 - service.updateApplicationStatus(entity.getApplicationId()); + service.updateApplicationStatus(entity.getId(),entity.getApplicationId()); } desc="修改案例，案例类型："+type+"，案例ID："+entity.getId()+"，案例标题："+entity.getTitle(); }else{ @@ -325,11 +325,11 @@ public class ContentController extends BaseController { for (Long aLong : IdList) { //案例是否发布 Content editContent = service.getEditContent(aLong); - if(editContent.getRelease() != 5 && editContent.getRelease() !=3){ + if(editContent.getStatus() != 5 && editContent.getStatus() !=3 || editContent.getStatus() == 2){ throw new ParameterException("案例已上线或审核中，无法删除!"); } if(editContent.getRelease() == 3){ - + service.deleteApplication(editContent.getApplicationId()); } } service.delete(IdList); @@ -496,4 +496,32 @@ public class ContentController extends BaseController { return Result.success(); } + /** + * 案例统计 + * @param type + * @return + */ + @GetMapping("/getCensus") + @ResponseBody + public Result getCensus(Integer type){ + //根据type获取统计信息 1、本周统计 2、本月统计 3、本季度统计 4、年度统计 + List list = service.getCensus(type); + Long count = 0L; + for (Census census : list) { + count += census.getCount(); + } + List list2 = new ArrayList<>(); + list.sort(Comparator.comparing(Census::getId)); + for (int i = 0; i < list.size(); i++) { + if(list.get(i).getId() == 254 || list.get(i).getId() == 262 || list.get(i).getId() == 267){ + list.remove(i); + } + list2.add(list.get(i).getCount()); + } + Map map = new HashMap<>(); + map.put("count",count); + map.put("list",list2); + return Result.success(map); + } + } diff --git a/src/main/java/com/nbclass/activity/mapper/ContentMapper.java b/src/main/java/com/nbclass/activity/mapper/ContentMapper.java index c292cc5..e280a60 100644 --- a/src/main/java/com/nbclass/activity/mapper/ContentMapper.java +++ b/src/main/java/com/nbclass/activity/mapper/ContentMapper.java @@ -1,6 +1,7 @@ package com.nbclass.activity.mapper; import java.util.List; +import java.util.Map; import com.nbclass.activity.model.*; import org.apache.ibatis.annotations.Param; @@ -220,4 +221,10 @@ public interface ContentMapper extends MyMapper { */ Application getApplication(Long contentId); + /** + * 本周统计案例数量 + * @return + */ + List getCensus(Integer type); + } diff --git a/src/main/java/com/nbclass/activity/model/Census.java b/src/main/java/com/nbclass/activity/model/Census.java new file mode 100644 index 0000000..5b4c7c5 --- /dev/null +++ b/src/main/java/com/nbclass/activity/model/Census.java @@ -0,0 +1,12 @@ +package com.nbclass.activity.model; + +import lombok.Data; + +@Data +public class Census { + + private Integer id; + + private Integer count; + +} diff --git a/src/main/java/com/nbclass/activity/service/ContentService.java b/src/main/java/com/nbclass/activity/service/ContentService.java index 8731b05..0482100 100644 --- a/src/main/java/com/nbclass/activity/service/ContentService.java +++ b/src/main/java/com/nbclass/activity/service/ContentService.java @@ -1,6 +1,7 @@ package com.nbclass.activity.service; import java.util.List; +import java.util.Map; import com.github.pagehelper.PageInfo; import com.nbclass.activity.model.*; @@ -154,7 +155,7 @@ public interface ContentService { * 更新审核申请单状态 * @param applicationId */ - void updateApplicationStatus(Long applicationId); + void updateApplicationStatus(Long contentId,Long applicationId); /** * 获取审核列表 @@ -190,4 +191,5 @@ public interface ContentService { */ void deleteRelease(Long contentId); + List getCensus(Integer type); } diff --git a/src/main/java/com/nbclass/activity/service/impl/ContentServiceImpl.java b/src/main/java/com/nbclass/activity/service/impl/ContentServiceImpl.java index a3afdce..714df5b 100644 --- a/src/main/java/com/nbclass/activity/service/impl/ContentServiceImpl.java +++ b/src/main/java/com/nbclass/activity/service/impl/ContentServiceImpl.java @@ -3,6 +3,7 @@ package com.nbclass.activity.service.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.annotation.Resource; import javax.transaction.Transactional; @@ -407,11 +408,13 @@ public class ContentServiceImpl implements ContentService { @Override @Transactional - public void updateApplicationStatus(Long applicationId) { + public void updateApplicationStatus(Long contentId,Long applicationId) { //更新审核申请单状态 mapper.updateApplicationStatus(applicationId); //更新审核人状态 mapper.updateCheckStatus(applicationId); + //更新案例状态(上架后重新申请) + mapper.updateContentRelease(contentId,1,2); } @Override @@ -466,5 +469,10 @@ public class ContentServiceImpl implements ContentService { mapper.updateContentRelease(contentId,4,2); } + @Override + public List getCensus(Integer type) { + return mapper.getCensus(type); + } + } diff --git a/src/main/resources/mapper/activity/ContentMapper.xml b/src/main/resources/mapper/activity/ContentMapper.xml index bd96b1d..019c954 100644 --- a/src/main/resources/mapper/activity/ContentMapper.xml +++ b/src/main/resources/mapper/activity/ContentMapper.xml @@ -36,6 +36,7 @@ + @@ -280,7 +281,11 @@ @@ -413,8 +418,14 @@ update content set + + online_time = null, + + + online_time = now(), + - `release` = #{release},visibility = #{visibility},online_time = now() + `release` = #{release},visibility = #{visibility} where id = #{contentId} @@ -431,4 +442,31 @@ select * from application where content_id = #{contentId} + + + diff --git a/src/main/resources/templates/content/census.html b/src/main/resources/templates/content/census.html index b57170e..7ff7f0f 100644 --- a/src/main/resources/templates/content/census.html +++ b/src/main/resources/templates/content/census.html @@ -5,42 +5,204 @@ Title +


-
+



+



+



+
diff --git a/src/main/resources/templates/content/edit2.html b/src/main/resources/templates/content/edit2.html index bc1a358..c4b7761 100644 --- a/src/main/resources/templates/content/edit2.html +++ b/src/main/resources/templates/content/edit2.html @@ -22,6 +22,7 @@
@@ -35,7 +36,6 @@
diff --git a/src/main/resources/templates/content/list2.html b/src/main/resources/templates/content/list2.html index 6d0c62a..e6a4be5 100644 --- a/src/main/resources/templates/content/list2.html +++ b/src/main/resources/templates/content/list2.html @@ -217,7 +217,14 @@ {field: 'createtime', title: '创建时间', align : "center", width: "50"}, {field: 'updatetime', title: '修改时间', align : "center", width: "50"}, {field: 'onlineTime', title: '上线时间', align : "center", width: "50"}, - {field: 'position', title: '关联部门', align : "center", width: "50"}, + {field: 'position', title: '关联部门', align : "center", width: "50", formatter:function(value,row, index){ + for(var i = 0; i < row.tagList.length;i++){ + if(row.tagList[i].id === 26){ + return row.tagList[i].tagName; + } + } + return ""; + }}, {field: 'userName', title: '创建者', align : "center", width: "450"}, /* {field: 'title', title: '标题', align : "left", width: "25%", formatter: function(value, row, index) { if(value!=null && $.trim(value)!='' && value.length>25){ diff --git a/src/main/resources/templates/index/workdest.html b/src/main/resources/templates/index/workdest.html index 0b467f6..e98fdb6 100644 --- a/src/main/resources/templates/index/workdest.html +++ b/src/main/resources/templates/index/workdest.html @@ -10,7 +10,7 @@
-
+