diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java index ceac548..b86e060 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java @@ -1,5 +1,6 @@ package com.ruoyi.kaohe.domain; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -58,6 +59,10 @@ public class KhVote extends BaseEntity @Excel(name = "最大投票数") private Long maxNum; + /** 评分占比(0-1之间) */ + @Excel(name = "评分占比(0-1之间)") + private BigDecimal percentage; + /** 状态(0 未开始 1 进行中 2 完成) */ @Excel(name = "状态(0 未开始 1 进行中 2 完成)") private String state; @@ -127,6 +132,14 @@ public class KhVote extends BaseEntity this.vDescription = vDescription; } + public BigDecimal getPercentage() { + return percentage; + } + + public void setPercentage(BigDecimal percentage) { + this.percentage = percentage; + } + public String getvDescription() { return vDescription; @@ -185,6 +198,7 @@ public class KhVote extends BaseEntity .append("sTime", getsTime()) .append("eTime", geteTime()) .append("maxNum", getMaxNum()) + .append("percentage", getPercentage()) .append("state", getState()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java index 14630d2..eef7360 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java @@ -1,5 +1,6 @@ package com.ruoyi.kaohe.domain; +import java.math.BigDecimal; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -7,9 +8,9 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 投票选项对象 kh_vote_emp - * + * * @author hs - * @date 2025-06-17 + * @date 2025-06-19 */ public class KhVoteEmp extends BaseEntity { @@ -46,102 +47,132 @@ public class KhVoteEmp extends BaseEntity @Excel(name = "当前投票分数") private Long voteScore; - public void setId(Long id) + /** 评分占比(0-1之间) */ + @Excel(name = "评分占比(0-1之间)") + private BigDecimal percentage; + + /** 最终分数 */ + @Excel(name = "最终分数") + private Long endScore; + + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setVoteId(Long voteId) + public void setVoteId(Long voteId) { this.voteId = voteId; } - public Long getVoteId() + public Long getVoteId() { return voteId; } - public void setVoteTitle(String voteTitle) + public void setVoteTitle(String voteTitle) { this.voteTitle = voteTitle; } - public String getVoteTitle() + public String getVoteTitle() { return voteTitle; } - public void setEmpId(Long empId) + public void setEmpId(Long empId) { this.empId = empId; } - public Long getEmpId() + public Long getEmpId() { return empId; } - public void setEmpName(String empName) + public void setEmpName(String empName) { this.empName = empName; } - public String getEmpName() + public String getEmpName() { return empName; } - public void setContent(String content) + public void setContent(String content) { this.content = content; } - public String getContent() + public String getContent() { return content; } - public void setVoteNum(Long voteNum) + public void setVoteNum(Long voteNum) { this.voteNum = voteNum; } - public Long getVoteNum() + public Long getVoteNum() { return voteNum; } - public void setVoteScore(Long voteScore) + public void setVoteScore(Long voteScore) { this.voteScore = voteScore; } - public Long getVoteScore() + public Long getVoteScore() { return voteScore; } + public void setPercentage(BigDecimal percentage) + { + this.percentage = percentage; + } + + public BigDecimal getPercentage() + { + return percentage; + } + + public void setEndScore(Long endScore) + { + this.endScore = endScore; + } + + public Long getEndScore() + { + return endScore; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("voteId", getVoteId()) - .append("voteTitle", getVoteTitle()) - .append("empId", getEmpId()) - .append("empName", getEmpName()) - .append("content", getContent()) - .append("voteNum", getVoteNum()) - .append("voteScore", getVoteScore()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + .append("id", getId()) + .append("voteId", getVoteId()) + .append("voteTitle", getVoteTitle()) + .append("empId", getEmpId()) + .append("empName", getEmpName()) + .append("content", getContent()) + .append("voteNum", getVoteNum()) + .append("voteScore", getVoteScore()) + .append("percentage", getPercentage()) + .append("endScore", getEndScore()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml index 773194a..101a01f 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -21,12 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, vote_id, vote_title, emp_id, emp_name, content, vote_num, vote_score, create_by, create_time, update_by, update_time, remark from kh_vote_emp + select id, vote_id, vote_title, emp_id, emp_name, content, vote_num, vote_score, percentage, end_score, create_by, create_time, update_by, update_time, remark from kh_vote_emp - + @@ -39,6 +40,7 @@ and s_time = #{sTime} and e_time = #{eTime} and max_num = #{maxNum} + and percentage = #{percentage} and state = #{state} @@ -60,6 +62,7 @@ s_time, e_time, max_num, + percentage, state, create_by, create_time, @@ -77,6 +80,7 @@ #{sTime}, #{eTime}, #{maxNum}, + #{percentage}, #{state}, #{createBy}, #{createTime}, @@ -98,6 +102,7 @@ s_time = #{sTime}, e_time = #{eTime}, max_num = #{maxNum}, + percentage = #{percentage}, state = #{state}, create_by = #{createBy}, create_time = #{createTime},