缺人烂班做缺勤处理

娄高锋
1 parent 256d2984
Showing 1 changed file with 6 additions and 2 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -624,7 +624,11 @@ public class BigscreenService {
 			            			m.put("driverName", s.getjName());
 			            			m.put("date", s.getRealExecDate());
 			            			m.put("time", c.getStartDate());
-			            			m.put("explain", c.getRemarks());
+			            			if(c.getRemarks() != null && c.getRemarks().trim().length() > 0){
+			            				m.put("explain", c.getRemarks());
+			            			} else {
+			            				m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
+			            			}
 			            			lackList.add(m);
 			            		}
 				    		}
@@ -640,7 +644,7 @@ public class BigscreenService {
             			m.put("driverName", s.getjName());
             			m.put("date", s.getRealExecDate());
             			m.put("time", s.getFcsj());
-            			m.put("explain", s.getRemarks());
+            			m.put("explain", s.getRemarks()!=null?s.getRemarks():"");
             			lackList.add(m);
 	                }
 	            }