Commit d54a1719 by ilal Committed by chenzg

提交

parent e7a06659
...@@ -763,7 +763,7 @@ public class KqglServiceImpl implements KqglService { ...@@ -763,7 +763,7 @@ public class KqglServiceImpl implements KqglService {
double gzsc = 0; double gzsc = 0;
long rest_time = 0; long rest_time = 0;
if(shif.getStartTime() != null && shif.getEndTime() != null) { if(shif.getStartTime() != null && !("").equals(shif.getStartTime()) && shif.getEndTime() != null && !("").equals(shif.getEndTime())) {
long kaishixiuxi = Long.valueOf(ClockInTool.dateToStamp(cardrepltime + " " +shif.getStartTime()+":00")); long kaishixiuxi = Long.valueOf(ClockInTool.dateToStamp(cardrepltime + " " +shif.getStartTime()+":00"));
long jieshuxiuxi = Long.valueOf(ClockInTool.dateToStamp(cardrepltime + " " +shif.getEndTime()+":00")); long jieshuxiuxi = Long.valueOf(ClockInTool.dateToStamp(cardrepltime + " " +shif.getEndTime()+":00"));
rest_time = (jieshuxiuxi - kaishixiuxi)/1000/60;//休息时间 rest_time = (jieshuxiuxi - kaishixiuxi)/1000/60;//休息时间
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment