From 9fc3cec0d40c86b8b4a8e34dcf7a82645ccbd192 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 11:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 3 +--
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 17 +++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java | 4 ++--
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 5 +++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 17 +++++++----------
6 files changed, 31 insertions(+), 17 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 4b2ceb3..a3000e6 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,7 +6,6 @@
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;
@@ -72,7 +71,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
//@RequiresPermissions("business:deviceevent:query")
- public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEventQuery> pageWrap) {
+ public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap) {
return ApiResponse.success(deviceEventService.findDeviceEventDTOPage(pageWrap));
}
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 92c86c5..46d1ac2 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 String startTime;
+ private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private String endTime;
+ private Date endTime;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 9937cff..9f9dab2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -258,4 +258,21 @@
@ExcelColumn(name="閫氶亾鎬婚�氳浜烘暟")
private Integer totalTimes;
+
+ // 鏉′欢鏌ヨ鍙傛暟
+ @ApiModelProperty(value = "鍏抽敭瀛�,濮撳悕/鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String keyWords;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ @TableField(exist = false)
+ private String personType;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endTime;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
index 931e469..322790e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
@@ -103,5 +103,5 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<DeviceEvent>
*/
- PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap);
+ PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap);
}
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 d7f68dc..6b0577f 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
@@ -286,7 +286,7 @@
}
@Override
- public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap) {
+ public PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap) {
IPage<DeviceEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -298,19 +298,16 @@
boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈鑻辨枃
boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
- queryWrapper.leftJoin(Member.class,Member::getId,DeviceEvent::getExtEventPersonNo)
+ queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.selectAll(DeviceEvent.class)
.selectAs(Member::getName,DeviceEventDTO::getPersonName)
+ .selectAs(Member::getType,DeviceEventDTO::getPersonType)
.selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
.selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
.selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
- queryWrapper.like(number,
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like((b||hasWord),
- Member::getName,
- pageWrap.getModel().getKeyWords())
+ queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords())
.eq(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()),
Member::getType,
pageWrap.getModel().getPersonType())
@@ -319,10 +316,10 @@
pageWrap.getModel().getEventType())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
DeviceEvent::getCreateDate,
- pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00")
+ pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
DeviceEvent::getCreateDate,
- pageWrap.getModel().getEndTime() == null?"":pageWrap.getModel().getEndTime()+" 23:59:59");
+ pageWrap.getModel().getEndTime());
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 f2006a3..14d23b5 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
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -209,9 +210,9 @@
Company::getName,
pageWrap.getModel().getCompanyName())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
- Retention::getEventDate, pageWrap.getModel().getStartTime())
+ Retention::getEventDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- Retention::getEventDate, pageWrap.getModel().getEndTime());
+ Retention::getEventDate,pageWrap.getModel().getStartTime());
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
return PageData.from(retentionIPage);
--
Gitblit v1.9.3