From 635738368e3f88abefb9c98bae142394ccda1fad Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Sun, 4 Jan 2026 13:51:38 +0800 Subject: [PATCH] commit --- ...sCongressMaterialStatisticsController.java | 9 +- .../material/write/index.html | 1 + .../teachercongress/delegate/push/index.html | 93 ++++--------------- 3 files changed, 27 insertions(+), 76 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialStatisticsController.java b/src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialStatisticsController.java index 02fe5d1..ef25a38 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialStatisticsController.java @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -74,6 +75,7 @@ public class GrassrootsCongressMaterialStatisticsController { """); Cnd cnd = Cnd.NEW(); cnd.and("ins.state","=", ProcessInstanceStateEnum.FINISHED.getCode()); + cnd.andEX("info.unionId","=", pageForm.getUnionId()); cnd.andEX("YEAR(info.createdTime)", "=", pageForm.getYear()); cnd.desc("info.createdTime"); sql.setCondition(cnd); @@ -97,6 +99,7 @@ public class GrassrootsCongressMaterialStatisticsController { Cnd cnd = Cnd.NEW(); cnd.and("ins.state","=", ProcessInstanceStateEnum.FINISHED.getCode()); cnd.andEX("YEAR(info.createdTime)", "=", pageForm.getYear()); + cnd.andEX("info.unionId","=", pageForm.getUnionId()); cnd.desc("info.createdTime"); sql.setCondition(cnd); List list = grassrootsCongressMeetingService.listEntity(sql); @@ -109,7 +112,9 @@ public class GrassrootsCongressMaterialStatisticsController { List fileJsonList = list.stream().map(GrassrootsCongressMaterialsInfo::getFiles).flatMap(v -> v.stream().map(item -> item)).toList(); - for (JSONObject file : fileJsonList) { + + for (int i = 0; i < fileJsonList.size(); i++) { + JSONObject file = fileJsonList.get(i); if (Lang.isEmpty(file)) { continue; } @@ -128,7 +133,7 @@ public class GrassrootsCongressMaterialStatisticsController { if (fileNames.contains(fileName)) { String finalFileName = fileName; long count = fileNames.stream().filter(name -> name.equals(finalFileName)).count(); - fileName = count + fileName; + fileName = i + fileName; } ZipEntry zipEntry = new ZipEntry(fileName); diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/write/index.html b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/write/index.html index 11d8fed..5cc1488 100644 --- a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/write/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/write/index.html @@ -159,6 +159,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, "userName", this.$store.state.user.username) this.$set(this.formData, "loginName", this.$store.state.user.loginname) this.$set(this.formData, "unionName", this.$store.state.user.union.name) + this.$set(this.formData, "unionId", this.$store.state.user.union.id) } } }, diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html index 2434a38..9aa2088 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html @@ -75,96 +75,41 @@ layout("/layouts/platform.html"){ - - - - - - + - + - + - + - + - - -