From 89a874ad57ff876070bd9a032cd9113facadb758 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 15:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 43 ++++++++++++---------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 11 +++++
server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java | 7 ++-
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java | 27 +++++++++++++
8 files changed, 70 insertions(+), 26 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
index 574e4e3..f48a563 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.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.response.CarEventDTO;
import com.doumee.dao.business.model.CarEvent;
import com.doumee.service.business.CarEventService;
import io.swagger.annotations.Api;
@@ -69,9 +70,9 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:carevent:query")
- public ApiResponse<PageData<CarEvent>> findPage (@RequestBody PageWrap<CarEvent> pageWrap) {
- return ApiResponse.success(carEventService.findPage(pageWrap));
+ //@RequiresPermissions("business:carevent:query")
+ public ApiResponse<PageData<CarEventDTO>> findPage (@RequestBody PageWrap<CarEvent> pageWrap) {
+ return ApiResponse.success(carEventService.findVisitCarPage(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 db7e471..227bfc4 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
@@ -71,7 +71,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
//@RequiresPermissions("business:retention:query")
- public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<RetentionQuery> pageWrap) {
+ public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap) {
return ApiResponse.success(retentionService.findTrainTimePage(pageWrap));
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
index 0e5319e..8ea4fb6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -71,6 +72,10 @@
@ApiModelProperty(value = "浜嬩欢绫诲瀷")
@ExcelColumn(name="浜嬩欢绫诲瀷")
private Integer eventType;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷鍚嶇О")
+ @TableField(exist = false)
+ private String eventTypeName;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
@ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂 1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
@@ -216,4 +221,26 @@
@ExcelColumn(name="鍥剧墖鏈嶅姟鍣ㄧ紪鍙� ")
private String svrIndex;
+
+ // 鏉′欢鏌ヨ鍙傛暟
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String keyWords;
+
+ @ApiModelProperty(value = "鍏徃/閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ @TableField(exist = false)
+ private String memberType;
+
+ @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/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 37ec7ac..62fb83f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -120,4 +120,15 @@
@TableField(exist = false)
public String companyName;
+
+ // 鏉′欢鏌ヨ鍙傛暟
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ private String keyWords;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
index 070ea84..fdeb761 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
@@ -102,5 +102,5 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<CarEvent>
*/
- PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap);
+ PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
index 58d4563..61487de 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
@@ -99,5 +99,5 @@
long count(Retention retention);
- PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap);
+ PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 4412954..460c1d2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹炵幇
@@ -263,7 +264,7 @@
}
@Override
- public PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap) {
+ public PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -284,24 +285,28 @@
.selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
.selectAs(Member::getName,CarEventDTO::getPersonName)
.selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
- CarEvent::getCardNo,
- pageWrap.getModel().getCarNo())
- .like(number,
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like((b || hasWord),
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
- Company::getName,
- pageWrap.getModel().getCompanyName())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
- Member::getType,
- pageWrap.getModel().getMemberType())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
- CarEvent::getSrcType,
- pageWrap.getModel().getSrcType());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
+ CarEvent::getPlateNos,
+ pageWrap.getModel().getPlateNos())
+ .like(number,
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b || hasWord),
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
+ Member::getType,
+ pageWrap.getModel().getMemberType())
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
+ CarEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
return PageData.from(carEventDTOIPage);
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 14d23b5..8468395 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
@@ -186,7 +186,7 @@
}
@Override
- public PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap) {
+ public PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
--
Gitblit v1.9.3