Ver Fonte

请假定时任务bug修改

fllmoyu há 4 anos atrás
pai
commit
9db279f448

+ 8 - 4
web/src/main/java/com/jpsoft/shinestar/mq/listener/RequestForLeaveListener.java

@@ -40,7 +40,7 @@ public class RequestForLeaveListener {
             PersonPopedom personPopedom = personPopedomService.get(requestForLeaveInfo.getPersonPopedomId());
             PersonInfo personInfo = personInfoService.get(personPopedom.getPersonId());
             if (requestForLeaveInfo != null) {
-                String startTimeStr = DateUtil.format(requestForLeaveInfo.getStartTime(), "yyyy-MM-dd");
+                /*String startTimeStr = DateUtil.format(requestForLeaveInfo.getStartTime(), "yyyy-MM-dd");
                 String endTimeStr = DateUtil.format(requestForLeaveInfo.getEndTime(), "yyyy-MM-dd");
                 if ("0".equals(requestForLeaveInfo.getStartTimeQuantum())) {
                     startTimeStr = startTimeStr + " " + "06:00:00";
@@ -53,10 +53,14 @@ public class RequestForLeaveListener {
                 }
                 if ("1".equals(requestForLeaveInfo.getEndTimeQuantum())) {
                     endTimeStr = endTimeStr + " " + "18:00:00";
-                }
+                }*/
+
+               /* Date start = DateUtil.parse(startTimeStr);
+                Date end = DateUtil.parse(endTimeStr);*/
+
+               Date start = requestForLeaveInfo.getStartTime();
 
-                Date start = DateUtil.parse(startTimeStr);
-                Date end = DateUtil.parse(endTimeStr);
+               Date end = requestForLeaveInfo.getEndTime();
 
                 if (start.compareTo(new Date()) <= 0 && end.compareTo(new Date()) > 0) {
                     personInfo.setWorkStatus("4");