#E10-47# 接口优化

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<String,String> calendarMap = new HashMap<String,String>();
             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" +