合并分支 'gwj' 到 'master'

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

@@ -44,7 +44,7 @@ public class ApprovalController {
         if(approvalInformation1!=null){
             return ok(approvalInformation1);
         }
-        return ok("提交审批失败，是否可有加班时长");
+        return ok("提交审批失败，是否是调休，并且是否有加班时长");
     }
 
     @ApiOperation(value = "删除审批")

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

 package com.zjty.tynotes.attendance.controller;
 
 import com.zjty.tynotes.attendance.entity.ApprovalInformation;
+import com.zjty.tynotes.attendance.entity.vo.UserAttenList;
 import com.zjty.tynotes.attendance.entity.vo.request.AttenRequest;
 import com.zjty.tynotes.attendance.service.AttendanceDetailsService;
 import com.zjty.tynotes.misc.config.AutoDocument;
@@ -32,9 +33,17 @@ public class AttendanceController {
     }
 
     @ApiOperation(value = "查询部门考勤信息", response = ApprovalInformation.class)
-    @GetMapping("/department")
+    @PostMapping("/department")
     public ResponseEntity department(@RequestBody AttenRequest request){
         return ok(attendanceDetailsService.findDepartment(request));
     }
 
+    @ApiOperation(value = "查询某人的考勤列表(请假、调休等等)", response = ApprovalInformation.class)
+    @PostMapping("/findAttenList/{type}")
+    public ResponseEntity department(@RequestBody AttenRequest request,@PathVariable String type){
+        UserAttenList userAttenList = attendanceDetailsService.findAttenList(request,type);
+        return ok(userAttenList);
+    }
+
+
 }

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

@@ -11,7 +11,7 @@ import java.util.List;
  * @create 2020/4/13 13:02
  */
 public interface WorkoverApproDao extends MongoRepository<WorkoverAppro,String> {
-    WorkoverAppro findByApplyIdContainsAndStatusAndDate(String userId, String status, Date date);
+    WorkoverAppro findByUserIdContainsAndStatusAndDate(String userId, String status, Date date);
 
     List<WorkoverAppro> findAllByUserId(String userId);
 

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

@@ -39,7 +39,7 @@ public class DepartmentExl {
     private Float sickLeaveDay;
 
     @Excel(name = "事假天数", orderNum = "9", width = 20)
-    private Integer thingLeaveDay;
+    private Float thingLeaveDay;
 
     @Excel(name = "旷工天数", orderNum = "10", width = 20)
     private Float absenteeismDay;

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

+package com.zjty.tynotes.attendance.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author gwj
+ * @create 2020/4/14 13:41
+ */
+@Data
+@AllArgsConstructor
+@ApiModel(value = "返回前台的某人的考勤列表查看(如迟到列表、加班列表等)", description = "返回前台的某人的考勤列表查看(如迟到列表、加班列表等)")
+public class UserAttenList {
+    @ApiModelProperty(value = "用户编号",example = "1")
+    private String userId;
+
+    @ApiModelProperty(value = "用户名称",example = "1")
+    private String name;
+
+    @ApiModelProperty(value = "类型事假/调休/病假/公出/出差",example = "事假")
+    private String type;
+
+    @ApiModelProperty(value = "日期集合",example = "1")
+    private List<Date> dates;
+}

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

 package com.zjty.tynotes.attendance.entity.vo;
 
 import com.zjty.tynotes.attendance.entity.AttendanceDetails;
+import com.zjty.tynotes.attendance.entity.exl.DepartmentExl;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -85,4 +86,13 @@ public class UserAttenVo {
     public void computerRealAttendanceDay(){
         realAttendanceDay = attendanceDay - outSideBusinessDay - outWorkDay - sickLeaveDay - absenteeismDay;
     }
+
+    public DepartmentExl convert(){
+        return new DepartmentExl(name,attendanceDay,realAttendanceDay,
+                outSideBusinessDay,lateDay,leaveEarlyDay,outWorkDay,
+                sickLeaveDay,thingDay,absenteeismDay,lateOne,lateTwo,
+                lateThree,lateFour);
+    }
+
+
 }

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

 package com.zjty.tynotes.attendance.service;
 
+import com.zjty.tynotes.attendance.entity.vo.UserAttenList;
 import com.zjty.tynotes.attendance.entity.vo.UserAttenVo;
 import com.zjty.tynotes.attendance.entity.vo.request.AttenRequest;
 import com.zjty.tynotes.pas.entity.Department;
@@ -32,4 +33,12 @@ public interface AttendanceDetailsService {
      * @return
      */
     List<Department> findDepartmentList(String id);
+
+    /**
+     * 查找请假或者旷工、加班等等列表
+     * @param request
+     * @param type
+     * @return
+     */
+    UserAttenList findAttenList(AttenRequest request, String type);
 }

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

@@ -83,6 +83,8 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
 
         }
         approvalInformation.setStatus("0");
+        approvalInformation.setApplyTime(new Date());
+
         return approvalInformationDao.save(approvalInformation);
     }
 
@@ -302,6 +304,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
     @Override
     public WorkoverAppro addWorkoverApproval(WorkoverAppro workoverAppro) {
         workoverAppro.setStatus("0");
+        workoverAppro.setApplyTime(new Date());
         return workoverApproDao.save(workoverAppro);
     }
 

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

@@ -2,6 +2,7 @@ package com.zjty.tynotes.attendance.service.impl;
 
 import com.zjty.tynotes.attendance.dao.AttendanceDetailsDao;
 import com.zjty.tynotes.attendance.entity.AttendanceDetails;
+import com.zjty.tynotes.attendance.entity.vo.UserAttenList;
 import com.zjty.tynotes.attendance.entity.vo.UserAttenVo;
 import com.zjty.tynotes.attendance.entity.vo.request.AttenRequest;
 import com.zjty.tynotes.attendance.service.AttendanceDetailsService;
@@ -182,6 +183,19 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
         return departmentList;
     }
 
+    /**
+     * 查找请假或者旷工、加班等等列表
+     * @param request
+     * @param type
+     * @return
+     */
+    @Override
+    public UserAttenList findAttenList(AttenRequest request, String type) {
+
+        return null;
+    }
+
+
     /**
      * 递归获得部门树
      * @param departments

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

@@ -203,7 +203,7 @@ public class CardTask {
                                 });
                             }
 
-                            WorkoverAppro workoverAppro = workoverApproDao.findByApplyIdContainsAndStatusAndDate(user.getId(), "1", parse);
+                            WorkoverAppro workoverAppro = workoverApproDao.findByUserIdContainsAndStatusAndDate(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.findByApplyIdContainsAndStatusAndDate(user.getId(), "1", parse);
+                                WorkoverAppro workoverAppro = workoverApproDao.findByUserIdContainsAndStatusAndDate(user.getId(), "1", parse);
 //                                ApprovalInformation approvalInformation1 = approvalInformationDao.findByUserIdAndStatusAndApprovalType(user.getId(), "1", "加班");
                                 if(cardResults.size()>=2){
                                     if(workoverAppro!=null){