From 5b4de0a5e63741b600ff4607977630c587d889f9 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 3 Jun 2025 14:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcerEvaluateController.java         | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java
index d4f5b03..ba97486 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java
@@ -325,13 +325,12 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
         List<String> postIdList = outsourcerEvaluateDao.getPjTaskEvaluatedPostId(o);
         Collections.sort(deptIdList);
         Collections.sort(postIdList);
+        int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
+        String evaluateType = o.getEvaluateType();
         //对两次查询的结果判断是否完全相同
         if (deptIdList.equals(postIdList)) {
-            int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
-            String evaluateType = o.getEvaluateType();
             System.err.println("startId:" + startId + " ,evaluateType=" + evaluateType);
             if (startId == 0 && "1".equals(evaluateType)) {
-
                 int examineNum = outsourcerEvaluateDao.getExamineNumByEvaluateId(o.getEvaluateId(), "1");
                 if (examineNum == 0) {
                     //新增二级审核
@@ -350,12 +349,16 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
                 //汇总审核结束 更新状态
                 outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2", o.getEvaluateId());
                 //添加到月度排名表
-                addMonthRank(o);
+//                addMonthRank(o);
             } else {
                 //过程中 暂不做处理
 
             }
         }
+        if (startId == 0 && "3".equals(evaluateType)) {
+            //添加到月度排名表
+            addMonthRank(o);
+        }
         if ("1".equals(o.getType())) {
             outsourcerEvaluateDao.updateEvalStatus("3", o.getEvaluateId());
         } else {
@@ -442,9 +445,9 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
             Collections.sort(deptIdList);
             Collections.sort(postIdList);
             //对两次查询的结果判断是否完全相同
-            int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
-            String evaluateType = o.getEvaluateType();
             if (deptIdList.equals(postIdList)) {
+                int startId = outsourcerEvaluateService.startCollectExamineByEvaluateId(o);
+                String evaluateType = o.getEvaluateType();
                 System.err.println("startId:" + startId + " ,evaluateType=" + evaluateType);
                 if (startId == 0 && "1".equals(evaluateType)) {
 
@@ -465,17 +468,13 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
                 } else if (startId == 0 && "3".equals(evaluateType)) {
                     //汇总审核结束 更新状态
                     outsourcerEvaluateDao.updateEvaluateRecordByEvaluateId("2", o.getEvaluateId());
-//                    //添加到月度排名表
-//                    addMonthRank(o);
+                    //添加到月度排名表
+                    addMonthRank(o);
                 } else {
                     //过程中 暂不做处理
 
                 }
             }
-            if (startId == 0 && "3".equals(evaluateType)) {
-                //添加到月度排名表
-                addMonthRank(o);
-            }
             if ("1".equals(o.getType())) {
                 outsourcerEvaluateDao.updateEvalStatus("2", o.getEvaluateId());
             } else {