From 1e58781dbff316a173aeabecd2f4b5f5f675eb80 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 22 Apr 2024 19:01:22 +0800
Subject: [PATCH] 管理规约
---
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
index b46a73f..6aab41f 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -117,7 +117,7 @@
PublicDiscussEntity discussEntity = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topicsList.get(0).getArticleId()));
// 判断是否在开始和结束时间内
if (discussEntity.getStartTime().getTime() > System.currentTimeMillis() || discussEntity.getEndTime().getTime() < System.currentTimeMillis()) {
- return "目前不在投票时间内，投票时间："+ DateUtil.formatDateTime(discussEntity.getStartTime()) +"-"+DateUtil.formatDateTime(discussEntity.getEndTime());
+ return "目前不在投票时间内，投票时间："+ DateUtil.formatDateTime(discussEntity.getStartTime()) +" 至 "+DateUtil.formatDateTime(discussEntity.getEndTime());
}
if (StringUtils.isNotBlank(topics.getPhone())) {
if (StringUtils.isBlank(topics.getCode())) {
@@ -388,7 +388,7 @@
private void setManagementRegulationsOrRulesOfProcedure(holdExcel item, TopicsEntity topics) {
if (StringUtils.isNotBlank(topics.getDiscussContent())) {
- if (topics.getDiscussContent().equals("管理公约")) {
+ if (topics.getDiscussContent().equals("管理规约")) {
item.setManagementRegulations(topics.getOptionContent());
} else if (topics.getDiscussContent().equals("议事规则")) {
item.setRulesOfProcedure(topics.getOptionContent());
--
Gitblit v1.9.3