合并分支 'gwj' 到 'master'

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

 package com.zjty.tynotes.attendance.entity;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,14 +19,30 @@ import org.springframework.data.mongodb.core.mapping.Document;
 public class AttendanceDepartment {
     private String id;
 
-    private Double attendancePercent;
+    @ApiModelProperty(value = "用户id",example = "1")
+    private String userId;
 
-    private Double absenteeismPercent;
+    @ApiModelProperty(value = "用户姓名",example = "1")
+    private String name;
 
-    private Double lateWorkPercent;
+    @ApiModelProperty(value = "应出勤天数",example = "1")
+    private Integer attendanceDay;
 
-    private String name;
+    @ApiModelProperty(value = "实际出勤天数",example = "1")
+    private Float realAttendanceDay;
+
+    @ApiModelProperty(value = "公出天数",example = "1")
+    private Float reasonableOutWorkDay;
+
+    @ApiModelProperty(value = "迟到天数",example = "1")
+    private Integer lateDay;
+
+    @ApiModelProperty(value = "早退天数",example = "1")
+    private Integer earlyDay;
 
-    private Integer lateTime;
+    @ApiModelProperty(value = "出差天数",example = "1")
+    private Float OutWorkDay;
 
+    @ApiModelProperty(value = "请假天数",example = "1")
+    private Float offFromWorkDay;
 }

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

@@ -7,6 +7,7 @@ import com.dingtalk.api.response.OapiAttendanceListResponse;
 import com.taobao.api.ApiException;
 import com.zjty.tynotes.attendance.dao.CardResultDao;
 import com.zjty.tynotes.attendance.dao.DingUserDao;
+import com.zjty.tynotes.attendance.entity.AttendanceDetails;
 import com.zjty.tynotes.attendance.entity.CardResult;
 import com.zjty.tynotes.attendance.entity.DingUser;
 import com.zjty.tynotes.pas.dao.ConfigDao;
@@ -115,16 +116,29 @@ public class CardTask {
     private void computerPersonAttenDanceDay(String startTime, String endTime, List<User> userList, List<CardResult> cardResults1) {
         if(userList!=null){
             userList.forEach(user -> {
+//                List<String> checkType = new ArrayList<>();
+                AttendanceDetails attendanceDetails = new AttendanceDetails();
+                attendanceDetails.setUserId(user.getId());
                 if(cardResults1!=null){
                     List<CardResult> cardResults = new ArrayList<>();
                     cardResults1.forEach(cardResult -> {
                         String userId = cardResult.getUserId();
                         if(user.getId().equals(userId)){
                             cardResults.add(cardResult);
+//                            if(!checkType.contains("OnDuty")&&("OnDuty").equals(cardResult.getCheckType())){
+//                                checkType.add("OnDuty");
+//                            }else if(!checkType.contains("OffDuty")&&("OffDuty").equals(cardResult.getCheckType())){
+//                                checkType.add("OffDuty");
+//                            }
                         }
                     });
                     cardResults.forEach(cardResult -> {
+                        String checkType = cardResult.getCheckType();
+                        if(("OnDuty").equals(checkType)){
+//                            cardResult.get
+                        }else if("OffDuty".equals(checkType)){
 
+                        }
                     });
                 }
             });