|
|
|
@ -162,8 +162,8 @@ public class LeaveDetailHandler {
|
|
|
|
|
|
|
|
|
|
@PostMapping("/save")
|
|
|
|
|
public String save(@RequestBody LeaveDetail leaveDetail) {
|
|
|
|
|
long backTimeMS = dateToMs(leaveDetail.getBack_time(), "yyyy-mm-dd hh:mm:ss");
|
|
|
|
|
long leaveTimeMS = dateToMs(leaveDetail.getLeave_time(), "yyyy-mm-dd hh:mm:ss");
|
|
|
|
|
long backTimeMS = dateToMs(leaveDetail.getBack_time(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
long leaveTimeMS = dateToMs(leaveDetail.getLeave_time(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
if (leaveTimeMS >= backTimeMS) {
|
|
|
|
|
return "time failed";
|
|
|
|
|
}
|
|
|
|
@ -221,8 +221,8 @@ public class LeaveDetailHandler {
|
|
|
|
|
for (int i = 0; i < LDs.size(); i++) {
|
|
|
|
|
LD = LDs.get(i);
|
|
|
|
|
if (LD.getUserid().equals(UDid)) {
|
|
|
|
|
long backTimeMS = dateToMs(LD.getBack_time(), "yyyy-mm-dd hh:mm:ss");
|
|
|
|
|
long leaveTimeMS = dateToMs(LD.getLeave_time(), "yyyy-mm-dd hh:mm:ss");
|
|
|
|
|
long backTimeMS = dateToMs(LD.getBack_time(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
long leaveTimeMS = dateToMs(LD.getLeave_time(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
long nowTimeMS = System.currentTimeMillis();
|
|
|
|
|
if (nowTimeMS > leaveTimeMS && nowTimeMS < backTimeMS && LD.getType().equals("已通过")) {
|
|
|
|
|
num++;
|
|
|
|
@ -253,8 +253,8 @@ public class LeaveDetailHandler {
|
|
|
|
|
for (int i = 0; i < LDs.size(); i++) {
|
|
|
|
|
LD = LDs.get(i);
|
|
|
|
|
if (LD.getUserid().equals(UDid)) {
|
|
|
|
|
long backTimeMS = dateToMs(LD.getBack_time(), "yyyy-mm-dd hh:mm:ss");
|
|
|
|
|
long leaveTimeMS = dateToMs(LD.getLeave_time(), "yyyy-mm-dd hh:mm:ss");
|
|
|
|
|
long backTimeMS = dateToMs(LD.getBack_time(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
long leaveTimeMS = dateToMs(LD.getLeave_time(), "yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
long nowTimeMS = System.currentTimeMillis();
|
|
|
|
|
if (nowTimeMS > leaveTimeMS && nowTimeMS < backTimeMS && LD.getType().equals("已通过")) {
|
|
|
|
|
num++;
|
|
|
|
@ -291,4 +291,9 @@ public class LeaveDetailHandler {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@GetMapping("delete/{id}")
|
|
|
|
|
public void delete(@PathVariable Integer id) {
|
|
|
|
|
leaveDetailRepository.deleteById(id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|