#E10-35# 优化自助服务数据获取接口,返回值增加taby数据

src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java

@@ -122,6 +122,7 @@ public class SelfServiceInfoCmd {
                 Map<String,Object> recordMap = new HashMap<String,Object>();
                 String taby = String.valueOf(tbyList.get(i));
                 log.error("getCustemSelfServiceType-taby:"+taby);
+                recordMap.put("taby",taby);
                 String tabyName = optionMap.get(taby);
                 List<Map<String,Object>> customList = getCustomeServiceDataByType(groupId,sourceType,taby,employeeId);
                 log.error("getCustemSelfServiceType-tabyName:"+tabyName);

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<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){
-            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<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){
+                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<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);
+        String amount = "0.0";
+        try{
+            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){
-            count = Util.getDouleValue(recordList.get(0).get("amount"));
+            List<Map<String,Object>> 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){

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<String,Object> dMap = chatDayUtils.getChatDay(tenant_key,tablename,pagesize,pagenum);
+            Map<String,Object> dMap = chatDayUtils.getChatDay(tenant_key,tablename,pagesize,pagenum,startDate);
             dataMap.putAll(dMap);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java

@@ -35,7 +35,7 @@ public class ChatDayUtils {
     @Autowired
     private JucailinPortalUtils jucailinPortalUtils;
 
-    public Map<String,Object> getChatDay(String tenant_key, String tablename,String pageSize,String pageNum){
+    public Map<String,Object> getChatDay(String tenant_key, String tablename,String pageSize,String pageNum,String startDate){
         Map<String,Object> dataMap = new HashMap<String,Object>();
         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();
             //设置当前时间