Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

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

@@ -83,7 +83,7 @@ public class ApprovalController {
 
 
     @ApiOperation(value = "查找所有我提交的审批")
-    @PostMapping("findAllSubmitApproval/{userId}")
+    @PostMapping("findAllSubmitApproval")
     public ResponseEntity findAllSubmitApproval(@RequestBody PageRequestAtten pageRequest) {
         try {
             PageResponse<ApprovalInformation> pageResponse = approvalInformationService.findAllApproval(pageRequest);
@@ -95,7 +95,7 @@ public class ApprovalController {
     }
 
     @ApiOperation(value = "查找所有我审核的审批")
-    @GetMapping("/findAllAuditApproval/{userId}")
+    @GetMapping("/findAllAuditApproval")
     public ResponseEntity findAllAuditApproval(@RequestBody PageRequestAtten pageRequest) {
         try {
             PageResponse<ApprovalInformation> approvalInformations = approvalInformationService.findAllAuditApproval(pageRequest);

notes-attendance/src/main/java/com/zjty/tynotes/attendance/task/CardTask.java

@@ -780,5 +780,11 @@ public class CardTask {
         return score;
     }
 
+//    @Scheduled(cron = "0 0 23 * * ? ")
+//    public void setApproPass(){
+//        Calendar calendar = Calendar.getInstance();
+//
+//    }
+
 
 }