瀏覽代碼

排班天数未设置bug修复。

zhengqiang 4 年之前
父節點
當前提交
1fdc4999f7

+ 3 - 1
common/src/main/java/com/jpsoft/shinestar/modules/base/service/impl/WorkPersonSchedulingServiceImpl.java

@@ -114,6 +114,7 @@ public class WorkPersonSchedulingServiceImpl implements WorkPersonSchedulingServ
 	@Override
 	public BigDecimal findAttendanceDaysByPersonIdSDateAndEDate(Long personId, Date startDate, Date endDate, boolean isQueryRest){
 		BigDecimal attendancedays = BigDecimal.ZERO;
+
 		List<WorkPersonScheduling>  wpsList = workPersonSchedulingDAO.findByPersonIdSDateAndEDate(personId,startDate,endDate,isQueryRest);
 		for(WorkPersonScheduling wps : wpsList){
 			String shiftIds = wps.getShiftIds();
@@ -121,7 +122,8 @@ public class WorkPersonSchedulingServiceImpl implements WorkPersonSchedulingServ
 				List<String> shiftList = Arrays.asList(shiftIds.split(","));
 				for(String shiftId : shiftList){
 					WorkShiftInfo wsi = workShiftInfoDAO.get(shiftId);
-					if(wsi != null){
+
+					if(wsi != null && wsi.getDays()!=null){
 						attendancedays = attendancedays.add(wsi.getDays());
 					}
 				}