Commit 62dc7fc2 authored by 赵啸非's avatar 赵啸非

修改固定班次考勤

parent cf5967ec
...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.web; ...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.web;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
...@@ -214,6 +215,18 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont ...@@ -214,6 +215,18 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
return super.editAfter(id, model, entity, context); return super.editAfter(id, model, entity, context);
} }
@Override
protected void doListBefore(AttendanceRecordErrorEntity query, Map<String, Object> model, Context context) throws AppException {
if (org.springframework.util.ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("errorDateTime", OrderCol.DESCENDING), new OrderCol("staffName", OrderCol.DESCENDING)));
} else {
query.getOrderColList().add(new OrderCol("errorDateTime", OrderCol.DESCENDING));
// query.getOrderColList().add(new OrderCol("staffName", OrderCol.DESCENDING));
}
}
@Override @Override
protected void doListAfter(AttendanceRecordErrorEntity query, List<AttendanceRecordErrorEntity> list, Context context) throws AppException { protected void doListAfter(AttendanceRecordErrorEntity query, List<AttendanceRecordErrorEntity> list, Context context) throws AppException {
/* for (AttendanceRecordErrorEntity errorEntity : list) { /* for (AttendanceRecordErrorEntity errorEntity : list) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment