合并分支 'gwj' 到 'master'

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

@@ -2,7 +2,7 @@ package com.zjty.tynotes.attendance.controller;
 
 import com.zjty.tynotes.attendance.entity.ApprovalInformation;
 import com.zjty.tynotes.attendance.entity.WorkoverAppro;
-import com.zjty.tynotes.attendance.entity.vo.request.PageRequest;
+import com.zjty.tynotes.attendance.entity.vo.request.PageRequestAtten;
 import com.zjty.tynotes.attendance.service.ApprovalInformationService;
 import com.zjty.tynotes.misc.config.AutoDocument;
 import com.zjty.tynotes.pas.entity.Department;
@@ -84,7 +84,7 @@ public class ApprovalController {
 
     @ApiOperation(value = "查找所有我提交的审批")
     @PostMapping("findAllSubmitApproval/{userId}")
-    public ResponseEntity findAllSubmitApproval(@RequestBody PageRequest pageRequest) {
+    public ResponseEntity findAllSubmitApproval(@RequestBody PageRequestAtten pageRequest) {
         try {
             PageResponse<ApprovalInformation> pageResponse = approvalInformationService.findAllApproval(pageRequest);
             return ok(pageResponse);
@@ -96,7 +96,7 @@ public class ApprovalController {
 
     @ApiOperation(value = "查找所有我审核的审批")
     @GetMapping("/findAllAuditApproval/{userId}")
-    public ResponseEntity findAllAuditApproval(@RequestBody PageRequest pageRequest) {
+    public ResponseEntity findAllAuditApproval(@RequestBody PageRequestAtten pageRequest) {
         try {
             PageResponse<ApprovalInformation> approvalInformations = approvalInformationService.findAllAuditApproval(pageRequest);
             return ok(approvalInformations);
@@ -129,7 +129,7 @@ public class ApprovalController {
 
     @ApiOperation(value = "查找所有我提交的加班审批")
     @PostMapping("findAllSubmitWorkOverApproval")
-    public ResponseEntity findAllSubmitWorkOverApproval(@RequestBody PageRequest pageRequest) {
+    public ResponseEntity findAllSubmitWorkOverApproval(@RequestBody PageRequestAtten pageRequest) {
         try {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllSubmitWorkOverApproval(pageRequest);
             return ok(pageResponse);
@@ -140,8 +140,8 @@ public class ApprovalController {
     }
 
     @ApiOperation(value = "查找所有我审核的加班审批")
-    @GetMapping("/findAllAuditWorkOverApproval/{userId}")
-    public ResponseEntity findAllAuditWorkOverApproval(@RequestBody PageRequest pageRequest) {
+    @GetMapping("/findAllAuditWorkOverApproval")
+    public ResponseEntity findAllAuditWorkOverApproval(@RequestBody PageRequestAtten pageRequest) {
         try {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllAuditWorkOverApproval(pageRequest);
             return ok(pageResponse);

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/request/PageRequest.java → notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/request/PageRequestAtten.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class PageRequest {
+public class PageRequestAtten {
     /**
      * 每页显示个数
      */

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

@@ -2,7 +2,8 @@ package com.zjty.tynotes.attendance.service;
 
 import com.zjty.tynotes.attendance.entity.ApprovalInformation;
 import com.zjty.tynotes.attendance.entity.WorkoverAppro;
-import com.zjty.tynotes.attendance.entity.vo.request.PageRequest;
+import com.zjty.tynotes.attendance.entity.vo.request.PageRequestAtten;
+import com.zjty.tynotes.attendance.entity.vo.request.PageRequestAtten;
 import com.zjty.tynotes.pas.entity.Department;
 import com.zjty.tynotes.pas.entity.vo.PageResponse;
 
@@ -40,14 +41,14 @@ public interface ApprovalInformationService {
      * @param pageRequest
      * @return
      */
-    PageResponse<ApprovalInformation> findAllApproval(PageRequest pageRequest);
+    PageResponse<ApprovalInformation> findAllApproval(PageRequestAtten pageRequest);
 
     /**
      * 查找所有我审核的审批
      * @param pageRequest
      * @return
      */
-    PageResponse<ApprovalInformation> findAllAuditApproval(PageRequest pageRequest);
+    PageResponse<ApprovalInformation> findAllAuditApproval(PageRequestAtten pageRequest);
 
     /**
      * 提交加班申请单
@@ -71,14 +72,14 @@ public interface ApprovalInformationService {
      * @param pageRequest
      * @return
      */
-    PageResponse<WorkoverAppro> findAllSubmitWorkOverApproval(PageRequest pageRequest);
+    PageResponse<WorkoverAppro> findAllSubmitWorkOverApproval(PageRequestAtten pageRequest);
 
     /**
      * 查找所有审核的加班审批
      * @param pageRequest
      * @return
      */
-    PageResponse<WorkoverAppro> findAllAuditWorkOverApproval(PageRequest pageRequest);
+    PageResponse<WorkoverAppro> findAllAuditWorkOverApproval(PageRequestAtten pageRequest);
 
     /**
      * 查询申请单可选择的部门

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

@@ -2,7 +2,7 @@ package com.zjty.tynotes.attendance.service.impl;
 
 import com.zjty.tynotes.attendance.dao.*;
 import com.zjty.tynotes.attendance.entity.*;
-import com.zjty.tynotes.attendance.entity.vo.request.PageRequest;
+import com.zjty.tynotes.attendance.entity.vo.request.PageRequestAtten;
 import com.zjty.tynotes.attendance.service.ApprovalInformationService;
 import com.zjty.tynotes.pas.dao.ConfigDao;
 import com.zjty.tynotes.pas.dao.DayDao;
@@ -201,7 +201,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
 
 
     @Override
-    public PageResponse<ApprovalInformation> findAllApproval(PageRequest pageRequest) {
+    public PageResponse<ApprovalInformation> findAllApproval(PageRequestAtten pageRequest) {
         PageResponse<ApprovalInformation> pageResponse = new PageResponse();
         if(pageRequest.getId()!=null){
             List<ApprovalInformation> approvalInformations = approvalInformationDao.findAllByUserId(pageRequest.getId());
@@ -229,7 +229,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
     }
 
     @Override
-    public PageResponse<ApprovalInformation> findAllAuditApproval(PageRequest pageRequest) {
+    public PageResponse<ApprovalInformation> findAllAuditApproval(PageRequestAtten pageRequest) {
         PageResponse<ApprovalInformation> pageResponse = new PageResponse();
         List<String> statusList = new ArrayList<>();
         List<String> strings = new ArrayList<>();
@@ -326,7 +326,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
      * @return
      */
     @Override
-    public PageResponse<WorkoverAppro> findAllSubmitWorkOverApproval(PageRequest pageRequest) {
+    public PageResponse<WorkoverAppro> findAllSubmitWorkOverApproval(PageRequestAtten pageRequest) {
         PageResponse<WorkoverAppro> pageResponse = new PageResponse();
         List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByUserId(pageRequest.getId());
         if(pageRequest.getId()!=null){
@@ -353,7 +353,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
     }
 
     @Override
-    public PageResponse<WorkoverAppro> findAllAuditWorkOverApproval(PageRequest pageRequest) {
+    public PageResponse<WorkoverAppro> findAllAuditWorkOverApproval(PageRequestAtten pageRequest) {
         PageResponse<WorkoverAppro> pageResponse = new PageResponse();
         List<String> statusList = new ArrayList<>();
         List<String> strings = new ArrayList<>();

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

@@ -195,17 +195,24 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
         try {
             Date start = sdf.parse(request.getStartDate());
+            Date end = sdf.parse(request.getEndDate());
             calendar.setTime(start);
-//            calendar.set();
+            calendar.set(Calendar.DAY_OF_MONTH,1);
+            Date startTime = calendar.getTime();
+            calendar.setTime(end);
+            calendar.add(Calendar.MONTH,1);
+            calendar.set(Calendar.DAY_OF_MONTH,0);
+            Date endTime = calendar.getTime();
+            if(type!=null){
+                if(type.equals("事假")){
+//                    List<AttendanceDetails> attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndDateBetweenAndIsThingLeaveDay(
+//                            request.getId(), startTime, endTime, "0");
+                }
+            }
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        if(type!=null){
-            if(type.equals("事假")){
-//                attendanceDetailsDao.findAllByUserIdAndDateBetweenAndIsThingLeaveDay(
-//                        request.getId(),request.getStartDate(),request.getEndDate(),"0")
-            }
-        }
+
 //        attendanceDetailsDao.findAllByUserIdAndDateBetween()
         return null;
     }