From 8491eb48a4a369b867f81db1bdabb4c130de69c3 Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Sun, 31 Mar 2024 11:05:43 +0800
Subject: [PATCH] =?UTF-8?q?#E10-16#=20=E7=BB=A9=E6=95=88=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=85=A5=E8=81=8C=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA=E5=B9=B4?=
 =?UTF-8?q?=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jcldoor/cmd/PortalPerformanceInfoCmd.java | 51 +++++++++----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalPerformanceInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalPerformanceInfoCmd.java
index 2d18baa..bc9230b 100644
--- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalPerformanceInfoCmd.java
+++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalPerformanceInfoCmd.java
@@ -145,25 +145,25 @@ public class PortalPerformanceInfoCmd {
                 log.error("startDay:"+startDay);
                 log.error("endDay:"+endDay);
 
-                if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){
-                    String sql =" select scheme_id " +
-                                " from hr_kpi_scheme_flow_log_detail " +
-                                " where user_id=? \n" +
-                                " and date_type='month' \n" +
-                                " and real_period >= ? \n" +
-                                " and real_period <=? " ;
-
-                    List<String> strlist = new ArrayList<>(100);
-                    strlist.add(employeeId);
-                    strlist.add(startDay);
-                    strlist.add(endDay);
-                    List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
-                    Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql, sqlparam);
-                    List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(result);
-                    if (CollectionUtils.isNotEmpty(recordList)) {
-                        Map<String, Object> recordMap = recordList.get(0);
-                        if (!recordMap.isEmpty()) {
-                            kpi_scheme = String.valueOf(recordMap.get("scheme_id"));
+                String sql =" select scheme_id " +
+                        " from hr_kpi_scheme_flow_log_detail " +
+                        " where user_id=? \n" +
+                        " and date_type='month' \n" +
+                        " order by real_period desc " ;
+
+                List<String> strlist = new ArrayList<String>();
+                strlist.add(employeeId);
+                strlist.add(startDay);
+                strlist.add(endDay);
+                List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
+                Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql, sqlparam);
+                List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(result);
+                if (CollectionUtils.isNotEmpty(recordList)) {
+                    for(int i=0;i<recordList.size();i++){
+                        Map<String, Object> recordMap = recordList.get(i);
+                        kpi_scheme = String.valueOf(recordMap.get("scheme_id"));
+                        if(StringUtils.isNotBlank(kpi_scheme)){
+                            break;
                         }
                     }
                 }
@@ -175,11 +175,10 @@ public class PortalPerformanceInfoCmd {
                     dataMap.put("yearmonth", real_period);
                     dataMap.put("real_period", real_period);
                     dataMap.put("kpi_scheme", kpi_scheme);
-
                     dataMap.put("startDay", startDay);
                     dataMap.put("endDay", endDay);
                 }else{
-                    String sql =" select left(k.real_period,10) as real_period,left(k.real_period,7) as period_month,k.kpi_scheme,k.score\n" +
+                    sql =" select k.kpi_scheme\n" +
                                 " from (select real_period,kpi_scheme,score\n" +
                                 "       from hr_kpi_flow  \n" +
                                 "       where kpi_user=?  \n" +
@@ -192,19 +191,17 @@ public class PortalPerformanceInfoCmd {
 
                     log.error("sql20-1:" + sql);
 
-                    List<String> strlist = new ArrayList<>(100);
+                    strlist = new ArrayList<>(100);
                     strlist.add(employeeId);
                     strlist.add(tenant_key);
 
-                    List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
-                    Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql, sqlparam);
-                    List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(result);
+                    sqlparam = databaseUtils.getSqlParamEntity(strlist);
+                    result = databaseUtils.executeForQuery(sourceType, groupId, sql, sqlparam);
+                    recordList = databaseUtils.getDataSourceList(result);
                     if (CollectionUtils.isNotEmpty(recordList)) {
                         Map<String, Object> recordMap = recordList.get(0);
                         if (!recordMap.isEmpty()) {
-                            score = String.valueOf(recordMap.get("score"));
                             kpi_scheme = String.valueOf(recordMap.get("kpi_scheme"));
-                            real_period = String.valueOf(recordMap.get("real_period"));
                         }
                     }
                     dataMap.put("score", score);