合并分支 'gwj' 到 'master'

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

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

notes-attendance/src/main/java/com/zjty/tynotes/attendance/dao/ApprovalInformationDao.java

@@ -13,7 +13,6 @@ import java.util.List;
 public interface ApprovalInformationDao extends MongoRepository<ApprovalInformation,String> {
     List<ApprovalInformation> findAllByUserId(String userId);
 
-
     List<ApprovalInformation> findAllByApprovalUserIdOneOrApprovalUserIdTwo(String userId);
 
     List<ApprovalInformation> findAllByStatusIn(List<String> statusList);
@@ -25,4 +24,6 @@ public interface ApprovalInformationDao extends MongoRepository<ApprovalInformat
     ApprovalInformation findAllByUserIdAndLeaveStartTimeBeforeAndLeaveEndTimeBetweenAndApprovalTypeAndStatus(String userId, Date startTime,Date startTime1,Date endTime,String type,String status);
 
     ApprovalInformation findAllByUserIdAndLeaveStartTimeBetweenAndLeaveEndTimeAfterAndApprovalTypeAndStatus(String userId, Date startTime,Date endTime,Date endTime1,String type,String status);
+
+    List<ApprovalInformation> findAllByLeaveStartTimeBetween(Date startTime,Date endTime);
 }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/dao/WorkoverApproDao.java

@@ -13,11 +13,13 @@ import java.util.List;
  */
 @Repository
 public interface WorkoverApproDao extends MongoRepository<WorkoverAppro,String> {
-    WorkoverAppro findByUserIdContainsAndStatusAndDate(String userId, String status, Date date);
+    WorkoverAppro findByUserIdContainsAndStatusAndOverDate(String userId, String status, Date date);
 
     List<WorkoverAppro> findAllByUserId(String userId);
 
     List<WorkoverAppro> findAllByAuditIdAndStatusIn(List<String> userIds);
 
     List<WorkoverAppro> findAllByStatusIn(List<String> userIds);
+
+    List<WorkoverAppro> findAllByOverDate(Date date);
 }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/WorkoverAppro.java

@@ -42,7 +42,7 @@ public class WorkoverAppro {
 
     @ApiModelProperty(value = "加班起始时间",example = "1")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date date;
+    private Date overDate;
 
     @ApiModelProperty(value = "描述，加班事由",example = "1")
     private String description;

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

@@ -203,7 +203,7 @@ public class CardTask {
                                 });
                             }
 
-                            WorkoverAppro workoverAppro = workoverApproDao.findByUserIdContainsAndStatusAndDate(user.getId(), "1", parse);
+                            WorkoverAppro workoverAppro = workoverApproDao.findByUserIdContainsAndStatusAndOverDate(user.getId(), "1", parse);
 //                            ApprovalInformation approvalInformation1 = approvalInformationDao.findByUserIdAndStatusAndApprovalType(user.getId(), "1", "加班");
                             attendanceDetails.setUserId(user.getId());
                             if(cardResults1!=null){
@@ -335,7 +335,7 @@ public class CardTask {
                                         cardResults.add(cardResult);
                                     }
                                 });
-                                WorkoverAppro workoverAppro = workoverApproDao.findByUserIdContainsAndStatusAndDate(user.getId(), "1", parse);
+                                WorkoverAppro workoverAppro = workoverApproDao.findByUserIdContainsAndStatusAndOverDate(user.getId(), "1", parse);
 //                                ApprovalInformation approvalInformation1 = approvalInformationDao.findByUserIdAndStatusAndApprovalType(user.getId(), "1", "加班");
                                 if(cardResults.size()>=2){
                                     if(workoverAppro!=null){
@@ -780,11 +780,27 @@ public class CardTask {
         return score;
     }
 
-//    @Scheduled(cron = "0 0 23 * * ? ")
-//    public void setApproPass(){
-//        Calendar calendar = Calendar.getInstance();
-//
-//    }
+    @Scheduled(cron = "0 0 23 * * ? ")
+    public void setApproPass(){
+        Calendar calendar = Calendar.getInstance();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+        String format = sdf.format(new Date());
+        try {
+            Date parse = sdf.parse(format);
+            calendar.setTime(parse);
+            calendar.add(Calendar.DATE,1);
+            Date startTime = calendar.getTime();
+            calendar.add(Calendar.DATE,1);
+            Date endTime = calendar.getTime();
+            List<ApprovalInformation> approvalInformations =
+                    approvalInformationDao.findAllByLeaveStartTimeBetween(startTime, endTime);
+            workoverApproDao.findAllByOverDate(startTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+
+    }
 
 
 }