+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+ {{row.sessionName}}
+
+
+
+
+ {{row.materialsName}}
+
+ {{row.materialsName || "-"}}
+
+
+
+
+ {{formatDate(row.votingStartTime)}} 至 {{formatDate(row.votingEndTime)}}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+ 添加表决事项
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/congress/materials/manage/index.html b/src/main/resources/views/platform/zhgh/democratic/congress/materials/manage/index.html
new file mode 100644
index 00000000..3a305d74
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/congress/materials/manage/index.html
@@ -0,0 +1,231 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+ {{row.sessionName}}
+
+
+
+
+ {{row.fileName || row.name}}
+
+ -
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/congress/materials/statistical/index.html b/src/main/resources/views/platform/zhgh/democratic/congress/materials/statistical/index.html
new file mode 100644
index 00000000..8c98b79b
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/congress/materials/statistical/index.html
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{row.materialsName}}
+
+ {{row.materialsName || "-"}}
+
+
+
+ {{row.sessionName}}
+
+
+
+ 查看统计
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/congress/materials/type/index.html b/src/main/resources/views/platform/zhgh/democratic/congress/materials/type/index.html
new file mode 100644
index 00000000..18f9f6ad
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/congress/materials/type/index.html
@@ -0,0 +1,130 @@
+
+
+
+ {{currentIssue.name}}
+ {{currentIssue.sessionName}}
+ {{currentIssue.typeName}}
+ {{currentIssue.voteCount}}
+
+
+
+
+
+ {{percent(row.count, row.itemTotal)}}
+
+
+
+
+
+
+ {{voteResultText(row.voteResult)}}
+
+
+ {{formatDate(row.createTime)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+ {{row.isVote ? "是" : "否"}}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/congress/record/index.html b/src/main/resources/views/platform/zhgh/democratic/congress/record/index.html
new file mode 100644
index 00000000..7eb83f2f
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/congress/record/index.html
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{row.sessionName}}
+
+
+ 已签到
+
+
+ {{formatDate(row.signInTime)}}
+
+
+
+
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/congress/signIn/index.html b/src/main/resources/views/platform/zhgh/democratic/congress/signIn/index.html
new file mode 100644
index 00000000..8e7f5f55
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/democratic/congress/signIn/index.html
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+ {{row.sessionName}}
+
+
+
+ {{formatDate(row.signInStartTime)}} 至 {{formatDate(row.signInEndTime)}}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
From bff78c6ced28c36d35f1ba4d8ff32ed2a0c485a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=AD=A6=E6=88=90?= <1274337408@qq.com>
Date: Wed, 29 Jul 2026 15:56:03 +0800
Subject: [PATCH 3/8] =?UTF-8?q?web=E7=AB=AF=E8=81=8C=E4=BB=A3=E4=BC=9A?=
=?UTF-8?q?=E7=AE=A1=E7=90=86:=20=E4=BF=AE=E5=A4=8Dcongress=5Fmaterials?=
=?UTF-8?q?=E8=81=8C=E4=BB=A3=E4=BC=9A=E8=B5=84=E6=96=99=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E7=9A=84fileType,fileSize=E5=AD=97=E6=AE=B5=E4=B8=BA=E7=A9=BA?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CongressMaterialsManageController.java | 6 +-
.../CongressVotingIssueController.java | 54 ++++++++++
.../service/CongressManageService.java | 28 ++++++
.../congress/materials/issue/index.html | 98 +++++++++++++++++--
.../congress/materials/manage/index.html | 11 ++-
.../congress/materials/type/index.html | 4 +-
.../democratic/congress/signIn/index.html | 4 +-
7 files changed, 185 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/congress/controller/CongressMaterialsManageController.java b/src/main/java/com/budwk/app/zhgh/democratic/congress/controller/CongressMaterialsManageController.java
index 66e3c453..fceac324 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/congress/controller/CongressMaterialsManageController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/congress/controller/CongressMaterialsManageController.java
@@ -134,7 +134,7 @@ public class CongressMaterialsManageController {
.add("sort_no", sortNo == null ? 0 : sortNo)
.add("file_name", StrUtil.blankToDefault(fileName, name.trim()))
.add("file_url", fileUrl)
- .add("file_type", StrUtil.blankToDefault(fileType, null))
+ .add("file_type", congressManageService.normalizeFileType(fileType, fileName, fileUrl))
.add("file_size", StrUtil.blankToDefault(fileSize, null))
.add("update_time", now);
if (StrUtil.isBlank(id)) {
@@ -143,11 +143,11 @@ public class CongressMaterialsManageController {
.add("create_time", now)
.add("deleted", 0);
dao.insert("congress_materials", chain);
- return Result.success(newId);
+ return Result.success().addData(newId);
}
dao.update("congress_materials", chain,
Cnd.where("id", "=", id).and("deleted", "=", 0));
- return Result.success(id);
+ return Result.success().addData(id);
}
@At("/delete")
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/congress/controller/CongressVotingIssueController.java b/src/main/java/com/budwk/app/zhgh/democratic/congress/controller/CongressVotingIssueController.java
index 75939a37..b71c3b4e 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/congress/controller/CongressVotingIssueController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/congress/controller/CongressVotingIssueController.java
@@ -57,6 +57,60 @@ public class CongressVotingIssueController {
return Result.success(congressManageService.materialOptions(sessionId, typeId));
}
+ @At("/uploadMaterial")
+ @Aop(TransAop.READ_COMMITTED)
+ @SaCheckPermission("congress.vote.issue")
+ @SLog(tag = "职代会-投票管理", msg = "快捷上传投票资料")
+ public Result uploadMaterial(@Param("sessionId") String sessionId,
+ @Param("typeId") String typeId,
+ @Param("name") String name,
+ @Param("fileName") String fileName,
+ @Param("fileUrl") String fileUrl,
+ @Param("fileType") String fileType,
+ @Param("fileSize") String fileSize) {
+ if (StrUtil.hasBlank(sessionId, typeId, fileUrl)) {
+ return Result.error("届次、投票类型和文件不能为空");
+ }
+ if (congressManageService.count("""
+ SELECT COUNT(1)
+ FROM teacher_congress_session
+ WHERE id = @sessionId
+ AND delFlag = 0
+ """, NutMap.NEW().addv("sessionId", sessionId)) <= 0) {
+ return Result.error("所选届次不存在");
+ }
+ if (congressManageService.count("""
+ SELECT COUNT(1)
+ FROM congress_materials_type
+ WHERE id = @typeId
+ AND COALESCE(deleted, 0) = 0
+ AND COALESCE(is_vote, 0) = 1
+ """, NutMap.NEW().addv("typeId", typeId)) <= 0) {
+ return Result.error("所选投票类型不存在");
+ }
+ Date now = new Date();
+ String materialName = StrUtil.blankToDefault(name, StrUtil.blankToDefault(fileName, "资料")).trim();
+ String newId = R.UU32();
+ dao.insert("congress_materials", Chain.make("id", newId)
+ .add("name", materialName)
+ .add("session_id", sessionId)
+ .add("time_id", null)
+ .add("type_id", typeId)
+ .add("sort_no", 0)
+ .add("file_name", StrUtil.blankToDefault(fileName, materialName))
+ .add("file_url", fileUrl)
+ .add("file_type", congressManageService.normalizeFileType(fileType, fileName, fileUrl))
+ .add("file_size", StrUtil.blankToDefault(fileSize, null))
+ .add("create_time", now)
+ .add("update_time", now)
+ .add("deleted", 0));
+ return Result.success(NutMap.NEW()
+ .addv("id", newId)
+ .addv("name", materialName)
+ .addv("fileName", StrUtil.blankToDefault(fileName, materialName))
+ .addv("fileUrl", fileUrl));
+ }
+
@At("/pageData")
@SaCheckPermission("congress.vote.issue")
public Result issuePageData(PageForm pageForm,
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/congress/service/CongressManageService.java b/src/main/java/com/budwk/app/zhgh/democratic/congress/service/CongressManageService.java
index 6b293c45..9e934a25 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/congress/service/CongressManageService.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/congress/service/CongressManageService.java
@@ -17,6 +17,7 @@ import org.nutz.lang.util.NutMap;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
/**
* 职代会管理公共服务类。
@@ -148,4 +149,31 @@ public class CongressManageService {
sql.append(" AND ").append(column).append(" = @").append(paramName);
params.addv(paramName, value);
}
+
+ public String normalizeFileType(String fileType, String fileName, String fileUrl) {
+ if (StrUtil.isNotBlank(fileType) && !fileType.contains("/")) {
+ return fileType.replace(".", "").trim().toLowerCase(Locale.ROOT);
+ }
+ String suffix = extractFileExtension(fileName);
+ if (StrUtil.isBlank(suffix)) {
+ suffix = extractFileExtension(fileUrl);
+ }
+ return StrUtil.blankToDefault(suffix, null);
+ }
+
+ private String extractFileExtension(String name) {
+ if (StrUtil.isBlank(name)) {
+ return "";
+ }
+ String value = name.split("\\?", 2)[0];
+ int slashIndex = Math.max(value.lastIndexOf('/'), value.lastIndexOf('\\'));
+ if (slashIndex >= 0) {
+ value = value.substring(slashIndex + 1);
+ }
+ int dotIndex = value.lastIndexOf('.');
+ if (dotIndex < 0 || dotIndex == value.length() - 1) {
+ return "";
+ }
+ return value.substring(dotIndex + 1).toLowerCase(Locale.ROOT);
+ }
}
\ No newline at end of file
diff --git a/src/main/resources/views/platform/zhgh/democratic/congress/materials/issue/index.html b/src/main/resources/views/platform/zhgh/democratic/congress/materials/issue/index.html
index f484f3fe..e134efa9 100644
--- a/src/main/resources/views/platform/zhgh/democratic/congress/materials/issue/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/congress/materials/issue/index.html
@@ -53,7 +53,7 @@ layout("/layouts/platform.html"){
+
+
+
+ 上传资料
+
+
{{ selectedSessionName }}
-{{ selectedTimeText }}
+
@@ -41,12 +45,6 @@ layout("/layouts/platform_h5.html"){
-
-
@@ -16,7 +16,7 @@ layout("/layouts/platform_h5.html"){
- ![]()
@@ -51,7 +51,8 @@ layout("/layouts/platform_h5.html"){
refreshing: false,
loadedOnce: false,
typeId: "",
- timeId: ""
+ timeId: "",
+ sessionId: ""
}
},
methods: {
@@ -60,6 +61,11 @@ layout("/layouts/platform_h5.html"){
this.pageTitle = params.get("moduleName") || "文件公告"
this.typeId = params.get("typeId") || params.get("moduleId") || ""
this.timeId = params.get("timeId") || ""
+ this.sessionId = params.get("sessionId") || this.timeId
+ },
+ backToCongress() {
+ const timeId = this.timeId || this.sessionId || window.localStorage.getItem("congressTimeId") || ""
+ this.$pjaxReplace("/platform/h5/congress" + (timeId ? "?timeId=" + encodeURIComponent(timeId) : ""))
},
loginName() {
const user = (this.$store.state && this.$store.state.user) || JSON.parse(window.sessionStorage.getItem("user") || "{}")
@@ -95,16 +101,39 @@ layout("/layouts/platform_h5.html"){
this.refreshing = false
})
},
- getFileIcon(mimeType) {
- if (!mimeType) return "description"
- const type = String(mimeType).toLowerCase()
- if (type.indexOf("pdf") > -1) return "description"
- if (type.indexOf("word") > -1) return "edit"
- if (type.indexOf("excel") > -1 || type.indexOf("sheet") > -1) return "chart-trending-o"
- if (type.indexOf("powerpoint") > -1 || type.indexOf("presentation") > -1) return "play-circle-o"
- if (type.indexOf("image") > -1) return "photo"
- if (type.indexOf("zip") > -1 || type.indexOf("rar") > -1) return "bag-o"
- return "description"
+ getFileIconUrl(item) {
+ return this.$commonUtil.getFileItemShowIcon(this.resolveFileSuffix(item))
+ },
+ resolveFileSuffix(item) {
+ const fileType = String(item.fileType || "").replace(".", "").toLowerCase()
+ if (this.isKnownSuffix(fileType)) return fileType
+
+ const fileNameSuffix = this.extractSuffix(item.fileName || item.name || "")
+ if (fileNameSuffix) return fileNameSuffix
+
+ const fileUrlSuffix = this.extractSuffix((item.fileUrl || "").split("?")[0])
+ if (fileUrlSuffix) return fileUrlSuffix
+
+ if (fileType.indexOf("pdf") > -1) return "pdf"
+ if (fileType.indexOf("word") > -1) return "docx"
+ if (fileType.indexOf("excel") > -1 || fileType.indexOf("sheet") > -1) return "xlsx"
+ if (fileType.indexOf("powerpoint") > -1 || fileType.indexOf("presentation") > -1) return "pptx"
+ if (fileType.indexOf("image") > -1) return "jpg"
+ if (fileType.indexOf("zip") > -1 || fileType.indexOf("rar") > -1) return "zip"
+ if (fileType.indexOf("text") > -1) return "txt"
+ if (fileType.indexOf("video") > -1) return "mp4"
+ if (fileType.indexOf("audio") > -1) return "mp3"
+ return ""
+ },
+ extractSuffix(value) {
+ const text = String(value || "").trim()
+ const index = text.lastIndexOf(".")
+ if (index < 0 || index === text.length - 1) return ""
+ const suffix = text.substring(index + 1).toLowerCase()
+ return this.isKnownSuffix(suffix) ? suffix : ""
+ },
+ isKnownSuffix(suffix) {
+ return ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "zip", "rar", "jpg", "jpeg", "png", "gif", "bmp", "webp", "mp4", "avi", "wmv", "rmvb", "flv", "mkv", "mp3", "wav", "wma", "flac", "ape"].indexOf(suffix) > -1
},
formatTime(time) {
if (!time) return ""
@@ -126,12 +155,26 @@ layout("/layouts/platform_h5.html"){
return
}
this.$pjaxReplace("/platform/h5/congress/pdf?pdfPath=" + encodeURIComponent(item.fileUrl) +
- "&fileName=" + encodeURIComponent(item.fileName || item.name || ""))
+ "&fileName=" + encodeURIComponent(item.fileName || item.name || "") +
+ "&fileType=" + encodeURIComponent(item.fileType || "") +
+ "&sysFileId=" + encodeURIComponent(this.resolveSysFileId(item.fileUrl)))
},
openVotePdf(item) {
this.$pjaxReplace("/platform/h5/congress/pdf?pdfPath=" + encodeURIComponent(item.fileUrl || "") +
"&fileName=" + encodeURIComponent(item.fileName || item.name || "") +
- "&fileId=" + encodeURIComponent(item.id || ""))
+ "&materialsId=" + encodeURIComponent(item.id || "") +
+ "&fileType=" + encodeURIComponent(item.fileType || "") +
+ "&sysFileId=" + encodeURIComponent(this.resolveSysFileId(item.fileUrl)))
+ },
+ resolveSysFileId(fileUrl) {
+ if (!fileUrl) return ""
+ try {
+ const url = new URL(fileUrl, window.location.origin)
+ return url.searchParams.get("id") || ""
+ } catch (e) {
+ const match = String(fileUrl).match(/[?&]id=([^&]+)/)
+ return match ? decodeURIComponent(match[1]) : ""
+ }
},
isVoted(value) {
return value === true || value === 1 || value === "1" || value === "true"
@@ -224,12 +267,19 @@ layout("/layouts/platform_h5.html"){
.icon-wrapper {
width: 52px;
height: 52px;
- border-radius: 14px;
- background: linear-gradient(135deg, #f0f5ff 0%, #e6f0ff 100%);
+ border-radius: 12px;
+ background: #f7f8fa;
display: flex;
align-items: center;
justify-content: center;
- color: #1989fa;
+ border: 1px solid #eef0f4;
+ }
+
+ .file-type-icon {
+ width: 38px;
+ height: 38px;
+ display: block;
+ object-fit: contain;
}
.card-content {
diff --git a/src/main/resources/views/platform/zhghh5/democratic/congress/meeting/list.html b/src/main/resources/views/platform/zhghh5/democratic/congress/meeting/list.html
index 428c783d..cdb86587 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/congress/meeting/list.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/congress/meeting/list.html
@@ -3,7 +3,7 @@ layout("/layouts/platform_h5.html"){
#-->
-
@@ -63,13 +63,19 @@ layout("/layouts/platform_h5.html"){
finished: false,
refreshing: false,
loadedOnce: false,
- timeId: ""
+ timeId: "",
+ sessionId: ""
}
},
methods: {
initQuery() {
const params = new URLSearchParams(window.location.search)
this.timeId = params.get("timeId") || ""
+ this.sessionId = params.get("sessionId") || this.timeId
+ },
+ backToCongress() {
+ const timeId = this.timeId || this.sessionId || window.localStorage.getItem("congressTimeId") || ""
+ this.$pjaxReplace("/platform/h5/congress" + (timeId ? "?timeId=" + encodeURIComponent(timeId) : ""))
},
loginName() {
const user = (this.$store.state && this.$store.state.user) || JSON.parse(window.sessionStorage.getItem("user") || "{}")
diff --git a/src/main/resources/views/platform/zhghh5/democratic/congress/pdf.html b/src/main/resources/views/platform/zhghh5/democratic/congress/pdf.html
index 92193c39..81d1eacd 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/congress/pdf.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/congress/pdf.html
@@ -4,11 +4,15 @@ layout("/layouts/platform_h5.html"){
-
-
-
+
+ ![]()
+
+
+