优化

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java

@@ -272,6 +272,7 @@ public class KhPingceController extends BaseController {
                         if (vEmps != null && vEmps.size() > 0) {
                             //修改关联的员工数据到最初创建状态
                             for (KhVoteEmp uPEmp : vEmps) {
+                                uPEmp.setVersion(0);//版本号清0
                                 uPEmp.setVoteNum(BigDecimal.ZERO);
                                 uPEmp.setVoteScore(BigDecimal.ZERO);
                                 uPEmp.setAvgScore(BigDecimal.ZERO);
@@ -321,12 +322,19 @@ public class KhPingceController extends BaseController {
                         List<Long> vIds = votes.stream().map(KhVote::getId).collect(Collectors.toList());
                         //修改voteemp
                         for (Long vId : vIds) {
+                            //修改投票为未统计计算平均分、最终分
+                            KhVote v = new KhVote();
+                            v.setId(vId);
+                            v.setStatistical("0");
+                            khVoteService.updateKhVote(v);
+
                             KhVoteEmp vemp = new KhVoteEmp();
                             vemp.setVoteId(vId);
                             List<KhVoteEmp> vEmps = khVoteEmpService.selectKhVoteEmpList(vemp);
                             if (vEmps != null && vEmps.size() > 0) {
                                 //修改关联的员工数据到最初创建状态
                                 for (KhVoteEmp uPEmp : vEmps) {
+                                    uPEmp.setVersion(0L);//版本号清0
                                     uPEmp.setVoteNum(BigDecimal.ZERO);
                                     uPEmp.setVoteScore(BigDecimal.ZERO);
                                     uPEmp.setAvgScore(BigDecimal.ZERO);

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java

@@ -46,7 +46,7 @@ public class KhVoteController extends BaseController {
     @Autowired
     private IKhTemItemService khTemItemService;
 
-    /*@Scheduled(cron = "0 * * * * ?") // 每分钟的第0秒执行一次   监测时间修改评分状态
+    @Scheduled(cron = "0 * * * * ?") // 每分钟的第0秒执行一次   监测时间修改评分状态
     public void performTask() {
         System.out.println("进入定时任务-------------------------------------------------------------");
         //获取所有未完成的评分任务
@@ -97,7 +97,7 @@ public class KhVoteController extends BaseController {
             }
 
         }
-    }*/
+    }
 
     /**
      * 查询投票评测列表

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

@@ -81,7 +81,7 @@ public class KhVoteEmp extends BaseEntity
 
     /** 乐观锁版本号 */
    // @Excel(name = "乐观锁版本号")
-    private Long version;
+    private Integer version;
 
     //仅做参数  传递本次评分分数
     private BigDecimal score;
@@ -92,11 +92,11 @@ public class KhVoteEmp extends BaseEntity
     private  BigDecimal c;
     private  BigDecimal d;
 
-    public Long getVersion() {
+    public Integer getVersion() {
         return version;
     }
 
-    public void setVersion(Long version) {
+    public void setVersion(Integer version) {
         this.version = version;
     }
 

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

@@ -140,7 +140,7 @@ public class KhKhrwResultServiceImpl implements IKhKhrwResultService
         //查询该考核任务下的所有评分任务
         List<KhVote> votes = khVoteMapper.selectKhVoteList(khVote);
         for (KhVote vote : votes) {
-            //当前投票是否统计计算平均分和最终得分————去掉if 担心客户在评测结束前点击统计平均值及最终分
+            //当前投票是否统计计算平均分和最终得分————去掉if 担心客户在评测结束前点击统计平均值及最终分,已统计但不是最终结果
             //if(vote.getStatistical().equals("0")){
                 khVoteEmpService.statisticalResults(vote.getId());
             //}

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

@@ -116,12 +116,6 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
     @Override
     @Transactional
     public AjaxResult statisticalResults(Long id) {
-        //修改未已统计计算
-        KhVote vote = new KhVote();
-        vote.setId(id);
-        vote.setStatistical("1");
-        khVoteMapper.updateKhVote(vote);
-
         //统计计算平均值、最终值
         KhVoteEmp vEmp = new KhVoteEmp();
         vEmp.setVoteId(id);
@@ -168,6 +162,12 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService {
                 voteEmp.setEndScore(voteEmp.getAvgScore());
             }
         }
+
+        //修改为已统计计算
+        KhVote vote = new KhVote();
+        vote.setId(id);
+        vote.setStatistical("1");
+        khVoteMapper.updateKhVote(vote);
         return khVoteEmpMapper.updateKhVoteEmp1(khVoteEmps)> 0 ? AjaxResult.success() : AjaxResult.error();
     }
 

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml

@@ -162,13 +162,13 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="version != null">version = #{version},</if>
 
         </trim>
-        <!-- 其他需要更新的字段 /* version = version + 1 AND version = #{version}*/-->
         WHERE id = #{id}
     </update>
 
-    <!-- 批量——统计数据 -->
+    <!-- 批量——统计计算平均值、最终值数据 -->
     <update id="updateKhVoteEmp1" parameterType="java.util.List">
         <foreach collection="list" item="item" separator=";">
             UPDATE kh_vote_emp
@@ -180,7 +180,7 @@
             id = #{item.id}
         </foreach>
     </update>
-
+    <!-- 批量处理提交评分 -->
     <update id="batchUpdateVoteScore" parameterType="java.util.List">
         <foreach collection="list" item="item" separator=";">
             UPDATE kh_vote_emp

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml

@@ -76,7 +76,7 @@
         <where>
             <if test="pingceName != null  and pingceName != ''"> and pingce_name like concat('%', #{pingceName}, '%')</if>
             <if test="voteTitle != null  and voteTitle != ''"> and vote_title like concat('%', #{voteTitle}, '%') </if>
-            <!--状态值传1，也就是展示所有状态不等于2（非完成状态）的数据-->
+            <!--状态值传2，也就是展示所有状态不等于2（非完成状态）的数据-->
             <if test="state != null  and state != ''"> and state != #{state}</if>
             <if test="voteIds != null"> and v.id in
                 <foreach item="voteId" collection="voteIds" open="(" separator="," close=")">