server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
@@ -6,6 +6,8 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; import com.doumee.dao.admin.request.DeviceEventQuery; import com.doumee.dao.admin.response.DeviceEventDTO; import com.doumee.dao.business.model.DeviceEvent; import com.doumee.service.business.DeviceEventService; import io.swagger.annotations.Api; @@ -69,9 +71,9 @@ @ApiOperation("分页查询") @PostMapping("/page") @RequiresPermissions("business:deviceevent:query") public ApiResponse<PageData<DeviceEvent>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) { return ApiResponse.success(deviceEventService.findPage(pageWrap)); //@RequiresPermissions("business:deviceevent:query") public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEventQuery> pageWrap) { return ApiResponse.success(deviceEventService.findDeviceEventDTOPage(pageWrap)); } @ApiOperation("导出Excel") server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
@@ -6,6 +6,7 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; import com.doumee.dao.admin.request.RetentionQuery; import com.doumee.dao.business.model.Retention; import com.doumee.service.business.RetentionService; import io.swagger.annotations.Api; @@ -69,14 +70,14 @@ @ApiOperation("分页查询") @PostMapping("/page") @RequiresPermissions("business:retention:query") public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap) { return ApiResponse.success(retentionService.findPage(pageWrap)); //@RequiresPermissions("business:retention:query") public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<RetentionQuery> pageWrap) { return ApiResponse.success(retentionService.findTrainTimePage(pageWrap)); } @ApiOperation("导出Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:retention:exportExcel") //@RequiresPermissions("business:retention:exportExcel") public void exportExcel (@RequestBody PageWrap<Retention> pageWrap, HttpServletResponse response) { ExcelExporter.build(Retention.class).export(retentionService.findPage(pageWrap).getRecords(), "在厂人员信息 表（滞留）", response); } server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java
@@ -27,9 +27,9 @@ private String eventType; @ApiModelProperty(value = "开始时间") private Date startTime; private String startTime; @ApiModelProperty(value = "结束时间") private Date endTime; private String endTime; } server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
@@ -20,11 +20,11 @@ private String companyName; @ApiModelProperty(value = "人员类型") private Integer type; private String type; @ApiModelProperty(value = "开始时间") private Date startTime; private String startTime; @ApiModelProperty(value = "结束时间") private Date endTime; private String endTime; } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -319,10 +319,10 @@ pageWrap.getModel().getEventType()) .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), DeviceEvent::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartTime())) pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00") .le(Objects.nonNull(pageWrap.getModel().getEndTime()), DeviceEvent::getCreateDate, Utils.Date.getDayEnd(pageWrap.getModel().getEndTime())); pageWrap.getModel().getEndTime() == null?"":pageWrap.getModel().getEndTime()+" 23:59:59"); queryWrapper.orderByDesc(DeviceEvent::getHappenTime); IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper); return PageData.from(deviceEventDTOIPage); server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -197,27 +197,23 @@ IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId) .leftJoin(Member.class,Member::getId,Retention::getMemberId) .leftJoin(DeviceEvent.class,DeviceEvent::getEventId,Retention::getEventCode); queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId); queryWrapper.selectAll(Retention.class) .selectAs(Company::getName,Retention::getCompanyName) .selectAs(Member::getType,Retention::getMemberType) .selectAs(DeviceEvent::getSrcName,Retention::getSrcName); queryWrapper.like(number,Member::getPhone,pageWrap.getModel().getKeyWords()) .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords()) .selectAs(Company::getName,Retention::getCompanyName); queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords()) .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords()) .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, Retention::getType, pageWrap.getModel().getType()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), Company::getName, pageWrap.getModel().getCompanyName()) .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), Retention::getEventDate, Utils.Date.getStart(pageWrap.getModel().getStartTime())) pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00") .le(Objects.nonNull(pageWrap.getModel().getEndTime()), Retention::getEventDate, Utils.Date.getDayEnd(pageWrap.getModel().getEndTime())); pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getEndTime()+" 23:59:59"); queryWrapper.orderByDesc(Retention::getCreateDate); IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper); return PageData.from(retentionIPage);
