From e5a31673f649a79835608e15a96fffb5e7c51a05 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Thu, 13 Jun 2024 11:32:57 +0800 Subject: [PATCH] =?UTF-8?q?#E10-48#=20=E9=A1=B9=E7=9B=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0url=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/cmd/CockpitProjectDataCmd.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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; }