From 333e9560acba5665f8290152cc38da1127f86dfb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 31 十二月 2024 14:39:39 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 7 +++++++
admin/src/views/vehicle/driver.vue | 10 ++++++----
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 15 +++++++++++++++
server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java | 1 +
4 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/vehicle/driver.vue b/admin/src/views/vehicle/driver.vue
index 6f5ccd0..cf19c1e 100644
--- a/admin/src/views/vehicle/driver.vue
+++ b/admin/src/views/vehicle/driver.vue
@@ -3,8 +3,10 @@
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
</QueryForm>
<el-table v-loading="loading" :data="list" stripe row-key="id" class="mb20" default-expand-all>
+ <el-table-column prop="username" label="鐧诲綍璐﹀彿" min-width="100"></el-table-column>
<el-table-column prop="realname" label="濮撳悕" min-width="100"></el-table-column>
- <el-table-column prop="mobile" label="鎵嬫満鍙�" min-width="100"></el-table-column>
+ <el-table-column prop="openid" label="寰俊openid" min-width="100px"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" sortable="custom" sort-by="CREATE_TIME" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
@@ -13,7 +15,7 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { fetchList } from '@/api/system/user.js'
+import { pageDriverList } from '@/api/system/user.js'
export default {
components: {
QueryForm,
@@ -53,10 +55,10 @@
getList(page) {
const { filters, pagination } = this
pagination.page = page || pagination.page
- fetchList({
+ pageDriverList({
model: {
...filters,
- memberType: 0
+ type: 0
},
...pagination
}).then(res => {
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
index 882d368..977d9a4 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
@@ -111,6 +111,13 @@
return ApiResponse.success(systemUserService.findPage(pageWrap));
}
+ @ApiOperation("鍒嗛〉鏌ヨ鍙告満鍒楄〃")
+ @PostMapping("/pageDriver")
+ @CloudRequiredPermission("system:user:query")
+ public ApiResponse<PageData<SystemUser>> findDriverPage (@RequestBody PageWrap<SystemUser> pageWrap) {
+ return ApiResponse.success(systemUserService.findDriverPage(pageWrap));
+ }
+
@ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�")
@PostMapping("/findAllList")
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
index b59b242..3440f15 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
@@ -80,6 +80,7 @@
* @date 2023/03/21 14:49
*/
PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap);
+ PageData<SystemUser> findDriverPage(PageWrap<SystemUser> pageWrap);
List<SystemUser> findAllList(SystemUser pageWrap);
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index c6f6dba..fbdccaa 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -163,6 +165,19 @@
}
return PageData.from(new PageInfo<>(userList));
}
+ @Override
+ public PageData<SystemUser> findDriverPage(PageWrap<SystemUser> pageWrap) {
+ IPage<SystemUser> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<SystemUser> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.lambda()
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getRealname()),SystemUser::getRealname,pageWrap.getModel().getRealname())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getMobile()),SystemUser::getMobile,pageWrap.getModel().getMobile())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),SystemUser::getUsername,pageWrap.getModel().getUsername())
+ .eq( pageWrap.getModel().getType()!=null,SystemUser::getType,pageWrap.getModel().getType())
+ .eq (SystemUser::getDeleted,Constants.ZERO);
+ return PageData.from(systemUserMapper.selectPage(page, queryWrapper));
+ }
@Override
public long count(SystemUser systemUser) {
--
Gitblit v1.9.3