Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/ErrorStatusEnum.java

@@ -14,7 +14,8 @@ public enum ErrorStatusEnum {
     迟到(2, "迟到"),
     正常(3, "正常"),
     事假半天(4, "事假半天"),
-    事假全天(5, "事假全天");
+    事假全天(5, "事假全天"),
+    年假(6, "年假");
 
     private Integer value;
     private String desc;

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

@@ -120,7 +120,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
                 saveAttendPerformRecord(context, entity, ruleCode);
             }
             //考勤异常处理为正常后修改考勤绩效
-            if (entity.getProcessResult().equals(ErrorStatusEnum.正常.getValue().toString())) {
+            if (entity.getProcessResult().equals(ErrorStatusEnum.正常.getValue().toString())||entity.getProcessResult().equals(ErrorStatusEnum.年假.getValue().toString())) {
                 CheckAttendRecordEntity checkAttendRecordQuery = new CheckAttendRecordEntity();
                 checkAttendRecordQuery.setStaffId(entity.getStaffId());
                 checkAttendRecordQuery.setErrorTime(entity.getErrorDateTime());

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

@@ -119,8 +119,8 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
             query.setAttendanceDateEnd(DateUtil.today());
         }
         try {
-            if (DateUtils.getBetween(query.getAttendanceDateStart(), query.getAttendanceDateEnd(), DateUtils.P_yyyy_MM_dd, 2) > 10) {
-                throw new AppException("选择的日期跨度不能超过十天！");
+            if (DateUtils.getBetween(query.getAttendanceDateStart(), query.getAttendanceDateEnd(), DateUtils.P_yyyy_MM_dd, 2) > 31) {
+                throw new AppException("选择的日期跨度不能超过一个月！");
             }
         } catch (Exception e) {
             throw new AppException(e.getMessage());