From 467d562d63e54d6dba1449734f83e969b7b67932 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 十月 2024 19:09:28 +0800
Subject: [PATCH] 最新版本
---
admin/src/components/business/OperaMemberWindow.vue | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 ++++
admin/src/views/business/relativeMember.vue | 2 +-
admin/src/components/business/OperaPositionWindow.vue | 2 +-
admin/src/views/business/position.vue | 6 +++---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 2 ++
admin/src/api/business/position.js | 8 ++++++--
admin/src/views/business/internalMember.vue | 4 ++--
8 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/admin/src/api/business/position.js b/admin/src/api/business/position.js
index bbf959c..1c01d21 100644
--- a/admin/src/api/business/position.js
+++ b/admin/src/api/business/position.js
@@ -2,12 +2,16 @@
// 鏌ヨ
-export function fetchList (data) {
+export function allList (data) {
return request.post('/visitsAdmin/cloudService/business/position/list', data, {
trim: true
})
}
-
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/position/page', data, {
+ trim: true
+ })
+}
// 鍒涘缓
export function create (data) {
return request.post('/visitsAdmin/cloudService/business/position/create', data)
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index 7b12553..c38445d 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -67,7 +67,7 @@
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { checkMobile, validIdCardNo, validIdCardNoNew } from '@/utils/form'
-import { fetchList as positionList } from '@/api/business/position'
+import { allList } from '@/api/business/position'
export default {
name: 'OperaCompanyWindow',
extends: BaseOpera,
@@ -166,7 +166,7 @@
})
},
getPositionList () {
- positionList({})
+ allList({})
.then(res => {
this.positionList = res
})
diff --git a/admin/src/components/business/OperaPositionWindow.vue b/admin/src/components/business/OperaPositionWindow.vue
index 541c67c..975c67d 100644
--- a/admin/src/components/business/OperaPositionWindow.vue
+++ b/admin/src/components/business/OperaPositionWindow.vue
@@ -47,7 +47,7 @@
},
created () {
this.config({
- api: '/business/',
+ api: '/business/position',
'field.id': 'id'
})
},
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index a8cd27e..bfea847 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -207,7 +207,7 @@
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchList } from '@/api/business/company'
-import { fetchList as alllist } from '@/api/business/position'
+import { allList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
@@ -267,7 +267,7 @@
this.$refs.OperaMemberRoleWindow.open('鍐呴儴鍛樺伐涓嬪彂鏉冮檺', ids, names, this.searchForm.companyType)
},
getPositionList () {
- alllist({})
+ allList({})
.then(res => {
this.positionList = res
})
diff --git a/admin/src/views/business/position.vue b/admin/src/views/business/position.vue
index 3f48eea..36ce1dd 100644
--- a/admin/src/views/business/position.vue
+++ b/admin/src/views/business/position.vue
@@ -1,5 +1,5 @@
<template>
- <TableLayout :permissions="['business:member:query']">
+ <TableLayout :permissions="['business:position:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
<el-form-item label="" prop="name">
@@ -56,14 +56,14 @@
import Pagination from '@/components/common/Pagination'
import OperaPositionWindow from '@/components/business/OperaPositionWindow'
export default {
- name: 'areaSet',
+ name: 'userPosition',
extends: BaseTable,
components: { TableLayout, Pagination, OperaPositionWindow },
data () {
return {
// 鎼滅储
searchForm: {
- title: ''
+ name: ''
}
}
},
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index f5a6676..d2c0841 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -214,7 +214,7 @@
import OperaTrainTimeImportWindow from '@/components/business/OperaTrainTimeImportWindow'
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import { fetchList } from '@/api/business/company'
-import { fetchList as positionList } from '@/api/business/position'
+import { allList as positionList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index 8288b21..7f89081 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -59,6 +59,8 @@
@ApiModelProperty(value = "鎿嶄綔浜哄憳 ")
private Integer createrId;
+ @ApiModelProperty(value = "宀椾綅ID")
+ private Integer positionId;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 2418a69..0166be6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1222,6 +1222,9 @@
if (pageWrap.getModel().getName() != null) {
queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
}
+ if (pageWrap.getModel().getPositionId() != null) {
+ queryWrapper.lambda().eq(Member::getPositionId, pageWrap.getModel().getPositionId());
+ }
if (pageWrap.getModel().getBirthday() != null) {
queryWrapper.lambda().ge(Member::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
queryWrapper.lambda().le(Member::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
@@ -1376,6 +1379,7 @@
.eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
.eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())
+ .eq(Objects.nonNull(pageWrap.getModel().getPositionId()),Member::getPositionId,pageWrap.getModel().getPositionId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
--
Gitblit v1.9.3