合并分支 'gwj' 到 'master'

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

@@ -17,5 +17,19 @@ public interface AttendanceDetailsDao extends MongoRepository<AttendanceDetails,
 
     List<AttendanceDetails> findAllByUserIdAndDateBetween(String userId,Date startDate,Date endDate);
 
-    List<AttendanceDetails> findAllByUserIdAndDateBetweenAnd(String userId,Date startDate,Date endDate);
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAndIsThingLeaveDay(String userId,Date startDate,Date endDate,String type);
+
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAndIsSickLeaveDay(String userId,Date startDate,Date endDate,String type);
+
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAndIsLateDay(String userId,Date startDate,Date endDate,String type);
+
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAndIsLeaveEarlyDay(String userId,Date startDate,Date endDate,String type);
+
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAndIsOutSideBusinessDay(String userId,Date startDate,Date endDate,String type);
+
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAndIsOutWorkDay(String userId,Date startDate,Date endDate,String type);
+
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAndIsAbsenteeismDay(String userId,Date startDate,Date endDate,String type);
+
+    List<AttendanceDetails> findAllByUserIdAndDateBetweenAndIsPaidLeaveDay(String userId,Date startDate,Date endDate,String type);
 }

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

@@ -96,7 +96,7 @@ public class AttendanceDetails {
     Float outWorkDay;
 
     @ApiModelProperty(value = "时间",example = "2020-03-22 09:00:00")
-    Date date;
+    Date attenDate;
 
     public AttendanceDetails() {
         thingLeaveDay = 0f;

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

@@ -191,9 +191,19 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
      */
     @Override
     public UserAttenList findAttenList(AttenRequest request, String type) {
+        Calendar calendar = Calendar.getInstance();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        try {
+            Date start = sdf.parse(request.getStartDate());
+            calendar.setTime(start);
+//            calendar.set();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         if(type!=null){
-            if(type.equals("")){
-
+            if(type.equals("事假")){
+//                attendanceDetailsDao.findAllByUserIdAndDateBetweenAndIsThingLeaveDay(
+//                        request.getId(),request.getStartDate(),request.getEndDate(),"0")
             }
         }
 //        attendanceDetailsDao.findAllByUserIdAndDateBetween()

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

@@ -177,7 +177,7 @@ public class CardTask {
                     e.printStackTrace();
                 }
                 if(parse!=null){
-                    attendanceDetails.setDate(parse);
+                    attendanceDetails.setAttenDate(parse);
                 }
                 try {
                     String format = sdf1.format(parse);