Commit 0452baec authored by 赵啸非's avatar 赵啸非

修改考勤汇总

parent ce4dd66b
package com.mortals.xhx.module.attendance.model.vo; package com.mortals.xhx.module.attendance.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity; import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +11,8 @@ import java.util.List; ...@@ -9,6 +11,8 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-04-07
*/ */
@Data
public class AttendanceLeaveRecordVo extends BaseEntityLong { public class AttendanceLeaveRecordVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
...@@ -15,5 +15,9 @@ import java.util.Date; ...@@ -15,5 +15,9 @@ import java.util.Date;
*/ */
@Data @Data
public class CheckAttendRecordVo extends BaseEntityLong { public class CheckAttendRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
} }
\ No newline at end of file
...@@ -15,5 +15,9 @@ import java.util.Date; ...@@ -15,5 +15,9 @@ import java.util.Date;
*/ */
@Data @Data
public class CheckComplainRecordVo extends BaseEntityLong { public class CheckComplainRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
} }
\ No newline at end of file
...@@ -15,5 +15,9 @@ import java.util.Date; ...@@ -15,5 +15,9 @@ import java.util.Date;
*/ */
@Data @Data
public class CheckEffectRecordVo extends BaseEntityLong { public class CheckEffectRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
} }
\ No newline at end of file
...@@ -15,5 +15,9 @@ import java.util.Date; ...@@ -15,5 +15,9 @@ import java.util.Date;
*/ */
@Data @Data
public class CheckGoworkRecordVo extends BaseEntityLong { public class CheckGoworkRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
} }
\ No newline at end of file
...@@ -15,5 +15,9 @@ import java.util.Date; ...@@ -15,5 +15,9 @@ import java.util.Date;
*/ */
@Data @Data
public class CheckOtherRecordVo extends BaseEntityLong { public class CheckOtherRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
} }
\ No newline at end of file
...@@ -15,5 +15,9 @@ import java.util.Date; ...@@ -15,5 +15,9 @@ import java.util.Date;
*/ */
@Data @Data
public class CheckReviewRecordVo extends BaseEntityLong { public class CheckReviewRecordVo extends BaseEntityLong {
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
} }
\ No newline at end of file
package com.mortals.xhx.module.check.web; package com.mortals.xhx.module.check.web;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
...@@ -71,7 +72,6 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -71,7 +72,6 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName()))); this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream() Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)); .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
...@@ -88,6 +88,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -88,6 +88,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
} else { } else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
}
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
} }
......
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