From fb77df0ca8e32bf05286b33f0696afc884cf9b01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 11:58:38 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 3 +++
admin/src/views/business/visits.vue | 18 +++++++++---------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 8 +++++---
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 7b03f38..34e4ca2 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -68,15 +68,15 @@
<el-table-column prop="status" fixed="right" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span style="color: rgba(245, 154, 35, 0.996);" v-if="row.status === 0">寰呮彁浜ゅ鎵�</span>
- <span v-if="row.status === 1">瀹℃壒涓�</span>
- <span v-if="row.status === 2">瀹℃牳閫氳繃</span>
- <span style="color: red;" v-if="row.status === 3">瀹℃牳涓嶉�氳繃</span>
- <span v-if="row.status === 4">鍙栨秷</span>
- <span v-if="row.status === 5">棰勭害鎴愬姛</span>
- <span v-if="row.status === 6">棰勭害澶辫触</span>
- <span v-if="row.status === 7">鎷滆涓�</span>
- <span v-if="row.status === 8">宸茬绂�</span>
- <span v-if="row.status === 9">宸插け鏁�</span>
+ <span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996);">瀹℃壒涓�</span>
+ <span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996);">瀹℃牳閫氳繃</span>
+ <span style="color: gray;" v-if="row.status === 3" >瀹℃牳涓嶉�氳繃</span>
+ <span v-if="row.status === 4" style="color: gray">鍙栨秷</span>
+ <span v-if="row.status === 5" style="color: green">棰勭害鎴愬姛</span>
+ <span v-if="row.status === 6" style="color: gray">棰勭害澶辫触</span>
+ <span v-if="row.status === 7" style="color: green">鎷滆涓�</span>
+ <span v-if="row.status === 8" style="color: red">宸茬绂�</span>
+ <span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
</template>
</el-table-column>
<el-table-column
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 7bfc9df..39632b7 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
@@ -266,6 +266,9 @@
@ApiModelProperty(value = "鍏抽敭瀛�,濮撳悕/鎵嬫満鍙�")
@TableField(exist = false)
private String keyWords;
+ @ApiModelProperty(value = "鍏徃/缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
@ApiModelProperty(value = "浜哄憳绫诲瀷")
@TableField(exist = false)
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 ed3919c..aefed9d 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
@@ -374,21 +374,23 @@
.selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
.selectAs(Device::getName,DeviceEventDTO::getDevName)
.selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
- queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords())
- .like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords())
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->
+ w.like(Member::getName,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,pageWrap.getModel().getKeyWords()))
.eq(StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),
Member::getType,
pageWrap.getModel().getPersonType())
.eq(Objects.nonNull(pageWrap.getModel().getEventType()),
DeviceEvent::getEventType,
pageWrap.getModel().getEventType())
+ .like(Objects.nonNull(pageWrap.getModel().getCompanyName()),Company::getName,
+ pageWrap.getModel().getCompanyName())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
DeviceEvent::getCreateDate,
pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
DeviceEvent::getCreateDate,
pageWrap.getModel().getEndTime())
- .isNull(!StringUtils.isNotBlank(pageWrap.getModel().getPersonType()) && !StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),Member::getId)//闄や簡鍐呴儴浜哄憳閮芥槸澶栨潵璁垮
+ .isNull(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()) && !StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),Member::getId)//闄や簡鍐呴儴浜哄憳閮芥槸澶栨潵璁垮
.orderByDesc(DeviceEvent::getCreateDate);
queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
--
Gitblit v1.9.3