From 5835cab2568cae667d551e199e3d378f3fd313e3 Mon Sep 17 00:00:00 2001
From: markma <750975972@qq.com>
Date: Fri, 28 Jan 2022 11:54:44 +0800
Subject: [PATCH] 08 debug

---
 .../controller/LeaveDetailHandler.java          | 17 +++++++++++------
 .../controller/OutDetailHandler.java            |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/markma/leave_manager_spb/controller/LeaveDetailHandler.java b/src/main/java/com/markma/leave_manager_spb/controller/LeaveDetailHandler.java
index 7c2a1ee..9c77cf7 100644
--- a/src/main/java/com/markma/leave_manager_spb/controller/LeaveDetailHandler.java
+++ b/src/main/java/com/markma/leave_manager_spb/controller/LeaveDetailHandler.java
@@ -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);
+    }
+
 }
diff --git a/src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java b/src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java
index 3ad2251..da8824a 100644
--- a/src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java
+++ b/src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java
@@ -85,8 +85,8 @@ public class OutDetailHandler {
                     OLDs.add(OLD);
                     continue;
                 }
-                long backTimeMS = dateToMs(OLD.getBack_time(), "yyyy-mm-dd hh:mm:ss");
-                long returnTimeMS = dateToMs(OLD.getReturn_time(), "yyyy-mm-dd hh:mm:ss");
+                long backTimeMS = dateToMs(OLD.getBack_time(), "yyyy-MM-dd HH:mm:ss");
+                long returnTimeMS = dateToMs(OLD.getReturn_time(), "yyyy-MM-dd HH:mm:ss");
                 if (backTimeMS >= returnTimeMS) {
                     OLD.setExceed_type("正常");
                 } else {