pghs975uc
/
LeaveManagerSPB
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

08 debug

Browse Source
master
markma 4 years ago
parent f29f3db2fc
commit 5835cab256
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File

17
src/main/java/com/markma/leave_manager_spb/controller/LeaveDetailHandler.java
Unescape View File

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

4
src/main/java/com/markma/leave_manager_spb/controller/OutDetailHandler.java
Unescape View File

@ -85,8 +85,8 @@ public class OutDetailHandler {
OLDs.add(OLD); OLDs.add(OLD);
continue; continue;
} }
long backTimeMS = dateToMs(OLD.getBack_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"); long returnTimeMS = dateToMs(OLD.getReturn_time(), "yyyy-MM-dd HH:mm:ss");
if (backTimeMS >= returnTimeMS) { if (backTimeMS >= returnTimeMS) {
OLD.setExceed_type("正常"); OLD.setExceed_type("正常");
} else { } else {

Write Preview
Loading…
Cancel
Save