diff --git a/Pinnacle/pom.xml b/Pinnacle/pom.xml index 858e306..d1ca2fc 100644 --- a/Pinnacle/pom.xml +++ b/Pinnacle/pom.xml @@ -10,7 +10,7 @@ com.cfive Pinnacle - 0.0.1-SNAPSHOT + 1.0.0.230611_alpha Pinnacle Pinnacle diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java index a7a49d6..5c0b413 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java @@ -112,7 +112,6 @@ public class AffairController { @DeleteMapping("/{id}") @PreAuthorize("hasAuthority('affair:manage:delete')") public ResponseResult deleteAffairApproved(@PathVariable Long id) { - System.out.println("affair"); return ResponseResult.build(ResponseCode.DATABASE_DELETE_OK, "success", affairService.removeById(id)); //删除已审批事务 diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java index da1c311..e5fa27f 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java @@ -61,7 +61,6 @@ public class AttendanceController { public ResponseResult> findOneAttendanceAndUserByTime(String startTime, String endTime) { Long userId = WebUtil.getLoginUser().getUser().getId(); List attendances = attendanceService.selectOneByTime(startTime, endTime, userId); - System.out.println(attendances); return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances); } diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java index 04e4dcc..79fe3fc 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java @@ -34,13 +34,10 @@ public class WorkController { @GetMapping @PreAuthorize("hasAuthority('work:manage:get')") public ResponseResult> getAll(String content) { - System.out.println(content); if (content != null && content.length() != 0) { - System.out.println("test1"); List workList = workService.getWorkByContent(content); return ResponseResult.databaseSelectSuccess(workList); } else { - System.out.println("test2"); return ResponseResult.databaseSelectSuccess(workService.getAll()); } } diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java index e5f05c8..0403155 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java @@ -51,8 +51,6 @@ public class AttendanceServiceImpl extends ServiceImpl selectByTime(String startTime, String endTime) { LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - System.out.println(start); - System.out.println(end); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.ge(Attendance::getAttTime, start).le(Attendance::getAttTime, end); List attendancesByTime = attendanceMapper.selectList(lqw); @@ -68,8 +66,6 @@ public class AttendanceServiceImpl extends ServiceImpl selectOneByTime(String startTime, String endTime, Long userId) { LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - System.out.println(start); - System.out.println(end); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.ge(Attendance::getAttTime, start).le(Attendance::getAttTime, end).eq(Attendance::getDeleted, 0).eq(Attendance::getUserId, userId); List oneAttendancesByTime = attendanceMapper.selectList(lqw); diff --git a/ui/src/components/affairs/ApplicantsAddAffairs.vue b/ui/src/components/affairs/ApplicantsAddAffairs.vue index 1befc7b..0c84b8a 100644 --- a/ui/src/components/affairs/ApplicantsAddAffairs.vue +++ b/ui/src/components/affairs/ApplicantsAddAffairs.vue @@ -102,7 +102,6 @@