From 3bf3c8ba9ed49833644ebb7796e4802f87ef0694 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Fri, 31 May 2024 18:53:40 +0800 Subject: [PATCH] =?UTF-8?q?#E10-41#=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 --- .../cmd/CockpitDocumentAnalysisCmd.java | 128 ++++++++++++++++-- .../cockpit/cmd/CockpitUserDataCmd.java | 90 +++++++++++- .../cmd/CockpitWorkflowAnalysisCmd.java | 61 ++++++++- 3 files changed, 257 insertions(+), 22 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 e28e35c..6fbcc26 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java @@ -42,13 +42,8 @@ public class CockpitDocumentAnalysisCmd { try { List> dataList = getDocumentDate(employee,tenantKey); recordMap.put("leftdata",dataList); - Map chartMap = new HashMap(); - chartMap.put("项目管理","16.6"); - chartMap.put("客户服务","16.6"); - chartMap.put("产品中心","40.8"); - chartMap.put("市场管理","10.0"); - chartMap.put("其他","8.6"); - recordMap.put("rightdata",chartMap); + List> rightList = getRightViewData(employee,tenantKey); + recordMap.put("rightdata",rightList);; } catch (Exception e) { e.printStackTrace(); log.error("CockpitDocumentAnalysisCmd-e:" + e); @@ -80,7 +75,7 @@ public class CockpitDocumentAnalysisCmd { // doclist.add(docMap); docMap = new HashMap(); - String doc_count5 = getDocumentDateAmount6(employeeId,tenantKey); + String doc_count5 = getDocumentDateAmount5(employeeId,tenantKey); String doc_name5 = "我的积分"; String doc_pkey5 = "document.create.amount"; String doc_url5 = jucailinCockpitUtils.getUfPropData(doc_pkey5,tenantKey); @@ -260,6 +255,12 @@ public class CockpitDocumentAnalysisCmd { // return count; // } + /*** + * + * @param employeeId + * @param tenantKey + * @return + */ public String getDocumentDateAmount1(Long employeeId,String tenantKey) { String count = "0"; try { @@ -273,6 +274,56 @@ public class CockpitDocumentAnalysisCmd { return count; } + /*** + * + * @param employeeId + * @param tenantKey + * @return + */ + public String getDocumentDateAmount5(Long employeeId,String tenantKey) { + String count = "0"; + + String groupId = "weaver-ebuilder-form-service"; + String sourceType = "LOGIC"; + + try { + if(StringUtils.isNotBlank(employeeId+"")){ + String sql =" select sum(case when jfzj = 0 then jfz else 0-jfz end ) as zjf \n" + + " from uf_docPointDetail_112 " + + " where xm = ?"+ + " and delete_type = 0" + + " and tenant_key = ?" ; + + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(employeeId+""); + sqlparam.add(sqlParamEntity); + + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List> recordList = databaseUtils.getDataSourceList(result); + if(recordList.size()>0){ + count = String.valueOf(recordList.get(0).get("cou")); + } + } + } catch (Exception e) { + e.printStackTrace(); + log.error("getDocCreateNum:" + e); + } + return count; + } + + /*** + * + * @param employeeId + * @param tenantKey + * @return + */ public String getDocumentDateAmount6(Long employeeId,String tenantKey) { int count = 0; String count1 = "0"; @@ -283,11 +334,11 @@ public class CockpitDocumentAnalysisCmd { if(StringUtils.isNotBlank(employeeId+"")){ String sql =" select count(1) as cou\n" + - " from doc_external_share \n" + - " where creator = ? " + - " and date_add(create_time, interval period_validity day) >= curdate()" + - " and delete_type = 0" + - " and tenant_key = ?" ; + " from doc_external_share \n" + + " where creator = ? " + + " and date_add(create_time, interval period_validity day) >= curdate()" + + " and delete_type = 0" + + " and tenant_key = ?" ; List sqlparam = new ArrayList(); SqlParamEntity sqlParamEntity = new SqlParamEntity(); @@ -458,4 +509,55 @@ public class CockpitDocumentAnalysisCmd { return count; } + + /*** + * + * @param employee + * @param tenantKey + * @return + */ + public List> getRightViewData(SimpleEmployee employee,String tenantKey){ + List> recordList = new ArrayList>(); + String groupId = "weaver-doc-service"; + String sourceType = "LOGIC"; + Long employeeId = employee.getEmployeeId(); + try { + String sql =" select p.folder,p.name,p.cou from ( \n" + + " select w.folder,w.name,w.cou \n" + + " from ( \n" + + " select t.folder,l.name,count(1) as cou \n" + + " 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= ? " + + " group by t.folder,l.name \n" + + " ) w order by w.cou desc \n" + + ") p limit 5 " ; + + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(employeeId+""); + 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); + + } catch (Exception e) { + e.printStackTrace(); + log.error("getDocCreateNum:" + e); + } + return recordList; + } + + + + + } diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java index daf13b6..3a28b1a 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java @@ -54,8 +54,6 @@ public class CockpitUserDataCmd { String gradename = employee.getGrade().getName(); log.error("gradename:"+gradename); - - String personnelstatusname = "" ; String personnelstatus = employee.getPersonnelStatus(); log.error("personnelstatus:"+personnelstatus); @@ -189,11 +187,99 @@ public class CockpitUserDataCmd { recordMap.put("personnelstatus",personnelstatus); recordMap.put("gradename",gradename); recordMap.put("field69",field69); + String avatarUrl = ""; + if(StringUtils.isBlank(avatarUrl)){ + avatarUrl = "/build/hrm/static/media/male.png"; + } + recordMap.put("avatarUrl",avatarUrl); + +// List> customList = new ArrayList>(); +// Map customMap = new HashMap(); +// customMap.put("name","销售排名"); +// customMap.put("value","TOP1"); +// customList.add(customMap); +// +// customMap = new HashMap(); +// customMap.put("name","职称"); +// customMap.put("value","高级工程师"); +// customList.add(customMap); +// +// customMap = new HashMap(); +// customMap.put("name","熟悉领域"); +// customMap.put("value","项目实施"); +// customList.add(customMap); +// +// customMap = new HashMap(); +// customMap.put("name","技能证书"); +// customMap.put("value","人力资源管理师"); +// customList.add(customMap); + + List> customList = getCustomType(employee,tenantKey); + recordMap.put("customType",customList); } catch (Exception e) { e.printStackTrace(); log.error("PortalPerformanceInfoCmd :" + e); } + + try{ + String avatarUrl = employee.getAvatar().getPreviewUrl(); + log.error("CockpitUserDataCmd-test-avatarUrl:"+avatarUrl); + + Long SubCompanyId = employee.getDepartment().getSubCompanyId(); + log.error("CockpitUserDataCmd-test-SubCompanyId:"+SubCompanyId); + + }catch (Exception e){ + + } return recordMap; } + + /*** + * + * @return + */ + public List> getCustomType(SimpleEmployee employee,String tenantKey){ + + List> recordList = new ArrayList>(); + String groupId = "weaver-doc-service"; + String sourceType = "LOGIC"; + Long employeeId = employee.getEmployeeId(); + try { + String sql =" select p.bqmc,p.bqnr \n" + + " from(\n" + + " select bqmc,bqnr " + + " from uf_rcbq " + + " where ry = ? \n" + + " and delete_type = 0\n" + + " and tenant_key = ? \n" + + " order by xssx desc\n" + + " ) p limit 4" ; + + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(employeeId+""); + 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); + if(recordList.size() < 4){ + for(int i=0;i<(4-recordList.size());i++){ + Map nullMap = new HashMap(); + recordList.add(nullMap); + } + } + } catch (Exception e) { + e.printStackTrace(); + log.error("getRightViewData:" + e); + } + return recordList; + } + } 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 49e45ea..1472171 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.cockpit.cmd; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; +import com.weaver.ebuilder.datasource.api.enums.SqlParamType; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.seconddev.cockpit.util.DatabaseUtils; import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils; @@ -51,13 +52,8 @@ public class CockpitWorkflowAnalysisCmd { try { List> dataList = getWorkflowDate(employee,tenantKey); recordMap.put("leftdata",dataList); - Map chartMap = new HashMap(); - chartMap.put("项目管理类流程","16.6"); - chartMap.put("日常办公类流程","16.6"); - chartMap.put("行政事务类流程","40.8"); - chartMap.put("人事类流程","10.0"); - chartMap.put("销售类流程","8.6"); - recordMap.put("rightdata",chartMap); + List> rightList = getRightViewData(employee,tenantKey); + recordMap.put("rightdata",rightList); } catch (Exception e) { e.printStackTrace(); log.error("PortalPerformanceInfoCmd :" + e); @@ -298,6 +294,57 @@ public class CockpitWorkflowAnalysisCmd { return dayList; } + /*** + * + * @param employee + * @param tenantKey + * @return + */ + public List> getRightViewData(SimpleEmployee employee,String tenantKey){ + List> recordList = new ArrayList>(); + String groupId = "weaver-doc-service"; + String sourceType = "LOGIC"; + Long employeeId = employee.getEmployeeId(); + try { + String sql =" select w.workflowid,w.workflowname,w.cou " + + " from (\n" + + " select p.workflowid,p.WORKFLOWNAME,p.cou\n" + + " from (\n" + + " select t.workflowid,p.workflowname,count(1) as cou \n" + + " 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= ? " + + " group by t.workflowid,p.WORKFLOWNAME\n" + + " ) p order by p.cou desc \n" + + " ) w limit 5" ; + + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(employeeId+""); + 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); + + } catch (Exception e) { + e.printStackTrace(); + log.error("getRightViewData:" + e); + } + return recordList; + } + + + + + }