From 30b2d11d595dbb99853541c8f86be5220daf58d0 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期三, 13 十二月 2023 18:08:23 +0800
Subject: [PATCH] 在场人员信息
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 8 +++++---
server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java | 9 +++++----
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java | 4 ++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 18 +++++++-----------
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java | 6 +++---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 4 ++--
6 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
index 66d4e3c..4b2ceb3 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
+++ b/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")
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
index 644ef3b..db7e471 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
+++ b/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);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java
index 46d1ac2..92c86c5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java
+++ b/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;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
index 5b12a06..6aa798f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
+++ b/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;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index 93c504e..d7f68dc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/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);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 6339165..1f1714e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/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);
--
Gitblit v1.9.3