update...

潘钊
1 parent f1529067
Showing 4 changed files with 52 additions and 17 deletions
src/main/java/com/bsth/server_rs/schedule/dto/AttendancePlanDay.java
src/main/java/com/bsth/server_rs/schedule/dto/AttendancePlanMonth.java
src/main/java/com/bsth/server_rs/schedule/plan/SchedulePlanService.java
src/main/java/com/bsth/util/ConvertUtil.java
@@ -9,6 +9,10 @@ public class AttendancePlanDay {
     private String jName;
+    private String sGh;
+
+    private String sName;
+
     private String scheduleDate;
     public String getjGh() {
@@ -34,4 +38,20 @@ public class AttendancePlanDay {
     public void setScheduleDate(String scheduleDate) {
         this.scheduleDate = scheduleDate;
     }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
 }
@@ -2,6 +2,7 @@ package com.bsth.server_rs.schedule.dto;
 import com.bsth.util.ConvertUtil;
 import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,16 +24,27 @@ public class AttendancePlanMonth {
         if(list == null || list.size() == 0)
             return rs;
-        //分组
         Class clazz = AttendancePlanDay.class;
         try {
-            ArrayListMultimap<String, AttendancePlanDay> listMultimap = new ConvertUtil<AttendancePlanDay>()
+            //驾驶员分组
+            ArrayListMultimap<String, AttendancePlanDay> jsyMultimap = new ConvertUtil<AttendancePlanDay>()
                     .groupMultiList(list, "/", clazz.getDeclaredField("jGh"), clazz.getDeclaredField("jName"));
-            Set<String> ks = listMultimap.keySet();
+            Set<String> ks = jsyMultimap.keySet();
             for(String k : ks){
-                rs.add(new AttendancePlanMonth(month, k, listMultimap.get(k)));
+                rs.add(new AttendancePlanMonth(month, k, jsyMultimap.get(k)));
+            }
+
+            //售票员分组
+            ArrayListMultimap<String, AttendancePlanDay> spyMultimap = new ConvertUtil<AttendancePlanDay>()
+                    .groupMultiList(list, "/", clazz.getDeclaredField("sGh"), clazz.getDeclaredField("sName"));
+
+            ks = spyMultimap.keySet();
+
+            for(String k : ks){
+                if(StringUtils.isNotEmpty(k))
+                    rs.add(new AttendancePlanMonth(month, k, spyMultimap.get(k)));
             }
         } catch (NoSuchFieldException e) {
             logger.error("", e);
@@ -44,7 +56,7 @@ public class AttendancePlanMonth {
     AttendancePlanMonth(String month, String jsy, List<AttendancePlanDay> list){
         this.month = month;
-        this.jsy = jsy;
+        this.personnel = jsy;
         this.ycqts = list.size();
         StringBuilder sb = new StringBuilder();
@@ -62,8 +74,8 @@ public class AttendancePlanMonth {
     /** 月份 yyyy-MM */
     private String month;
-    /** 驾驶员 */
-    private String jsy;
+    /** 人员 */
+    private String personnel;
     /** 出勤天数 */
     private int ycqts;
@@ -79,14 +91,6 @@ public class AttendancePlanMonth {
         this.month = month;
     }
-    public String getJsy() {
-        return jsy;
-    }
-
-    public void setJsy(String jsy) {
-        this.jsy = jsy;
-    }
-
     public int getYcqts() {
         return ycqts;
     }
@@ -102,4 +106,12 @@ public class AttendancePlanMonth {
     public void setDetails(String details) {
         this.details = details;
     }
+
+    public String getPersonnel() {
+        return personnel;
+    }
+
+    public void setPersonnel(String personnel) {
+        this.personnel = personnel;
+    }
 }
@@ -62,7 +62,7 @@ public class SchedulePlanService {
             return null;
         }
-        List<AttendancePlanDay> list = jdbcTemplate.query("SELECT j_gh,j_name,DATE_FORMAT(schedule_date,'%Y-%m-%d') as schedule_date FROM bsth_c_s_sp_info WHERE gs_bm='"+company+"' and schedule_date LIKE '"+month+"-%' GROUP BY j_gh,j_name,DATE_FORMAT(schedule_date,'%Y-%m-%d')", BeanPropertyRowMapper.newInstance(AttendancePlanDay.class));
+        List<AttendancePlanDay> list = jdbcTemplate.query("SELECT j_gh,j_name,s_gh,s_name,DATE_FORMAT(schedule_date,'%Y-%m-%d') as schedule_date FROM bsth_c_s_sp_info WHERE gs_bm='"+company+"' and schedule_date LIKE '"+month+"-%' GROUP BY j_gh,j_name,DATE_FORMAT(schedule_date,'%Y-%m-%d')", BeanPropertyRowMapper.newInstance(AttendancePlanDay.class));
         return AttendancePlanMonth.getMultiInstance(month, list);
     }
 }
@@ -37,13 +37,16 @@ public class ConvertUtil&lt;T&gt; {
                 key = "";
                 for (Field f : fields) {
                     f.setAccessible(true);
+                    if(null == f.get(t))
+                        continue;
                     //日期类型格式化为 YYYY-MM-DD
                     if (f.getType().equals(Date.class))
                         key += (separator + fmtyyyyMMdd.print(((Date) f.get(t)).getTime()));
                     else
                         key += (separator + f.get(t).toString());
                 }
-                key = key.substring(1);
+                if(key.length() > 1)
+                    key = key.substring(1);
                 multimap.put(key, t);
             }