Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '社区动态总数去除评论数' (#1050) from wanjia9506/microservices:dev_monitoring_import_ach into dev_monitoring

This commit is contained in:
wanjia9506 2026-03-26 09:48:02 +08:00
parent 2eb21023e4 4ada9fc829
commit 4513ae20d6
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java
View File

@ -186,6 +186,7 @@ public class SchoolEnterpriseAchievements extends BaseEntity {
)
private String achievementCurStatus;
//团队名称
@Excel(name = "成果团队名称")
private String teamName;
private List<AchievementTeam> teamList;

1
microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java
View File

@ -222,6 +222,7 @@ public class SchoolEnterpriseAchievementsServiceImpl implements ISchoolEnterpris
private String handleAchievementImage(SchoolEnterpriseAchievements achievement, Map<String, MultipartFile> imageMap) {
String imageCellKey = achievement.getImages();
if (StringUtils.isEmpty(imageCellKey) || !imageMap.containsKey(imageCellKey)) {
achievement.setImages("[]");
return "无图片，跳过处理";
}

2
microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml
View File

@ -473,7 +473,7 @@
from (
(select count(1) as "auditSum"
from memos
where destroy_status is null and hidden = 0 and published_at is not null) a,
where destroy_status is null and hidden = 0 and published_at is not null AND root_id IS NULL) a,
(select count(1) as "allSum" from memos) b,
(select count(1) as "currentYearSum"
from memos