Sfoglia il codice sorgente

新加了投票原因的字段

LiRong 1 mese fa
parent
commit
51eef8ea65

+ 3 - 2
ruoyi-equity/src/main/java/com/ruoyi/equity/controller/EquityMessageRecordController.java

@@ -76,9 +76,10 @@ public class EquityMessageRecordController extends BaseController
     @ApiOperation("设置投票信息")
     @GetMapping("/setVoteInfo")
     public AjaxResult setVoteInfo(@ApiParam(value = "主键", required = true) Long equityMessageId,
-                                  @ApiParam(value = "投票状态2同意3弃权4否决", required = true)String status)
+                                  @ApiParam(value = "投票状态2同意3弃权4否决", required = true)String status,
+                                  @ApiParam(value = "投票原因", required = true)String voteReason)
     {
-        equityMessageRecordFacade.setVoteInfo(equityMessageId,status);
+        equityMessageRecordFacade.setVoteInfo(equityMessageId,status,voteReason);
         return success();
     }
 

+ 16 - 1
ruoyi-equity/src/main/java/com/ruoyi/equity/domain/EquityMessageRecord.java

@@ -72,6 +72,11 @@ public class EquityMessageRecord extends BaseEntity
     @ApiModelProperty("消息状态0未读1已读")
     private String isRead;
 
+    /** 投票原因 */
+    @Excel(name = "投票原因")
+    @ApiModelProperty("投票原因")
+    private String voteReason;
+
     @Excel(name = "是否投票0未投1已投")
     @ApiModelProperty("是否投票0未投1已投")
     private String isVote;
@@ -130,11 +135,20 @@ public class EquityMessageRecord extends BaseEntity
         this.isRead = isRead;
     }
 
-    public String getIsRead() 
+    public String getIsRead()
     {
         return isRead;
     }
 
+    public String getVoteReason() {
+        return voteReason;
+    }
+
+    public void setVoteReason(String voteReason) {
+        this.voteReason = voteReason;
+    }
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -149,6 +163,7 @@ public class EquityMessageRecord extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("voteReason", getVoteReason())
             .toString();
     }
 }

+ 3 - 3
ruoyi-equity/src/main/java/com/ruoyi/equity/facade/EquityMessageRecordFacade.java

@@ -3,7 +3,6 @@ package com.ruoyi.equity.facade;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.ruoyi.equity.domain.EquityChangeRecord;
 import com.ruoyi.equity.domain.EquityMessageRecord;
 import com.ruoyi.equity.domain.SendMessageRecord;
 import com.ruoyi.equity.service.IEquityMessageRecordService;
@@ -25,7 +24,7 @@ public class EquityMessageRecordFacade {
 
     private final static BigDecimal oneHundred = new BigDecimal(100);
 
-    public void setVoteInfo(Long equityMessageId, String status) {
+    public void setVoteInfo(Long equityMessageId, String status, String voteReason) {
         //获取当前消息信息
         EquityMessageRecord record = equityMessageRecordService.getById(equityMessageId);
         //获取消息发布信息
@@ -37,7 +36,8 @@ public class EquityMessageRecordFacade {
         equityMessageRecordService.update(new LambdaUpdateWrapper<EquityMessageRecord>()
                 .eq(EquityMessageRecord::getEquityMessageId, equityMessageId)
                 .set(EquityMessageRecord::getIsRead, status)
-                .set(EquityMessageRecord::getIsVote,"1"));
+                .set(EquityMessageRecord::getIsVote,"1")
+                .set(EquityMessageRecord::getVoteReason,voteReason));
         //判断是否已经投票完成
         if ("2,4".contains(sendRecord.getVoteStatus())){
             return;