Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/StaffPerformInitDataTaskImpl.java

@@ -94,7 +94,7 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
             }
         }
 
-        //if(dayOfMonth==1){
+        if(dayOfMonth==1){
             //月初第一天初始化绩效汇总信息
             if(CollectionUtils.isNotEmpty(allStaff)) {
                 List<StaffPerformSummaryEntity> summaryList = new ArrayList<>();
@@ -121,7 +121,7 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
                 });
                 staffPerformSummaryService.save(summaryList);
             }
-        //}
+        }
 
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java

@@ -171,7 +171,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
         AttendanceRecordErrorEntity errorEntity = this.get(errorId);
         if(errorEntity!=null) {
             AttendanceLeaveRecordQuery query = new AttendanceLeaveRecordQuery();
-            query.setEndTimeEnd(DateUtils.getStrDate(errorEntity.getErrorDateTime()));
+            query.setEndTimeStart(DateUtils.getStrDate(errorEntity.getErrorDateTime()));
             query.setLeavePersonId(errorEntity.getStaffId());
             query.setAuditResult(AppealResultEnum.通过.getValue());
             AttendanceLeaveRecordEntity leaveRecordEntity = attendanceLeaveRecordService.selectOne(query);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java

@@ -108,9 +108,21 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
             throw new AppException("每日数据正在导出中，请稍后再试！");
         }
         cacheService.set(RedisCacheKeys.getRecordExportLockKey(), "111", 120L);
+        if (query.getGroupId() != null) {
+            query.setAttendanceGroupId(query.getGroupId());
+        }
 
-        query.setOrderColList(Arrays.asList(new OrderCol("attendanceDate", OrderCol.DESCENDING), new OrderCol("staffName", OrderCol.DESCENDING)));
+        if (ObjectUtils.isEmpty(query.getAttendanceDateStart())) {
+            query.setAttendanceDateStart(DateUtil.today());
+            query.setAttendanceDateEnd(DateUtil.today());
+        }
 
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("attendanceDate", OrderCol.DESCENDING), new OrderCol("staffName", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("attendanceDate", OrderCol.DESCENDING));
+            // query.getOrderColList().add(new OrderCol("staffName", OrderCol.DESCENDING));
+        }
 
         if (!ObjectUtils.isEmpty(query.getProperties())) {
           /*  //通过属性转换为注解