From 224a11832317dcca60142c8d9c5e3d2c391efb38 Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Fri, 24 May 2024 17:33:28 +0800
Subject: [PATCH] =?UTF-8?q?#E10-38#=20=E9=A9=BE=E9=A9=B6=E8=88=B1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/CockpitMonthPerformanceInfoCmd.java      | 10 +++++++---
 .../controller/JucailinCockpitController.java    | 16 ++++++++++++++++
 .../cockpit/service/JucailinCockpitService.java  |  2 ++
 .../service/impl/JucailinCockpitServiceimpl.java |  6 ++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java
index 48bdf59..9578341 100644
--- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java
+++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java
@@ -39,7 +39,8 @@ public class CockpitMonthPerformanceInfoCmd {
             userList.add(employeeId);
 
             LocalDate currentDate = LocalDate.now();
-            Map<String, Object> scoreMap = new HashMap<String, Object>();
+            List<Map<String, Object>> scoreList = new ArrayList<Map<String, Object>>();
+            Map<String, Object> scoreMap = null;
             for (int i = 0; i < 6; i++) {
                 LocalDate lastLocalDate = currentDate.minus(i, ChronoUnit.MONTHS); // 当前日期减去6个月
                 LocalDate startDay = lastLocalDate.with(TemporalAdjusters.firstDayOfMonth()); // 计算当前月份的首日
@@ -62,9 +63,12 @@ public class CockpitMonthPerformanceInfoCmd {
                 }
                 log.error("currentMonth:"+currentMonth);
 
-                scoreMap.put(currentMonth,score);
+                scoreMap = new HashMap<String, Object>();
+                scoreMap.put("month",currentMonth);
+                scoreMap.put("score",score);
+                scoreList.add(scoreMap);
             }
-            dataMap.put("datas",scoreMap);
+            dataMap.put("datas",scoreList);
 
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java b/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java
index 9ade9d3..58a163b 100644
--- a/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java
+++ b/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java
@@ -133,6 +133,22 @@ public class JucailinCockpitController {
     }
 
 
+    @GetMapping("/getUserData")
+    @WeaPermission(publicPermission = true)
+    public WeaResult<Object> getUserData(HttpServletRequest request){
+        log.error("getWorkData");
+        Map<String, Object> dataList = new HashMap<String, Object>();
+        SimpleEmployee simpleEmployee = UserContext.getCurrentUser();
+        Map<String,Object> params = jucailinCockpitUtils.request2Map(request);
+
+        try{
+            dataList = jucailinCockpitService.getUserData(simpleEmployee,params,tenant_key);
+        }catch (Exception e){
+            log.error("getWorkData-Exception:"+e.getMessage());
+        }
+        return WeaResult.success(dataList);
+    }
+
 
 
     @GetMapping("/getBlogData")
diff --git a/src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java b/src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java
index 8c3044d..7f14579 100644
--- a/src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java
+++ b/src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java
@@ -16,6 +16,8 @@ public interface JucailinCockpitService {
 
     Map<String, Object> getDocmentAnalysis(SimpleEmployee simpleEmployee,Map<String,Object> paramMap,String tenantKey);
 
+    Map<String, Object> getUserData(SimpleEmployee simpleEmployee,Map<String,Object> paramMap,String tenantKey);
+
     Map<String, Object> getBlogData(SimpleEmployee simpleEmployee,Map<String,Object> paramMap,String tenantKey);
 
 }
diff --git a/src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java b/src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java
index f0b0453..08c542b 100644
--- a/src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java
+++ b/src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java
@@ -58,6 +58,12 @@ public class JucailinCockpitServiceimpl implements JucailinCockpitService {
         return dataMap;
     }
 
+    @Override
+    public Map<String, Object> getUserData(SimpleEmployee simpleEmployee, Map<String, Object> paramMap, String tenantKey) {
+        Map<String,Object> dataMap = cockpitWorkDate4TypeCmd.getDataInfo(simpleEmployee,paramMap,tenantKey);
+        return dataMap;
+    }
+
     @Override
     public Map<String, Object> getBlogData(SimpleEmployee simpleEmployee, Map<String, Object> paramMap, String tenantKey) {
         Map<String,Object> dataMap = cockpitWorkDate4TypeCmd.getDataInfo(simpleEmployee,paramMap,tenantKey);