合并分支 'gwj' 到 'master'

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

@@ -146,7 +146,7 @@ public class ApprovalController {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllAuditWorkOverApproval(pageRequest);
             return ok(pageResponse);
         } catch (Exception e) {
-            logger.error("查找所有我审核的审批");
+            logger.error(e.getMessage()+"查找所有我审核的审批");
         }
         return ok("查找所有我审核的审批");
     }

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

@@ -79,4 +79,7 @@ public class ApprovalInformation {
     @ApiModelProperty(value = "申请时间",example = "2020-04-03 09:00:00")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date applyTime;
+
+    @ApiModelProperty(value = "天数",example = "2")
+    private Float numberDay;
 }

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

@@ -59,7 +59,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
             Date leaveStartTime = approvalInformation.getLeaveStartTime();
             Long aLong = 0L;
             try {
-                aLong = computeTime(leaveEndTime, leaveStartTime);
+                aLong = computeTime(leaveStartTime,leaveEndTime);
             } catch (Exception e) {
                 logger.error("addApproval()方法中计算调休时长出错");
             }
@@ -80,6 +80,26 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
             }
 
         }
+        Long aLong = null;
+        try {
+            aLong = computeTime(approvalInformation.getLeaveStartTime(), approvalInformation.getLeaveEndTime());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Float day = 0f;
+        if(aLong!=null){
+            long x = aLong % 8;
+            if(x==0){
+                day = new Float(aLong / 8);
+            }else{
+                if(x>8*0.5){
+                    day = new Float(aLong/8+1);
+                }else{
+                    day = new Float(aLong/8+0.5);
+                }
+            }
+        }
+        approvalInformation.setNumberDay(day);
         approvalInformation.setStatus("0");
         approvalInformation.setApplyTime(new Date());
 
@@ -112,7 +132,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                 if(StringUtils.isNotBlank(approvalInformation.getApprovalType())&&approvalInformation.getApprovalType().equals("调休")){
                     UserOverWork userOverWork = userOverWorkDao.findByUserId(approvalInformation.getUserId());
                     try {
-                        Long aLong = computeTime(approvalInformation.getLeaveEndTime(), approvalInformation.getLeaveStartTime());
+                        Long aLong = computeTime(approvalInformation.getLeaveStartTime(),approvalInformation.getLeaveEndTime());
                         Long overWorkHour = userOverWork.getOverWorkHour();
                         Long timeLeft = overWorkHour - aLong;
                         userOverWork.setOverWorkHour(timeLeft);
@@ -161,7 +181,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                         if(StringUtils.isNotBlank(approvalInformation.getApprovalType())&&approvalInformation.getApprovalType().equals("调休")){
                             UserOverWork userOverWork = userOverWorkDao.findByUserId(approvalInformation.getUserId());
                             try {
-                                Long aLong = computeTime(approvalInformation.getLeaveEndTime(), approvalInformation.getLeaveStartTime());
+                                Long aLong = computeTime(approvalInformation.getLeaveStartTime(),approvalInformation.getLeaveEndTime());
                                 Long overWorkHour = userOverWork.getOverWorkHour();
                                 Long timeLeft = overWorkHour - aLong;
                                 userOverWork.setOverWorkHour(timeLeft);
@@ -299,6 +319,11 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         return pageResponse;
     }
 
+    /**
+     * 提交加班申请
+     * @param workoverAppro
+     * @return
+     */
     @Override
     public WorkoverAppro addWorkoverApproval(WorkoverAppro workoverAppro) {
         workoverAppro.setStatus("0");

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

@@ -794,12 +794,23 @@ public class CardTask {
             Date endTime = calendar.getTime();
             List<ApprovalInformation> approvalInformations =
                     approvalInformationDao.findAllByLeaveStartTimeBetween(startTime, endTime);
-            workoverApproDao.findAllByOverDate(startTime);
+            List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByOverDate(startTime);
+            if(approvalInformations!=null){
+                approvalInformations.forEach(approvalInformation -> {
+                    approvalInformation.setStatus("1");
+                });
+            }
+            if(workoverAppros!=null){
+                workoverAppros.forEach(workoverAppro -> {
+                    workoverAppro.setStatus("1");
+                });
+            }
+            approvalInformationDao.saveAll(approvalInformations);
+            workoverApproDao.saveAll(workoverAppros);
         } catch (ParseException e) {
             e.printStackTrace();
         }
 
-
     }