From e2522c1be62edf0d6378be0cea06d8fa2677378a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 18 Feb 2022 08:52:35 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/vote/controller/VoteController.java | 9 +++++++++
src/main/java/org/springblade/modules/trar/controller/TrarController.java | 8 ++++++--
src/main/java/org/springblade/modules/vote/mapper/VoteMapper.xml | 2 +-
src/main/java/org/springblade/modules/vote/entity/Vote.java | 16 ++++++++++++++++
4 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/trar/controller/TrarController.java b/src/main/java/org/springblade/modules/trar/controller/TrarController.java
index 39b00be..35c85cb 100644
--- a/src/main/java/org/springblade/modules/trar/controller/TrarController.java
+++ b/src/main/java/org/springblade/modules/trar/controller/TrarController.java
@@ -157,8 +157,12 @@
String wd = list.get(i).getWd();
url+=jd+" "+wd+",";
}
- String substring = url.substring(0, url.length() - 1);
- String s = begin + substring + end;
+
+ String s = "";
+ if (url.length() > 0){
+ String substring = url.substring(0, url.length() - 1);
+ s = begin + substring + end;
+ }
System.out.println(s);
return s;
}
diff --git a/src/main/java/org/springblade/modules/vote/controller/VoteController.java b/src/main/java/org/springblade/modules/vote/controller/VoteController.java
index 102d123..63f6410 100644
--- a/src/main/java/org/springblade/modules/vote/controller/VoteController.java
+++ b/src/main/java/org/springblade/modules/vote/controller/VoteController.java
@@ -151,6 +151,12 @@
String votename = param.get("votename").toString();
//介绍
String introduce = param.get("introduce").toString();
+ //投票开始时间
+ String starttime = param.get("starttime").toString();
+ //投票结束时间
+ String endtime = param.get("endtime").toString();
+ //是否置顶
+ String istopping = param.get("istopping").toString();
//发起人
String uid = param.get("uid").toString();
//发起时间
@@ -166,6 +172,9 @@
vote.setUid(uid);
vote.setTime(time);
vote.setType(type);
+ vote.setStarttime(starttime);
+ vote.setEndtime(endtime);
+ vote.setIstopping(istopping);
vote.setOpnum(marshallingGKEYList.size());
voteService.save(vote);
Option option = new Option();
diff --git a/src/main/java/org/springblade/modules/vote/entity/Vote.java b/src/main/java/org/springblade/modules/vote/entity/Vote.java
index 95e49c2..a22529d 100644
--- a/src/main/java/org/springblade/modules/vote/entity/Vote.java
+++ b/src/main/java/org/springblade/modules/vote/entity/Vote.java
@@ -63,6 +63,21 @@
@ApiModelProperty(value = "发起时间")
private String time;
/**
+ * 投票开始时间
+ */
+ @ApiModelProperty(value = "投票开始时间")
+ private String starttime;
+ /**
+ * 投票结束时间
+ */
+ @ApiModelProperty(value = "投票结束时间")
+ private String endtime;
+ /**
+ * 是否置顶
+ */
+ @ApiModelProperty(value = "是否置顶")
+ private String istopping;
+ /**
* 类型
*/
@ApiModelProperty(value = "类型")
@@ -72,6 +87,7 @@
*/
@ApiModelProperty(value = "参与人数")
private Integer npeople;
+
private Integer opnum;
diff --git a/src/main/java/org/springblade/modules/vote/mapper/VoteMapper.xml b/src/main/java/org/springblade/modules/vote/mapper/VoteMapper.xml
index 58aeb87..62e06bb 100644
--- a/src/main/java/org/springblade/modules/vote/mapper/VoteMapper.xml
+++ b/src/main/java/org/springblade/modules/vote/mapper/VoteMapper.xml
@@ -15,7 +15,7 @@
<select id="selectVotePage" resultMap="voteResultMap">
- select * from sys_vote where is_deleted = 0
+ select * from sys_vote
</select>
<select id="selectList" resultType="java.util.HashMap">
--
Gitblit v1.9.3