Merge remote-tracking branch 'origin/main'

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteItems.java

@@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import java.math.BigDecimal;
 
 /**
  * 投票项对象 kh_vote_items
@@ -24,7 +25,7 @@ public class KhVoteItems extends BaseEntity
 
     /** 分数 */
     @Excel(name = "分数")
-    private Long score;
+    private BigDecimal score;
 
     public void setId(Long id)
     {
@@ -46,14 +47,12 @@ public class KhVoteItems extends BaseEntity
         return vitemName;
     }
 
-    public void setScore(Long score)
+    public BigDecimal getScore() {
-    {
+        return score;
-        this.score = score;
     }
 
-    public Long getScore()
+    public void setScore(BigDecimal score) {
-    {
+        this.score = score;
-        return score;
     }
 
     @Override

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.kaohe.domain.KhVoteItems;
 import com.ruoyi.kaohe.domain.KhVoteRecard;
 import com.ruoyi.kaohe.domain.KhVoteRecardParam;
 import com.ruoyi.kaohe.mapper.KhVoteItemsMapper;
@@ -28,8 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2025-06-17
  */
 @Service
-public class KhVoteEmpServiceImpl implements IKhVoteEmpService 
+public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
-{
     @Autowired
     private KhVoteEmpMapper khVoteEmpMapper;
     @Autowired
@@ -44,8 +44,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService
      * @return 投票选项
      */
     @Override
-    public KhVoteEmp selectKhVoteEmpById(Long id)
+    public KhVoteEmp selectKhVoteEmpById(Long id) {
-    {
         return khVoteEmpMapper.selectKhVoteEmpById(id);
     }
 
@@ -56,8 +55,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService
      * @return 投票选项
      */
     @Override
-    public List<KhVoteEmp> selectKhVoteEmpList(KhVoteEmp khVoteEmp)
+    public List<KhVoteEmp> selectKhVoteEmpList(KhVoteEmp khVoteEmp) {
-    {
         return khVoteEmpMapper.selectKhVoteEmpList(khVoteEmp);
     }
 
@@ -68,8 +66,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService
      * @return 结果
      */
     @Override
-    public int insertKhVoteEmp(KhVoteEmp khVoteEmp)
+    public int insertKhVoteEmp(KhVoteEmp khVoteEmp) {
-    {
         khVoteEmp.setCreateTime(DateUtils.getNowDate());
         return khVoteEmpMapper.insertKhVoteEmp(khVoteEmp);
     }
@@ -81,8 +78,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService
      * @return 结果
      */
     @Override
-    public int updateKhVoteEmp(KhVoteEmp khVoteEmp)
+    public int updateKhVoteEmp(KhVoteEmp khVoteEmp) {
-    {
         khVoteEmp.setUpdateTime(DateUtils.getNowDate());
         return khVoteEmpMapper.updateKhVoteEmp(khVoteEmp);
     }
@@ -94,8 +90,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService
      * @return 结果
      */
     @Override
-    public int deleteKhVoteEmpByIds(Long[] ids)
+    public int deleteKhVoteEmpByIds(Long[] ids) {
-    {
         return khVoteEmpMapper.deleteKhVoteEmpByIds(ids);
     }
 
@@ -106,8 +101,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService
      * @return 结果
      */
     @Override
-    public int deleteKhVoteEmpById(Long id)
+    public int deleteKhVoteEmpById(Long id) {
-    {
         return khVoteEmpMapper.deleteKhVoteEmpById(id);
     }
 
@@ -119,11 +113,24 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService
         List<KhVoteEmp> voteEmpList = param.getVoteEmpList();
         Date nowDate = DateUtils.getNowDate();
         Long typeid = param.getKhitemTypeid();
-       // khVoteItemsMapper.s  从数据库获取分值
+        List<KhVoteItems> voteItems = khVoteItemsMapper.selectKhVoteItemsList(null);//从数据库获取分值
         BigDecimal a = new BigDecimal("100");
         BigDecimal b = new BigDecimal("80");
         BigDecimal c = new BigDecimal("60");
         BigDecimal d = new BigDecimal("40");
+        if(voteItems!=null&&voteItems.size()>0){
+            for (KhVoteItems voteItem : voteItems) {
+                if (voteItem.getId() == 1) {
+                    a = voteItem.getScore();
+                } else if (voteItem.getId() == 2) {
+                    b = voteItem.getScore();
+                } else if (voteItem.getId() == 3) {
+                    c = voteItem.getScore();
+                } else {
+                    d = voteItem.getScore();
+                }
+            }
+        }
         for (KhVoteEmp voteEmp : voteEmpList) {
             voteEmp.setUpdateTime(nowDate);
             //根据id查询数据得到之前的值