From 064c06f124a9718c79a0b00b14b812adf1294da2 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Tue, 11 Nov 2025 11:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=84=E5=88=86=E6=97=B6?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B9=90=E8=A7=82=E9=94=81=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/KhVoteEmpServiceImpl.java    | 24 +++++++++----------
 .../mapper/kaohe/KhVoteEmpMapper.xml          |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java
index 40ee37b..d276723 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java
@@ -165,7 +165,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
                 // 最大重试次数
                 // final int MAX_RETRY_COUNT = 3;
                 int retryCount = 0;
-                while (true) {
+              /*  while (true) {*/
                     voteEmp.setUpdateTime(nowDate);
                     //根据id查询数据得到原值及版本号
                     KhVoteEmp oldvoteEmp = khVoteEmpMapper.selectKhVoteEmpById(voteEmp.getId());
@@ -206,7 +206,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
                     }
                     voteEmp.setVersion(oldvoteEmp.getVersion());
                     int result = khVoteEmpMapper.updateKhVoteEmp(voteEmp);
-                    if (result > 0) {
+                    /*if (result > 0) {
                         break;
                     } else {
                         // 更新失败，版本冲突，增加重试计数
@@ -217,19 +217,19 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
                         System.out.println("-----------版本冲突，" + voteEmp.getBkhdxName() + "第" + retryCount + "次重试");
                         // 等待一段时间后重试，避免立即重试导致的持续冲突
                         try {
-                            Thread.sleep(500 * retryCount); // 重试间隔递增
+                            Thread.sleep(1000 * retryCount); // 重试间隔递增
                         } catch (InterruptedException e) {
                             Thread.currentThread().interrupt();
                             throw new RuntimeException("重试过程异常中断-------------", e);
                         }
                         // }
                     }
-                }
+                }*/
             }
         } else if (typeid.equals(2L)) {//占比评分
             for (KhVoteEmp voteEmp : voteEmpList) {
                 int retryCount = 0;
-                while (true) {
+               /* while (true) {*/
                     voteEmp.setUpdateTime(nowDate);
                     //根据id查询数据得到之前的值
                     KhVoteEmp oldvoteEmp = khVoteEmpMapper.selectKhVoteEmpById(voteEmp.getId());
@@ -241,7 +241,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
                     voteEmp.setEndScore(voteEmp.getAvgScore().multiply(oldvoteEmp.getPercentage()));
                     voteEmp.setVersion(oldvoteEmp.getVersion());
                     int result = khVoteEmpMapper.updateKhVoteEmp(voteEmp);
-                    if (result > 0) {
+                    /*if (result > 0) {
                         break;
                     } else {
                         // 更新失败，版本冲突，增加重试计数
@@ -252,18 +252,18 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
                         System.out.println("-----------版本冲突，" + voteEmp.getBkhdxName() + "第" + retryCount + "次重试");
                         // 等待一段时间后重试，避免立即重试导致的持续冲突
                         try {
-                            Thread.sleep(500 * retryCount); // 重试间隔递增
+                            Thread.sleep(1000 * retryCount); // 重试间隔递增
                         } catch (InterruptedException e) {
                             Thread.currentThread().interrupt();
                             throw new RuntimeException("重试过程异常中断-------------", e);
                         }
                     }
-                }
+                }*/
             }
         } else {//单独评分    不占比   以平均分为最后得分
             for (KhVoteEmp voteEmp : voteEmpList) {
                 int retryCount = 0;
-                while (true) {
+               /* while (true) {*/
                     voteEmp.setUpdateTime(nowDate);
                     //根据id查询数据得到之前的值
                     KhVoteEmp oldvoteEmp = khVoteEmpMapper.selectKhVoteEmpById(voteEmp.getId());
@@ -275,7 +275,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
                     voteEmp.setEndScore(voteEmp.getAvgScore());
                     voteEmp.setVersion(oldvoteEmp.getVersion());
                     int result = khVoteEmpMapper.updateKhVoteEmp(voteEmp);
-                    if (result > 0) {
+                    /*if (result > 0) {
                         break;
                     } else {
                         // 更新失败，版本冲突，增加重试计数
@@ -286,13 +286,13 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
                         System.out.println("-----------版本冲突，" + voteEmp.getBkhdxName() + "第" + retryCount + "次重试");
                         // 等待一段时间后重试，避免立即重试导致的持续冲突
                         try {
-                            Thread.sleep(500 * retryCount); // 重试间隔递增
+                            Thread.sleep(1000 * retryCount); // 重试间隔递增
                         } catch (InterruptedException e) {
                             Thread.currentThread().interrupt();
                             throw new RuntimeException("重试过程异常中断-------------", e);
                         }
                     }
-                }
+                }*/
             }
         }
 
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
index a47139f..5ff5838 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
@@ -140,10 +140,10 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
-            version = version + 1
+
         </trim>
-        <!-- 其他需要更新的字段 -->
-        WHERE id = #{id} AND version = #{version}
+        <!-- 其他需要更新的字段 /* version = version + 1 AND version = #{version}*/-->
+        WHERE id = #{id}
     </update>
 
     <delete id="deleteKhVoteEmpById" parameterType="Long">