|
@@ -116,12 +116,20 @@ public class WfRoomStayOvernightController {
|
|
|
|
|
|
}
|
|
|
|
|
|
- @GetMapping("/export")
|
|
|
+ @PostMapping ("/export")
|
|
|
@ApiOperation(value = "导出")
|
|
|
- public ResponseEntity<byte[]> exportData(@Valid WfRoomStayOvernightPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
|
|
|
+ public ResponseEntity<byte[]> exportData(@Valid @RequestBody WfRoomStayOvernightPageDto dto) {
|
|
|
MPJLambdaWrapper<WfRoomStayOvernight> queryWrapper = new MPJLambdaWrapper<>();
|
|
|
queryWrapper
|
|
|
.disableSubLogicDel()
|
|
|
+
|
|
|
+ .like(ObjectUtil.isNotNull(dto.getUserName()),"t1.name",dto.getUserName())
|
|
|
+ .like(ObjectUtil.isNotNull(dto.getClassName()),WfRoomStayOvernight::getClassName,dto.getClassName())
|
|
|
+ .like(ObjectUtil.isNotNull(dto.getGenderName()),WfRoomStayOvernight::getGenderName,dto.getGenderName())
|
|
|
+ .like(ObjectUtil.isNotNull(dto.getStudentId()),WfRoomStayOvernight::getStudentId,dto.getStudentId())
|
|
|
+ .ge(ObjectUtil.isNotNull(dto.getStartTime()),WfRoomStayOvernight::getStartTime,dto.getStartTime())
|
|
|
+ .le(ObjectUtil.isNotNull(dto.getEndTime()),WfRoomStayOvernight::getEndTime,dto.getEndTime())
|
|
|
+
|
|
|
.leftJoin(XjrUser.class,XjrUser::getId,WfRoomStayOvernight::getApplicantUserId,ext1->ext1
|
|
|
.selectAs(XjrUser::getName,WfRoomStayOvernightVo::getApplicantUserIdCN))
|
|
|
.leftJoin(XjrUser.class,XjrUser::getId,WfRoomStayOvernight::getHeadTeacherId,ext2->ext2
|