Skip to content

8
8timerapiv200
Commit 68bf4cd6 by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!498
parents b79cc16f 2a8197c4
Showing with 1 additions and 1 deletions
src/main/java/cn/timer/api/controller/kqgl/service/KqglServiceImpl.java
......@@ -763,7 +763,7 @@ public class KqglServiceImpl implements KqglService {
double gzsc = 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 jieshuxiuxi = Long.valueOf(ClockInTool.dateToStamp(cardrepltime + " " +shif.getEndTime()+":00"));
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