From 592672fb726b9cb9ec9eb590128834a7d41b6019 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Sat, 1 Jun 2024 16:40:10 +0800 Subject: [PATCH] =?UTF-8?q?#E10-42#=20=E5=88=86=E6=9E=90=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/cmd/CockpitDocumentAnalysisCmd.java | 11 +++++++++-- .../cockpit/cmd/CockpitWorkDate3TypeCmd.java | 2 -- .../cockpit/cmd/CockpitWorkflowAnalysisCmd.java | 11 +++++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java index dda076b..bb7e526 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java @@ -530,8 +530,10 @@ public class CockpitDocumentAnalysisCmd { " from document t \n" + " inner join folder l on l.id = t.folder \n" + " where t.creator = ? \n" + - " and delete_type = 0 \n" + - " and tenant_key= ? " + + " and t.delete_type = 0 \n" + + " and t.tenant_key= ? " + + " and l.delete_type = 0 \n" + + " and l.tenant_key= ? " + " group by t.folder,l.name \n" + " ) w order by w.cou desc \n" + ") p limit 5 " ; @@ -548,6 +550,11 @@ public class CockpitDocumentAnalysisCmd { sqlParamEntity.setValue(tenantKey); sqlparam.add(sqlParamEntity); + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); recordList = databaseUtils.getDataSourceList(result); diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate3TypeCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate3TypeCmd.java index ecd9c90..283e6e7 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate3TypeCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate3TypeCmd.java @@ -6,12 +6,10 @@ import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.project.entity.SimpleMainline; import com.weaver.project.service.RemoteMainlineService; import com.weaver.seconddev.cockpit.util.DatabaseUtils; -import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils; import com.weaver.teams.core.orm.mybatis.Page; import com.weaver.teams.domain.crm.RemoteCustomerService; import com.weaver.teams.domain.crm.SimpleCustomer; import com.weaver.teams.domain.user.SimpleEmployee; -import com.weaver.workrelate.performance.api.rest.RemotePerformanceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java index f830809..803b501 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java @@ -315,8 +315,10 @@ public class CockpitWorkflowAnalysisCmd { " from wfc_requestbase t\n" + " inner join wfp_base p on p.id = t.workflowid\n" + " where t.userid = ? \n" + - " and delete_type = 0 \n" + - " and tenant_key= ? " + + " and t.delete_type=0\n" + + " and p.delete_type=0\n" + + " and t.tenant_key= ? \n" + + " and p.tenant_key = ?" + " group by t.workflowid,p.workflowname\n" + " ) p order by p.cou desc \n" + " ) w limit 5" ; @@ -333,6 +335,11 @@ public class CockpitWorkflowAnalysisCmd { sqlParamEntity.setValue(tenantKey); sqlparam.add(sqlParamEntity); + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); recordList = databaseUtils.getDataSourceList(result);