假期汇总默认假期改为其他假

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

@@ -231,7 +231,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                         temp.setGoTimes(0);     //默认只要有请假，当天就不算全勤
                         LeaveTypeEnum leaveTypeEnum = LeaveTypeEnum.getByValue(item.getLeaveType());
                         if (leaveTypeEnum == null) {
-                            leaveTypeEnum = LeaveTypeEnum.事假;  //默认为事假
+                            leaveTypeEnum = LeaveTypeEnum.其他;  //默认为事假
                         }
                         attendanceSummary = leaveTypeEnum.getDesc() + "*1";
                         switch (leaveTypeEnum) {
@@ -298,8 +298,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                             case 探亲假:
                                 temp.setHomeLeave(leaveTime);
                                 break;
+                            case 其他:
+                                temp.setOtherDays(leaveTime);
+                                break;
                             default:
-                                temp.setPersonalLeave(leaveTime);
+                                temp.setOtherDays(leaveTime);
                                 break;
                         }
                         this.dao.update(temp);

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

@@ -70,8 +70,8 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
     @Override
     protected void doListBefore(StaffPerformSummaryEntity query, Map<String, Object> model, Context context) throws AppException {
         if (!ObjectUtils.isEmpty(query.getOrderColList())) {
-        query.getOrderColList().add(new OrderCol("year",OrderCol.DESCENDING));
-        query.getOrderColList().add(new OrderCol("month",OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("year",OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("month",OrderCol.DESCENDING));
         }
     }