From 5ee756a4a138729af5827322517f912af3de9e5d Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 29 Apr 2025 16:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=AF=8C=E5=A3=AB=E8=BE=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ExamineRankingService.java             |  4 ++--
 .../service/impl/ExamineRankingServiceImpl.java    | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/forstarsecond/service/ExamineRankingService.java b/src/com/engine/forstarsecond/service/ExamineRankingService.java
index b017313..62fcd19 100644
--- a/src/com/engine/forstarsecond/service/ExamineRankingService.java
+++ b/src/com/engine/forstarsecond/service/ExamineRankingService.java
@@ -30,7 +30,7 @@ public interface ExamineRankingService {
      * @param: [khqj]
      * @return: List<ExamineRanking>
      */
-    List<ExamineRanking> calculateWorkers(String khqj);
+    List<ExamineRanking> calculateWorkers(String khqj,String yglb);
 
 
     /**
@@ -40,6 +40,6 @@ public interface ExamineRankingService {
      * @param: [khqj]
      * @return: List<ExamineRanking>
      */
-    List<ExamineRanking> calculateWorkersByYear(String khqj);
+    List<ExamineRanking> calculateWorkersByYear(String khqj,String yglb);
 
 }
diff --git a/src/com/engine/forstarsecond/service/impl/ExamineRankingServiceImpl.java b/src/com/engine/forstarsecond/service/impl/ExamineRankingServiceImpl.java
index 137a54a..05bccc6 100644
--- a/src/com/engine/forstarsecond/service/impl/ExamineRankingServiceImpl.java
+++ b/src/com/engine/forstarsecond/service/impl/ExamineRankingServiceImpl.java
@@ -27,23 +27,25 @@ public class ExamineRankingServiceImpl extends Service implements ExamineRanking
         String type = Util.null2String(params.get("type"));
         String khqj = Util.null2String(params.get("khqj"));
         String khnd = Util.null2String(params.get("khnd"));
+        String yglb = Util.null2String(params.get("yglb"));
+
 
         List<ExamineRanking> examineRankings;
 
         if ("1".equals(type)) {
-           examineRankings = calculateWorkers(khqj);
+           examineRankings = calculateWorkers(khqj,yglb);
         }else {
-           examineRankings = calculateWorkersByYear(khnd);
+           examineRankings = calculateWorkersByYear(khnd,yglb);
         }
         return examineRankings.size();
     }
 
     @Override
-    public List<ExamineRanking> calculateWorkers(String khqj) {
+    public List<ExamineRanking> calculateWorkers(String khqj,String yglb) {
 
         RecordSet rs = new RecordSet();
         List<ExamineRanking> examineRankings = new ArrayList<>();
-        rs.executeQuery("select id,ydzhdf,ssks,bmmc from uf_hr_ydjxkhpj_data where khqj = ?",khqj);
+        rs.executeQuery("select id,ydzhdf,ssks,bmmc from uf_hr_ydjxkhpj_data where khqj = ? and yglb = ?",khqj,yglb);
         while (rs.next()) {
             examineRankings.add(ExamineRanking.builder()
                     .id(Util.getIntValue(rs.getString("id")))
@@ -62,10 +64,10 @@ public class ExamineRankingServiceImpl extends Service implements ExamineRanking
     }
 
     @Override
-    public List<ExamineRanking> calculateWorkersByYear(String year) {
+    public List<ExamineRanking> calculateWorkersByYear(String year,String yglb) {
         RecordSet rs = new RecordSet();
         List<ExamineRanking> examineRankings = new ArrayList<>();
-        rs.executeQuery("select id,ndzhdf,ssks,bmmc from uf_hr_jxkhndpjb where khnd = ?",year);
+        rs.executeQuery("select id,ndzhdf,ssks,bmmc from uf_hr_jxkhndpjb where khnd = ? and yglb = ?",year,yglb);
         while (rs.next()) {
             examineRankings.add(ExamineRanking.builder()
                     .id(Util.getIntValue(rs.getString("id")))