From d0f51362b69b85c5513dd7792f92986348592769 Mon Sep 17 00:00:00 2001
From: wangjie <805650258@qq.com>
Date: Fri, 26 Apr 2024 16:37:23 +0800
Subject: [PATCH] =?UTF-8?q?#=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E7=BE=A4=E8=81=8A=E6=95=B0=E9=87=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B3=E5=9D=87=E6=AF=8F=E5=A4=A9=E6=B2=9F=E9=80=9A=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E8=B0=83=E6=95=B4=E4=BB=8E=E5=BB=BA=E6=A8=A1=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=96=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seconddev/jcldoor/cmd/UserInfoCmd.java    | 61 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java
index a8c01ed..b13f095 100644
--- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java
+++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java
@@ -3,6 +3,7 @@ package com.weaver.seconddev.jcldoor.cmd;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.weaver.common.base.entity.result.WeaResult;
+import com.weaver.common.hrm.util.Util;
 import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
 import com.weaver.framework.rpc.annotation.RpcReference;
 import com.weaver.seconddev.jcldoor.util.CommonUtils;
@@ -138,9 +139,9 @@ public class UserInfoCmd {
                 wfdeal = getWfDealNum();
 
                 //参与群聊数量
-                cyqlsl = getCyqlNum(hiredate);
+                cyqlsl = getCyqlNumNew(userid);
 
-                mtgtrs = getPjMtgtcs(hiredate);
+                mtgtrs = getPjMtgtcsNew(userid);
             }
         } catch (Exception e) {
             log.error("getUserInfo--Exception:" + e.getMessage());
@@ -349,6 +350,34 @@ public class UserInfoCmd {
         return type;
     }
 
+    /**
+     * 参与群聊数
+     * @param employeeId
+     * @return
+     */
+    private String getCyqlNumNew(String employeeId) {
+        int count = 0;
+
+        String sql = "select amount from uf_nj_cyqltjb where ry = ? and delete_type=0 and tenant_key = ?";
+
+        List<String> strlist = new ArrayList<>(100);
+        strlist.add(employeeId);
+        strlist.add(tenant_key);
+        String groupId = "weaver-ebuilder-form-service";
+        String sourceType = "LOGIC";
+        List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
+        Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
+
+        List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
+        if(recordList.size()>0){
+            String amount = String.valueOf(recordList.get(0).get("amount"));
+            if(StringUtils.isNotBlank(amount)){
+                count = Util.getIntValue(amount);
+            }
+        }
+        return count+"";
+    }
+
     private String getCyqlNum(String hiredate) {
         int count = 0;
         try {
@@ -411,6 +440,34 @@ public class UserInfoCmd {
 
     }
 
+    /**
+     * 平均每天沟通人数
+     * @param employeeId
+     * @return
+     */
+    private String getPjMtgtcsNew(String employeeId) {
+        int count = 0;
+
+        String sql = "select amount from uf_nj_pjmrdlhhsl where ry = ? and delete_type=0 and tenant_key = ?";
+
+        List<String> strlist = new ArrayList<>(100);
+        strlist.add(employeeId);
+        strlist.add(tenant_key);
+        String groupId = "weaver-ebuilder-form-service";
+        String sourceType = "LOGIC";
+        List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
+        Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
+
+        List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
+        if(recordList.size()>0){
+            String amount = String.valueOf(recordList.get(0).get("amount"));
+            if(StringUtils.isNotBlank(amount)){
+                count = Util.getIntValue(amount);
+            }
+        }
+        return count+"";
+    }
+
     private String getPjMtgtcs(String hiredate){
         int count = 0;
         try {