From 3a0f0d84c55ef074af0085741f5f1437c6529252 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 5 Mar 2026 08:40:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(dms):excel=E5=AF=BC=E5=85=A5=E6=A0=A1?= =?UTF-8?q?=E4=BC=81=E6=88=90=E6=9E=9C,=E5=9B=BE=E7=89=87=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E7=BB=93=E6=9E=9C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SchoolEnterpriseAchievementsServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java index e8970b157..d06efdfbc 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/SchoolEnterpriseAchievementsServiceImpl.java @@ -222,6 +222,7 @@ public class SchoolEnterpriseAchievementsServiceImpl implements ISchoolEnterpris private String handleAchievementImage(SchoolEnterpriseAchievements achievement, Map imageMap) { String imageCellKey = achievement.getImages(); if (StringUtils.isEmpty(imageCellKey) || !imageMap.containsKey(imageCellKey)) { + achievement.setImages("[]"); return "无图片，跳过处理"; } From e8bdc8fc92acc31fb0e75bab150d8def7918c0a9 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 5 Mar 2026 09:15:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(dms):excel=E5=AF=BC=E5=85=A5=E6=A0=A1?= =?UTF-8?q?=E4=BC=81=E6=88=90=E6=9E=9C,=E5=8D=95=E4=BD=8D=E5=8F=8A?= =?UTF-8?q?=E5=9B=A2=E9=98=9F=E5=90=8D=E7=A7=B0=E5=AF=BC=E5=85=A5=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../achievementLibrary/domain/SchoolEnterpriseAchievements.java | 1 + 1 file changed, 1 insertion(+) diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java index 76bbf4aac..7596e80f8 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/SchoolEnterpriseAchievements.java @@ -186,6 +186,7 @@ public class SchoolEnterpriseAchievements extends BaseEntity { ) private String achievementCurStatus; //团队名称 + @Excel(name = "成果团队名称") private String teamName; private List teamList; From 4ada9fc829449c0ca025465ffbbb235e390147d9 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 26 Mar 2026 09:38:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(dms):=E7=A4=BE=E5=8C=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=80=BB=E6=95=B0=E5=8E=BB=E9=99=A4=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/dms/ExpertResourceLibraryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml index 6a7baee98..ee71b8b67 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml @@ -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