From 97205d98a101933d6c91dc01965a67f9babbac1c Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Wed, 12 Jun 2024 11:54:31 +0800 Subject: [PATCH] =?UTF-8?q?#E10-47#=20=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/cmd/CockpitWorkDate4TypeCmd.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate4TypeCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate4TypeCmd.java index a9c55c7..23127e0 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate4TypeCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate4TypeCmd.java @@ -231,8 +231,15 @@ public class CockpitWorkDate4TypeCmd { long employeeId = employee.getEmployeeId(); Long userid = employee.getUserId(); + log.error("employeeId:"+employeeId); + log.error("userid:"+userid); + + String calendar_count22 = getCalendarDataAmount(employeeId,tenantKey); + log.error("calendar_count22:"+calendar_count22); + Map calendarMap = new HashMap(); String calendar_count = getCalendarDataAmount(userid,tenantKey); + log.error("calendar_count:"+calendar_count); String calendar_name = "日程"; String calendar_pkey = "calendar.create.amount"; String calendar_url = jucailinCockpitUtils.getUfPropData(calendar_pkey,tenantKey); @@ -483,12 +490,12 @@ public class CockpitWorkDate4TypeCmd { */ public String getTaskDataAmount(Long employeeId,String type,String tenantKey) { String count = "0"; - String groupId = "weaver-doc-service"; + String sourceType = "LOGIC"; try { if("2".equals(type)){ - + String groupId = "weaver-project-service"; String sql =" select count(1) as cou " + " from task " + " where creator = ? \n" + @@ -513,6 +520,8 @@ public class CockpitWorkDate4TypeCmd { count = String.valueOf(recordList.get(0).get("cou")); } }else if("3".equals(type)){ + + String groupId = "weaver-doc-service"; String sql =" select count(1) as cou \n" + " from my_watch \n" + " where watcher = ? \n" +