From 1a3ca73a5da63287a5b9326da1b58d08cdba6172 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Mon, 29 Apr 2024 20:12:08 +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 | 75 +++++++++---------- .../controller/HrmSelfHelpController.java | 13 ++++ 2 files changed, 49 insertions(+), 39 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 d984e0b..4726676 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java @@ -71,11 +71,12 @@ public class UserInfoCmd { Map map = new HashMap<>(100); Long employeeId = simpleEmployee.getEmployeeId(); - String username = String.valueOf(simpleEmployee.getName()); + String username = simpleEmployee.getName(); String userimageurl = "/profile/" + employeeId + "/personal"; - String department = ""; - String position = ""; + String department = simpleEmployee.getDepartment().getName(); + String position = simpleEmployee.getPosition().getName(); + String days = ""; String doccreate = "0"; String wfcreate = "0"; @@ -83,53 +84,48 @@ public class UserInfoCmd { String cyqlsl = "0"; String mtgtrs = "0"; - try { - Map recordMap = new HashMap(); - + try{ if (StringUtils.isNotBlank(employeeId+"")) { - String dataSql =" select " + - " a.id, " + - " a.username, " + - " a.hiredate, " + - " b.name as department, " + - " c.name as position " + - " from " + - " eteams.employee a " + - " left join eteams.department b on a.department = b.id " + - " left join eteams.position c on c.id = a.position " + - " where " + - " a.id = ? " + - " and a.tenant_key = ? " + - " and a.status = 'normal' " + - " and a.type = 'inside'"; - log.error("getuserIfo--dataSql:" + dataSql); + String dataSql =" select a.hiredate " + + " from eteams.employee a " + + " where a.id = ? " + + " and a.tenant_key = ? " + + " and a.status = 'normal' " + + " and a.type = 'inside'"; + log.error("getuserIfo--dataSql:" + dataSql); List strlist = new ArrayList<>(100); - strlist.add(employeeId+""); + strlist.add(employeeId + ""); strlist.add(tenant_key); List sqlparam = databaseUtils.getSqlParamEntity(strlist); Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam); List> recordList = databaseUtils.getDataSourceList(result); if (CollectionUtils.isNotEmpty(recordList)) { - recordMap = recordList.get(0); + Map recordMap = recordList.get(0); + + String hiredate = CommonUtils.null2String(recordMap.get("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)); + } + } } + } + }catch (Exception e){ + e.printStackTrace(); + log.error("getUserInfo--hiredate:" + e); + } - username = CommonUtils.null2String(recordMap.get("username")); - department = CommonUtils.null2String(recordMap.get("department")); - position = CommonUtils.null2String(recordMap.get("position")); - String hiredate = CommonUtils.null2String(recordMap.get("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)); - } - } + try { + if (StringUtils.isNotBlank(employeeId+"")) { //文档创建 doccreate = getDocCreateNum(employeeId); //流程创建 @@ -143,7 +139,8 @@ public class UserInfoCmd { mtgtrs = getPjMtgtcsNew(employeeId); } } catch (Exception e) { - log.error("getUserInfo--Exception:" + e.getMessage()); + e.printStackTrace(); + log.error("getUserInfo--Exception:" + e); } map.put("userid", employeeId+""); 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 7fab21f..c53330b 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -1918,6 +1918,18 @@ 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); + }catch (Exception e){ + e.printStackTrace(); + log.error("hiredate-e:"+e); + } + + try { Date hiredate = simpleEmployee.getHiredate(); log.error("hiredate:"+hiredate.toString()); @@ -1941,6 +1953,7 @@ public class HrmSelfHelpController { log.error("hiredate-e:"+e); } + try { department = simpleEmployee.getDepartment().getName(); log.error("department:"+department);