diff --git a/src/main/java/com/budwk/app/zhgh/democratic/congress/service/impl/CongressH5ServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/congress/service/impl/CongressH5ServiceImpl.java
index 6a32a516..5aae6068 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/congress/service/impl/CongressH5ServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/congress/service/impl/CongressH5ServiceImpl.java
@@ -111,6 +111,13 @@ public class CongressH5ServiceImpl implements CongressH5Service {
cm.file_type AS fileType,
cm.file_size AS fileSize,
cm.create_time AS uploadTime,
+ CASE
+ WHEN cvi.id IS NULL THEN NULL
+ WHEN cvr.id IS NOT NULL THEN 'voted'
+ WHEN cvi.voting_start_time IS NOT NULL AND cvi.voting_start_time > NOW() THEN 'upcoming'
+ WHEN cvi.voting_end_time IS NOT NULL AND cvi.voting_end_time < NOW() THEN 'ended'
+ ELSE 'pending'
+ END AS voteStatus,
CASE
WHEN cvi.id IS NULL THEN NULL
WHEN cvr.id IS NOT NULL THEN true
@@ -132,8 +139,7 @@ public class CongressH5ServiceImpl implements CongressH5Service {
WHERE COALESCE(cm.deleted, 0) = 0
AND cm.type_id = @typeId
AND (cm.session_id = @sessionId OR cm.time_id = @sessionId)
- AND (@searchKeyword = '' OR cm.name LIKE CONCAT('%%', @searchKeyword, '%%')
- OR cm.file_name LIKE CONCAT('%%', @searchKeyword, '%%'))
+ AND (@searchKeyword = '' OR cm.name LIKE CONCAT('%%', @searchKeyword, '%%'))
AND (@fileType = '' OR FIND_IN_SET(LOWER(REPLACE(cm.file_type, '.', '')), @fileType) > 0
OR FIND_IN_SET(LOWER(SUBSTRING_INDEX(cm.file_name, '.', -1)), @fileType) > 0)
ORDER BY cm.create_time %s, cm.id DESC
@@ -349,6 +355,11 @@ public class CongressH5ServiceImpl implements CongressH5Service {
i.voting_type AS votingType,
i.voting_start_time AS votingStartTime,
i.voting_end_time AS votingEndTime,
+ CASE
+ WHEN i.voting_start_time IS NOT NULL AND i.voting_start_time > NOW() THEN 'upcoming'
+ WHEN i.voting_end_time IS NOT NULL AND i.voting_end_time < NOW() THEN 'ended'
+ ELSE 'ongoing'
+ END AS votingStatus,
i.voting_content AS votingContent,
i.voting_content_item_header AS votingContentItemHeader,
i.voting_content_option_header AS votingContentOptionHeader,
@@ -385,7 +396,14 @@ public class CongressH5ServiceImpl implements CongressH5Service {
return Result.error("投票参数不完整");
}
NutMap issue = fetchMap("""
- SELECT id, session_id AS sessionId, COALESCE(time_id, session_id) AS timeId
+ SELECT id,
+ session_id AS sessionId,
+ COALESCE(time_id, session_id) AS timeId,
+ CASE
+ WHEN voting_start_time IS NOT NULL AND voting_start_time > NOW() THEN 'upcoming'
+ WHEN voting_end_time IS NOT NULL AND voting_end_time < NOW() THEN 'ended'
+ ELSE 'ongoing'
+ END AS votingStatus
FROM congress_voting_issue
WHERE id = @issueId
AND session_id = @sessionId
@@ -395,6 +413,12 @@ public class CongressH5ServiceImpl implements CongressH5Service {
if (issue == null) {
return Result.error("投票议题不存在");
}
+ if ("upcoming".equals(issue.getString("votingStatus"))) {
+ return Result.error("投票尚未开始");
+ }
+ if ("ended".equals(issue.getString("votingStatus"))) {
+ return Result.error("投票已结束,无法继续投票");
+ }
NutMap rep = fetchMap("""
SELECT id, userId, loginName, userName, delegationId
diff --git a/src/main/resources/static/images/congress/empty/evaluation-vote-empty.png b/src/main/resources/static/images/congress/empty/evaluation-vote-empty.png
new file mode 100644
index 00000000..91df0273
Binary files /dev/null and b/src/main/resources/static/images/congress/empty/evaluation-vote-empty.png differ
diff --git a/src/main/resources/static/images/congress/empty/file-notice-empty.png b/src/main/resources/static/images/congress/empty/file-notice-empty.png
new file mode 100644
index 00000000..ffc7f3f0
Binary files /dev/null and b/src/main/resources/static/images/congress/empty/file-notice-empty.png differ
diff --git a/src/main/resources/static/images/congress/empty/meeting-sign-empty.png b/src/main/resources/static/images/congress/empty/meeting-sign-empty.png
new file mode 100644
index 00000000..91c5d536
Binary files /dev/null and b/src/main/resources/static/images/congress/empty/meeting-sign-empty.png differ
diff --git a/src/main/resources/static/images/congress/empty/topic-vote-empty.png b/src/main/resources/static/images/congress/empty/topic-vote-empty.png
new file mode 100644
index 00000000..88b32801
Binary files /dev/null and b/src/main/resources/static/images/congress/empty/topic-vote-empty.png differ
diff --git a/src/main/resources/static/images/congress/empty/vote-notice-empty.png b/src/main/resources/static/images/congress/empty/vote-notice-empty.png
new file mode 100644
index 00000000..b476de3e
Binary files /dev/null and b/src/main/resources/static/images/congress/empty/vote-notice-empty.png differ
diff --git a/src/main/resources/static/images/congress/home/congress-hero-v2.png b/src/main/resources/static/images/congress/home/congress-hero-v2.png
new file mode 100644
index 00000000..9e8701c9
Binary files /dev/null and b/src/main/resources/static/images/congress/home/congress-hero-v2.png differ
diff --git a/src/main/resources/static/images/congress/home/congress-hero-v3.png b/src/main/resources/static/images/congress/home/congress-hero-v3.png
new file mode 100644
index 00000000..c1d519b5
Binary files /dev/null and b/src/main/resources/static/images/congress/home/congress-hero-v3.png differ
diff --git a/src/main/resources/static/images/congress/home/congress-hero-v4.png b/src/main/resources/static/images/congress/home/congress-hero-v4.png
new file mode 100644
index 00000000..65ef39a6
Binary files /dev/null and b/src/main/resources/static/images/congress/home/congress-hero-v4.png differ
diff --git a/src/main/resources/static/images/congress/home/congress-hero-v5.png b/src/main/resources/static/images/congress/home/congress-hero-v5.png
new file mode 100644
index 00000000..d7d53f55
Binary files /dev/null and b/src/main/resources/static/images/congress/home/congress-hero-v5.png differ
diff --git a/src/main/resources/static/images/congress/home/congress-hero-v6.png b/src/main/resources/static/images/congress/home/congress-hero-v6.png
new file mode 100644
index 00000000..ea7d61cd
Binary files /dev/null and b/src/main/resources/static/images/congress/home/congress-hero-v6.png differ
diff --git a/src/main/resources/static/images/congress/home/congress-hero-v7.png b/src/main/resources/static/images/congress/home/congress-hero-v7.png
new file mode 100644
index 00000000..052a38ad
Binary files /dev/null and b/src/main/resources/static/images/congress/home/congress-hero-v7.png differ
diff --git a/src/main/resources/static/images/congress/home/congress-hero-v8.png b/src/main/resources/static/images/congress/home/congress-hero-v8.png
new file mode 100644
index 00000000..0631fca7
Binary files /dev/null and b/src/main/resources/static/images/congress/home/congress-hero-v8.png differ
diff --git a/src/main/resources/static/images/congress/home/evaluation-vote-bg-v1.png b/src/main/resources/static/images/congress/home/evaluation-vote-bg-v1.png
new file mode 100644
index 00000000..256e100d
Binary files /dev/null and b/src/main/resources/static/images/congress/home/evaluation-vote-bg-v1.png differ
diff --git a/src/main/resources/static/images/congress/home/evaluation-vote-v2.png b/src/main/resources/static/images/congress/home/evaluation-vote-v2.png
new file mode 100644
index 00000000..1cebafe7
Binary files /dev/null and b/src/main/resources/static/images/congress/home/evaluation-vote-v2.png differ
diff --git a/src/main/resources/static/images/congress/home/evaluation-vote-v3.png b/src/main/resources/static/images/congress/home/evaluation-vote-v3.png
new file mode 100644
index 00000000..2d5dcd55
Binary files /dev/null and b/src/main/resources/static/images/congress/home/evaluation-vote-v3.png differ
diff --git a/src/main/resources/static/images/congress/home/evaluation-vote-v4.png b/src/main/resources/static/images/congress/home/evaluation-vote-v4.png
new file mode 100644
index 00000000..1c6fdb91
Binary files /dev/null and b/src/main/resources/static/images/congress/home/evaluation-vote-v4.png differ
diff --git a/src/main/resources/static/images/congress/home/file-notice-bg-v1.png b/src/main/resources/static/images/congress/home/file-notice-bg-v1.png
new file mode 100644
index 00000000..c5fc1007
Binary files /dev/null and b/src/main/resources/static/images/congress/home/file-notice-bg-v1.png differ
diff --git a/src/main/resources/static/images/congress/home/file-notice-v2.png b/src/main/resources/static/images/congress/home/file-notice-v2.png
new file mode 100644
index 00000000..5a455756
Binary files /dev/null and b/src/main/resources/static/images/congress/home/file-notice-v2.png differ
diff --git a/src/main/resources/static/images/congress/home/file-notice-v3.png b/src/main/resources/static/images/congress/home/file-notice-v3.png
new file mode 100644
index 00000000..c404acd4
Binary files /dev/null and b/src/main/resources/static/images/congress/home/file-notice-v3.png differ
diff --git a/src/main/resources/static/images/congress/home/file-notice-v4.png b/src/main/resources/static/images/congress/home/file-notice-v4.png
new file mode 100644
index 00000000..d36c1748
Binary files /dev/null and b/src/main/resources/static/images/congress/home/file-notice-v4.png differ
diff --git a/src/main/resources/static/images/congress/home/meeting-sign-bg-v1.png b/src/main/resources/static/images/congress/home/meeting-sign-bg-v1.png
new file mode 100644
index 00000000..98e7c8d9
Binary files /dev/null and b/src/main/resources/static/images/congress/home/meeting-sign-bg-v1.png differ
diff --git a/src/main/resources/static/images/congress/home/meeting-sign-v2.png b/src/main/resources/static/images/congress/home/meeting-sign-v2.png
new file mode 100644
index 00000000..bc00c30f
Binary files /dev/null and b/src/main/resources/static/images/congress/home/meeting-sign-v2.png differ
diff --git a/src/main/resources/static/images/congress/home/meeting-sign-v3.png b/src/main/resources/static/images/congress/home/meeting-sign-v3.png
new file mode 100644
index 00000000..c8690b91
Binary files /dev/null and b/src/main/resources/static/images/congress/home/meeting-sign-v3.png differ
diff --git a/src/main/resources/static/images/congress/home/meeting-sign-v4.png b/src/main/resources/static/images/congress/home/meeting-sign-v4.png
new file mode 100644
index 00000000..f3910c6a
Binary files /dev/null and b/src/main/resources/static/images/congress/home/meeting-sign-v4.png differ
diff --git a/src/main/resources/static/images/congress/home/topic-vote-bg-v1.png b/src/main/resources/static/images/congress/home/topic-vote-bg-v1.png
new file mode 100644
index 00000000..a3eb1347
Binary files /dev/null and b/src/main/resources/static/images/congress/home/topic-vote-bg-v1.png differ
diff --git a/src/main/resources/static/images/congress/home/topic-vote-v2.png b/src/main/resources/static/images/congress/home/topic-vote-v2.png
new file mode 100644
index 00000000..ebee0546
Binary files /dev/null and b/src/main/resources/static/images/congress/home/topic-vote-v2.png differ
diff --git a/src/main/resources/static/images/congress/home/topic-vote-v3.png b/src/main/resources/static/images/congress/home/topic-vote-v3.png
new file mode 100644
index 00000000..fc612865
Binary files /dev/null and b/src/main/resources/static/images/congress/home/topic-vote-v3.png differ
diff --git a/src/main/resources/static/images/congress/home/topic-vote-v4.png b/src/main/resources/static/images/congress/home/topic-vote-v4.png
new file mode 100644
index 00000000..1bc73714
Binary files /dev/null and b/src/main/resources/static/images/congress/home/topic-vote-v4.png differ
diff --git a/src/main/resources/static/images/congress/home/vote-notice-bg-v1.png b/src/main/resources/static/images/congress/home/vote-notice-bg-v1.png
new file mode 100644
index 00000000..0f7b2f49
Binary files /dev/null and b/src/main/resources/static/images/congress/home/vote-notice-bg-v1.png differ
diff --git a/src/main/resources/static/images/congress/home/vote-notice-v2.png b/src/main/resources/static/images/congress/home/vote-notice-v2.png
new file mode 100644
index 00000000..86832645
Binary files /dev/null and b/src/main/resources/static/images/congress/home/vote-notice-v2.png differ
diff --git a/src/main/resources/static/images/congress/home/vote-notice-v3.png b/src/main/resources/static/images/congress/home/vote-notice-v3.png
new file mode 100644
index 00000000..f0ab675c
Binary files /dev/null and b/src/main/resources/static/images/congress/home/vote-notice-v3.png differ
diff --git a/src/main/resources/static/images/congress/home/vote-notice-v4.png b/src/main/resources/static/images/congress/home/vote-notice-v4.png
new file mode 100644
index 00000000..6727e211
Binary files /dev/null and b/src/main/resources/static/images/congress/home/vote-notice-v4.png differ
diff --git a/src/main/resources/views/platform/zhghh5/democratic/congress/index.html b/src/main/resources/views/platform/zhghh5/democratic/congress/index.html
index 9b349572..3941e539 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/congress/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/congress/index.html
@@ -6,15 +6,29 @@ layout("/layouts/platform_h5.html"){
暂无参与届次信息
+
凝聚共识 · 共谋发展