#E10-16# 绩效接口优化、人员信息入职时间展示年日

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

@@ -129,7 +129,6 @@ public class PortalPerformanceInfoCmd {
             try{
                 String startDay = "" ;
                 String endDay = "" ;
-                String period_month = "" ;
                 String score = "0.0";
                 String kpi_scheme = "";
                 String real_period = "";
@@ -139,7 +138,7 @@ public class PortalPerformanceInfoCmd {
                 Map<String,String> scoreMap = getLastScore(nowDate);
                 if(!scoreMap.isEmpty()){
                     score = scoreMap.get("score");
-                    period_month = scoreMap.get("period_month");
+                    real_period = scoreMap.get("real_period");
                     startDay = scoreMap.get("startDay");
                     endDay = scoreMap.get("endDay");
                 }
@@ -168,12 +167,17 @@ public class PortalPerformanceInfoCmd {
                         }
                     }
                 }
+
                 log.error("kpi_scheme:"+kpi_scheme);
+
                 if(StringUtils.isNotBlank(kpi_scheme)){
                     dataMap.put("score", score);
-                    dataMap.put("yearmonth", period_month);
-                    dataMap.put("real_period", period_month);
+                    dataMap.put("yearmonth", real_period);
+                    dataMap.put("real_period", real_period);
                     dataMap.put("kpi_scheme", kpi_scheme);
+
+                    dataMap.put("startDay", startDay);
+                    dataMap.put("endDay", endDay);
                 }else{
                     String sql =" select left(k.real_period,10) as real_period,left(k.real_period,7) as period_month,k.kpi_scheme,k.score\n" +
                                 " from (select real_period,kpi_scheme,score\n" +
@@ -201,16 +205,15 @@ public class PortalPerformanceInfoCmd {
                             score = String.valueOf(recordMap.get("score"));
                             kpi_scheme = String.valueOf(recordMap.get("kpi_scheme"));
                             real_period = String.valueOf(recordMap.get("real_period"));
-                            period_month = String.valueOf(recordMap.get("period_month"));
-
-                            dataMap.put("score", score);
-                            dataMap.put("yearmonth", period_month);
-                            dataMap.put("kpi_scheme", kpi_scheme);
-                            dataMap.put("real_period", real_period);
                         }
                     }
+                    dataMap.put("score", score);
+                    dataMap.put("yearmonth", real_period);
+                    dataMap.put("kpi_scheme", kpi_scheme);
+                    dataMap.put("real_period", real_period);
+                    dataMap.put("startDay", startDay);
+                    dataMap.put("endDay", endDay);
                 }
-
             }catch (Exception e){
                 e.printStackTrace();
                 log.error("getLastScore-e:"+e);

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

@@ -113,8 +113,16 @@ public class UserInfoCmd {
                 department = CommonUtils.null2String(recordMap.get("department"));
                 position = CommonUtils.null2String(recordMap.get("position"));
                 String hiredate = CommonUtils.null2String(recordMap.get("hiredate"));
-                if (!"".equals(hiredate)) {
-                    days = calculateMinute2(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));
+                    }
                 }
                 //文档创建
                 doccreate = getDocCreateNum(userid);
@@ -235,16 +243,22 @@ public class UserInfoCmd {
 
 
     public static String calculateMinute2(String sdate) throws ParseException {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String nowDate = sdf.format(new Date());
-        Period period = Period.between(LocalDate.parse(sdate), LocalDate.parse(nowDate));
-        int p_year = period.getYears() ;
-
-        LocalDate date = LocalDate.parse(sdate);
-        LocalDate p_day = date.plusYears(p_year);
-        long days = ChronoUnit.DAYS.between(p_day, LocalDate.parse(nowDate));
-        String rzsj = p_year+"年"+days ;
+        String rzsj = "";
+        try{
+            if(sdate.length() >=10){
+                sdate = sdate.substring(0,10);
+            }
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            String nowDate = sdf.format(new Date());
+            Period period = Period.between(LocalDate.parse(sdate), LocalDate.parse(nowDate));
+            int p_year = period.getYears() ;
+            LocalDate date = LocalDate.parse(sdate);
+            LocalDate p_day = date.plusYears(p_year);
+            long days = ChronoUnit.DAYS.between(p_day, LocalDate.parse(nowDate));
+            rzsj = p_year+"年"+days ;
+        }catch (Exception e){
+            log.error("calculateMinute2-e:"+e);
+        }
         return rzsj;
     }