From 69bec612ddefdf77073675e30ac86421e843c66e Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Mon, 29 Apr 2024 19:20:47 +0800 Subject: [PATCH] =?UTF-8?q?#E10-36#=20=E4=BC=98=E5=8C=96=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=8A=E5=B9=B3=E5=9D=87=E6=AF=8F=E5=A4=A9?= =?UTF-8?q?=E6=B2=9F=E9=80=9A=E6=95=B0=E9=87=8F=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seconddev/jcldoor/cmd/UserInfoCmd.java | 74 +++++++------------ .../controller/HrmSelfHelpController.java | 43 ++++++----- 2 files changed, 50 insertions(+), 67 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 f892cb8..d984e0b 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java @@ -1,7 +1,8 @@ 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; @@ -64,14 +65,15 @@ public class UserInfoCmd { * @return */ public Map getUserInfo(SimpleEmployee simpleEmployee) { - Map map = new HashMap<>(100); + String groupId = "weaver-ebuilder-form-service"; + String sourceType = "LOGIC"; + + Map map = new HashMap<>(100); Long employeeId = simpleEmployee.getEmployeeId(); - log.error("getUserInfo-employeeId:"+employeeId); - String userimageurl = "/profile/" + employeeId + "/personal"; String username = String.valueOf(simpleEmployee.getName()); - log.error("username:"+username); + String userimageurl = "/profile/" + employeeId + "/personal"; String department = ""; String position = ""; String days = ""; @@ -81,21 +83,11 @@ public class UserInfoCmd { String cyqlsl = "0"; String mtgtrs = "0"; - String groupId = "weaver-ebuilder-form-service"; - String sourceType = "LOGIC"; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); try { - - String department2 = simpleEmployee.getDepartment().getName(); - log.error("department2:"+department2); - String position2 = simpleEmployee.getPosition().getName(); - log.error("position2:"+position2); - String hiredate2 = sdf.format(simpleEmployee.getHiredate()); - log.error("hiredate2:"+hiredate2); Map recordMap = new HashMap(); + if (StringUtils.isNotBlank(employeeId+"")) { - String dataSql ="select " + + String dataSql =" select " + " a.id, " + " a.username, " + " a.hiredate, " + @@ -112,6 +104,7 @@ public class UserInfoCmd { " and a.type = 'inside'"; log.error("getuserIfo--dataSql:" + dataSql); + List strlist = new ArrayList<>(100); strlist.add(employeeId+""); strlist.add(tenant_key); @@ -121,48 +114,35 @@ public class UserInfoCmd { if (CollectionUtils.isNotEmpty(recordList)) { recordMap = recordList.get(0); } - username = CommonUtils.null2String(recordMap.get("username")); - log.error("username:"+username); + username = CommonUtils.null2String(recordMap.get("username")); department = CommonUtils.null2String(recordMap.get("department")); - log.error("department:"+department); - position = CommonUtils.null2String(recordMap.get("position")); - log.error("position:"+position); - String hiredate = CommonUtils.null2String(recordMap.get("hiredate")); - log.error("hiredate:"+hiredate); - if (StringUtils.isNotBlank(hiredate)) { try { days = calculateMinute2(hiredate); } catch (Exception e) { log.error("calculateMinute2-e:" + e); } + if (StringUtils.isBlank(days)) { days = String.valueOf(calculateMinute(hiredate)); } } - log.error("days:"+days); //文档创建 doccreate = getDocCreateNum(employeeId); - log.error("doccreate:"+doccreate); //流程创建 wfcreate = getWfCreateNum(simpleEmployee); - log.error("wfcreate:"+wfcreate); //流程处理 wfdeal = getWfDealNum(simpleEmployee); - log.error("wfdeal:"+wfdeal); //参与群聊数量 - cyqlsl = getCyqlNumNew(employeeId+""); - log.error("cyqlsl:"+cyqlsl); + cyqlsl = getCyqlNumNew(employeeId); - mtgtrs = getPjMtgtcsNew(employeeId+""); - log.error("mtgtrs:"+mtgtrs); + mtgtrs = getPjMtgtcsNew(employeeId); } } catch (Exception e) { - e.printStackTrace(); log.error("getUserInfo--Exception:" + e.getMessage()); } @@ -177,6 +157,7 @@ public class UserInfoCmd { map.put("wfdeal", wfdeal); map.put("cyqlsl", cyqlsl); map.put("mtgtrs", mtgtrs); + return map; } @@ -186,7 +167,7 @@ public class UserInfoCmd { * @param employeeId * @return */ - public String getDocCreateNum(long employeeId) { + public String getDocCreateNum(Long employeeId) { String num = "0"; try { int doccreatecount = docClientService.countByCreator(employeeId); @@ -264,7 +245,7 @@ public class UserInfoCmd { } - public String calculateMinute2(String sdate) { + public String calculateMinute2(String sdate) throws ParseException { String rzsj = ""; try { if (sdate.length() >= 10) { @@ -369,34 +350,30 @@ public class UserInfoCmd { * @param employeeId * @return */ - public String getCyqlNumNew(String employeeId) { + public String getCyqlNumNew(Long employeeId) { String amount = "0"; - String groupId = "weaver-ebuilder-form-service"; - String sourceType = "LOGIC"; - try{ String sql = "select amount from uf_nj_cyqltjb where ry = ? and delete_type=0 and tenant_key = ?"; List strlist = new ArrayList<>(100); - strlist.add(employeeId); + strlist.add(employeeId+""); strlist.add(tenant_key); - + String groupId = "weaver-ebuilder-form-service"; + String sourceType = "LOGIC"; List sqlparam = databaseUtils.getSqlParamEntity(strlist); Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); List> recordList = databaseUtils.getDataSourceList(result); if(recordList.size()>0){ amount = String.valueOf(recordList.get(0).get("amount")); } - if(StringUtils.isBlank(amount)){ - amount = "0"; - } }catch (Exception e){ e.printStackTrace(); log.error("getCyqlNumNew-e:" + e); } + return amount; } -// private String getCyqlNum(String hiredate) { +// public String getCyqlNum(String hiredate) { // int count = 0; // try { // @@ -463,12 +440,12 @@ public class UserInfoCmd { * @param employeeId * @return */ - public String getPjMtgtcsNew(String employeeId) { + public String getPjMtgtcsNew(Long employeeId) { String amount = "0.0"; try{ String sql = "select amount from uf_nj_pjmrdlhhsl where ry = ? and delete_type=0 and tenant_key = ?"; List strlist = new ArrayList<>(100); - strlist.add(employeeId); + strlist.add(employeeId+""); strlist.add(tenant_key); String groupId = "weaver-ebuilder-form-service"; String sourceType = "LOGIC"; @@ -486,7 +463,6 @@ public class UserInfoCmd { return amount; } - // private String getPjMtgtcs(String hiredate){ // int count = 0; // try { diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java index 4cca3b7..7fab21f 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -1,7 +1,5 @@ package com.weaver.seconddev.jcldoor.controller; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.weaver.common.authority.annotation.WeaPermission; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; @@ -16,7 +14,6 @@ import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.framework.rpc.context.impl.TenantRpcContext; import com.weaver.mc.api.async.AsyncSystemMessageRest; import com.weaver.mc.api.rest.SystemMessageRest; -import com.weaver.seconddev.jcldoor.cmd.UserInfoCmd; import com.weaver.seconddev.jcldoor.util.ChatDayUtils; import com.weaver.seconddev.jcldoor.util.ChatGroupUtils; import com.weaver.seconddev.jcldoor.util.DatabaseUtils; @@ -1921,25 +1918,35 @@ public class HrmSelfHelpController { String mtgtrs = "0"; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date hiredate = simpleEmployee.getHiredate(); + log.error("hiredate:"+hiredate.toString()); + Long startDate = hiredate.getTime(); + log.error("startDate:"+startDate); + Date hire_date = new Date(startDate); + String entryDate = sdf.format(hire_date); + log.error("entryDate:"+entryDate); + if (StringUtils.isNotBlank(entryDate)) { + try { + days = userInfoCmd.calculateMinute2(entryDate); + } catch (Exception e) { + log.error("calculateMinute2-e:" + e); + } + if (StringUtils.isBlank(days)) { + days = String.valueOf(userInfoCmd.calculateMinute(entryDate)); + } + } + }catch (Exception e){ + e.printStackTrace(); + log.error("hiredate-e:"+e); + } + try { department = simpleEmployee.getDepartment().getName(); log.error("department:"+department); position = simpleEmployee.getPosition().getName(); log.error("position:"+position); - String hiredate = sdf.format(simpleEmployee.getHiredate()); if (StringUtils.isNotBlank(employeeId+"")) { - log.error("hiredate:"+hiredate); - if (StringUtils.isNotBlank(hiredate)) { - try { - days = userInfoCmd.calculateMinute2(hiredate); - } catch (Exception e) { - log.error("calculateMinute2-e:" + e); - } - if (StringUtils.isBlank(days)) { - days = String.valueOf(userInfoCmd.calculateMinute(hiredate)); - } - } - log.error("days:"+days); //文档创建 doccreate = userInfoCmd.getDocCreateNum(employeeId); log.error("doccreate:"+doccreate); @@ -1951,10 +1958,10 @@ public class HrmSelfHelpController { log.error("wfdeal:"+wfdeal); //参与群聊数量 - cyqlsl = userInfoCmd.getCyqlNumNew(employeeId+""); + cyqlsl = userInfoCmd.getCyqlNumNew(employeeId); log.error("cyqlsl:"+cyqlsl); - mtgtrs = userInfoCmd.getPjMtgtcsNew(employeeId+""); + mtgtrs = userInfoCmd.getPjMtgtcsNew(employeeId); log.error("mtgtrs:"+mtgtrs); } } catch (Exception e) {