From af0330244595ed8e7aa7cfd031d48906faf23897 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Sun, 28 Apr 2024 15:01:12 +0800 Subject: [PATCH] =?UTF-8?q?#E10-35#=20=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A9?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3,=E8=BF=94=E5=9B=9E=E5=80=BC=E5=A2=9E=E5=8A=A0taby?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jcldoor/cmd/SelfServiceInfoCmd.java | 1 + .../seconddev/jcldoor/cmd/UserInfoCmd.java | 68 ++++++++++--------- .../controller/HrmSelfHelpController.java | 3 +- .../seconddev/jcldoor/util/ChatDayUtils.java | 6 +- 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java index 090fb60..23f6a17 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java @@ -122,6 +122,7 @@ public class SelfServiceInfoCmd { Map recordMap = new HashMap(); String taby = String.valueOf(tbyList.get(i)); log.error("getCustemSelfServiceType-taby:"+taby); + recordMap.put("taby",taby); String tabyName = optionMap.get(taby); List> customList = getCustomeServiceDataByType(groupId,sourceType,taby,employeeId); log.error("getCustemSelfServiceType-tabyName:"+tabyName); 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 f2cef87..33333b4 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java @@ -356,23 +356,26 @@ public class UserInfoCmd { * @return */ private String getCyqlNumNew(String employeeId) { - double count = 0; - - 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(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){ - count = Util.getDouleValue(recordList.get(0).get("amount")); + String amount = "0"; + 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(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")); + } + }catch (Exception e){ + e.printStackTrace(); + log.error("getCyqlNumNew-e:" + e); } - return count+""; + + return amount; } private String getCyqlNum(String hiredate) { @@ -443,23 +446,26 @@ public class UserInfoCmd { * @return */ private String getPjMtgtcsNew(String employeeId) { - double count = 0; - - 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(tenant_key); - String groupId = "weaver-ebuilder-form-service"; - String sourceType = "LOGIC"; - List sqlparam = databaseUtils.getSqlParamEntity(strlist); - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + 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(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){ - count = Util.getDouleValue(recordList.get(0).get("amount")); + List> recordList = databaseUtils.getDataSourceList(result); + if(recordList.size()>0){ + amount = String.valueOf(recordList.get(0).get("amount")); + } + }catch (Exception e){ + e.printStackTrace(); + log.error("getPjMtgtcsNew-e:"+e); } - return count+""; + return amount; } private String getPjMtgtcs(String hiredate){ 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 3f709a1..2958e01 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -1592,6 +1592,7 @@ public class HrmSelfHelpController { String pagesize = request.getParameter("pagesize"); String pagenum = request.getParameter("pagenum"); + String startDate = request.getParameter("startDate"); dataMap.put("tenant_key",tenant_key); dataMap.put("pagesize",pagesize); @@ -1599,7 +1600,7 @@ public class HrmSelfHelpController { String tablename = "uf_nj_pjmrdlhhsl" ; dataMap.put("tablename",tablename); - Map dMap = chatDayUtils.getChatDay(tenant_key,tablename,pagesize,pagenum); + Map dMap = chatDayUtils.getChatDay(tenant_key,tablename,pagesize,pagenum,startDate); dataMap.putAll(dMap); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java index 442ca46..8c345f2 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java @@ -35,7 +35,7 @@ public class ChatDayUtils { @Autowired private JucailinPortalUtils jucailinPortalUtils; - public Map getChatDay(String tenant_key, String tablename,String pageSize,String pageNum){ + public Map getChatDay(String tenant_key, String tablename,String pageSize,String pageNum,String startDate){ Map dataMap = new HashMap(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); @@ -59,7 +59,9 @@ public class ChatDayUtils { SimpleEmployee employee = UserContext.getCurrentUser(); - String startDate = "2001-01-01"; + if(StringUtils.isBlank(startDate)){ + startDate = "2001-01-01"; + } Calendar cal = Calendar.getInstance(); //设置当前时间