合并分支 'gwj' 到 'master'

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/controller/AttendanceController.java

@@ -40,7 +40,7 @@ public class AttendanceController {
 
     @ApiOperation(value = "查询某人的考勤列表(请假、调休等等)", response = ApprovalInformation.class)
     @PostMapping("/findAttenList/{type}")
-    public ResponseEntity department(@RequestBody AttenRequest request,@PathVariable String type){
+    public ResponseEntity findAttenList(@RequestBody AttenRequest request,@PathVariable String type){
         UserAttenList userAttenList = attendanceDetailsService.findAttenList(request,type);
         return ok(userAttenList);
     }

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @ApiModel(value = "返回前台的某人的考勤列表查看(如迟到列表、加班列表等)", description = "返回前台的某人的考勤列表查看(如迟到列表、加班列表等)")
 public class UserAttenList {
     @ApiModelProperty(value = "用户编号",example = "1")

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/request/AttenRequest.java

@@ -17,6 +17,8 @@ public class AttenRequest {
 
     private String id;//用户id
 
+    private String name;//用户名
+
     private String startDate;//开始时间 格式:2020-04
 
     private String endDate;//结束时间 格式:2020-05

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

@@ -137,7 +137,7 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
         }
         List<AttenRequest> attenRequests = new ArrayList<>();
         userList.forEach(user -> {
-            attenRequests.add(new AttenRequest(user.getId(),request.getStartDate(),request.getEndDate()));
+            attenRequests.add(new AttenRequest(user.getId(),null,request.getStartDate(),request.getEndDate()));
         });
         if(attenRequests!=null){
             attenRequests.forEach(attenRequest1->{
@@ -193,6 +193,10 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
     public UserAttenList findAttenList(AttenRequest request, String type) {
         Calendar calendar = Calendar.getInstance();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        UserAttenList userAttenList = new UserAttenList();
+        userAttenList.setUserId(request.getId());
+        userAttenList.setName(request.getName());
+        userAttenList.setType(type);
         try {
             Date start = sdf.parse(request.getStartDate());
             Date end = sdf.parse(request.getEndDate());
@@ -204,17 +208,46 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
             calendar.set(Calendar.DAY_OF_MONTH,0);
             Date endTime = calendar.getTime();
             if(type!=null){
+                List<AttendanceDetails> attendanceDetailsList = null;
+                List<Date> dates = new ArrayList<>();
                 if(type.equals("事假")){
-//                    List<AttendanceDetails> attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndDateBetweenAndIsThingLeaveDay(
-//                            request.getId(), startTime, endTime, "0");
+                    attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetweenAndIsThingLeaveDay(
+                            request.getId(), startTime, endTime, "0");
+                }else if(type.equals("病假")){
+                    attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetweenAndIsSickLeaveDay(
+                            request.getId(), startTime, endTime, "0");
+                }else if(type.equals("调休")){
+                    attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetweenAndIsPaidLeaveDay(
+                            request.getId(), startTime, endTime, "0");
+                }else if(type.equals("旷工")){
+                    attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetweenAndIsAbsenteeismDay(
+                            request.getId(), startTime, endTime, "0");
+                }else if(type.equals("迟到")){
+                    attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetweenAndIsLateDay(
+                            request.getId(), startTime, endTime, "0");
+                }else if(type.equals("早退")){
+                    attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetweenAndIsLeaveEarlyDay(
+                            request.getId(), startTime, endTime, "0");
+                }else if(type.equals("公出")){
+                    attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetweenAndIsOutSideBusinessDay(
+                            request.getId(), startTime, endTime, "0");
+                }else if(type.equals("出差")){
+                    attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetweenAndIsOutWorkDay(
+                            request.getId(), startTime, endTime, "0");
                 }
+                if(attendanceDetailsList!=null){
+                    attendanceDetailsList.forEach(attendanceDetails -> {
+                        dates.add(attendanceDetails.getAttenDate());
+                    });
+                }
+                userAttenList.setDates(dates);
             }
         } catch (ParseException e) {
             e.printStackTrace();
         }
 
 //        attendanceDetailsDao.findAllByUserIdAndDateBetween()
-        return null;
+        return userAttenList;
     }
 
 

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();
+//
+//    }
+
 
 }

notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java

@@ -48,7 +48,6 @@ public class UnionApplication {
         connector.setPort(8084);
         connector.setRedirectPort(8289);
         return connector;
-
     }
 
 }