合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/ApprovalController.java

@@ -47,7 +47,7 @@ public class ApprovalController {
         return ok("提交审批失败，是否是调休，并且是否有加班时长");
     }
 
-    @ApiOperation(value = "删除审批")
+    @ApiOperation(value = "删除请假审批")
     @DeleteMapping("/delete/{id}")
     public ResponseEntity delete(@PathVariable("id") String id) {
         try {
@@ -170,7 +170,20 @@ public class ApprovalController {
         return ok("查找可选择部门失败");
     }
 
-
+    @ApiOperation(value = "删除加班审批")
+    @DeleteMapping("/delete/{id}")
+    public ResponseEntity deleteWorkover(@PathVariable("id") String id) {
+        try {
+            boolean b = approvalInformationService.deleteWorkover(id);
+            if(b){
+                return ok("删除加班审批成功");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("删除加班审批失败，错误内容{}:",e.getMessage());
+        }
+        return ok("删除加班审批失败");
+    }
 
 
 }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/ApprovalInformationService.java

@@ -87,4 +87,5 @@ public interface ApprovalInformationService {
      */
     List<Department> findSelectDepartment();
 
+    boolean deleteWorkover(String id);
 }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/ApprovalInformationServiceImpl.java

@@ -512,6 +512,20 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         return departments;
     }
 
+    @Override
+    public boolean deleteWorkover(String id) {
+        Optional<WorkoverAppro> optional = workoverApproDao.findById(id);
+        if(optional.isPresent()){
+            WorkoverAppro workoverAppro = optional.get();
+            String status = workoverAppro.getStatus();
+            if(("0").equals(status)){
+                approvalInformationDao.deleteById(id);
+                return true;
+            }
+        }
+        return false;
+    }
+
 
     public static void main(String[] args) throws Exception{
         Config config = new Config("1","09:00:00","17:00:00","2","3","15","17","1","1","1","1","1","1","1","1","1","1","1");