diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java index ea338f2..e486825 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java @@ -4,6 +4,7 @@ package com.weaver.seconddev.cockpit.cmd; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.enums.SqlParamType; import com.weaver.seconddev.cockpit.util.DatabaseUtils; +import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils; import com.weaver.teams.domain.user.SimpleEmployee; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -26,6 +27,8 @@ public class CockpitProjectDataCmd { @Autowired private DatabaseUtils databaseUtils; + @Autowired + private JucailinCockpitUtils jucailinCockpitUtils; public Map getDataInfo(SimpleEmployee employee, Map paramMap, String tenantKey) { @@ -34,7 +37,7 @@ public class CockpitProjectDataCmd { String userid = String.valueOf(paramMap.get("userid")); List> projectDate2 = new ArrayList>(); List> projectDate3 = new ArrayList>(); - + String url = "" ; try { projectDate2 = getProjectDate3(employee,tenantKey,userid); @@ -45,7 +48,16 @@ public class CockpitProjectDataCmd { log.error("PortalPerformanceInfoCmd :" + e); } + try { + String pkey ="cockpit.project.moreurl"; + url = jucailinCockpitUtils.getUfPropData(pkey, tenantKey); + } catch (Exception e) { + e.printStackTrace(); + log.error("PortalPerformanceInfoCmd :" + e); + } + recordMap.put("projectDate2",projectDate2); + recordMap.put("url",url); // recordMap.put("projectDate3",projectDate3); return recordMap; }