Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
3905eb76
提交
3905eb76
编写于
5月 28, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
d3d4bbe6
变更
31
隐藏空白字符变更
内嵌
并排
正在显示
31 个修改的文件
包含
1117 行增加
和
66 行删除
+1117
-66
app-form-druipart.vue
...eb/src/components/app-form-druipart/app-form-druipart.vue
+2
-1
ouindex-view-appmenu.ts
...src/mock/app/ouindex-view-appmenu/ouindex-view-appmenu.ts
+2
-2
ibzdept-members.ts
app_web/src/mock/entity/ibzdept-members/ibzdept-members.ts
+542
-0
ibzdept-member-grid-view-base.vue
...bzdept-member-grid-view/ibzdept-member-grid-view-base.vue
+3
-3
router.ts
app_web/src/pages/ou/ouindex-view/router.ts
+112
-0
ibzdepartment-service-base.ts
...b/src/service/ibzdepartment/ibzdepartment-service-base.ts
+50
-0
ibzdept-member-service-base.ts
...src/service/ibzdept-member/ibzdept-member-service-base.ts
+68
-0
ouindex-view-appmenu-base.vue
...ts/app/ouindex-view-appmenu/ouindex-view-appmenu-base.vue
+6
-6
ouindex-view-appmenu-model.ts
...ts/app/ouindex-view-appmenu/ouindex-view-appmenu-model.ts
+4
-4
edit-grid-grid-base.vue
...gets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
+3
-2
main-grid-base.vue
...eb/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
+3
-2
main-grid-base.vue
...b/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
+3
-2
edit-grid-grid-base.vue
...idgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
+3
-2
main-form-base.vue
app_web/src/widgets/ibzemployee/main-form/main-form-base.vue
+1
-1
main-grid-base.vue
app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
+3
-2
main-grid-base.vue
.../src/widgets/ibzorganization/main-grid/main-grid-base.vue
+3
-2
config.xml
config.xml
+0
-5
Dockerfile
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
+1
-1
ibzou-app-web.yaml
ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
+1
-13
IBZDepartment.java
...rc/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java
+6
-2
IBZDeptMember.java
...rc/main/java/cn/ibizlab/core/ou/domain/IBZDeptMember.java
+6
-2
IBZEmployee.java
.../src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java
+6
-2
IBZOrganization.java
.../main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java
+6
-2
IBZDepartmentSearchContext.java
...cn/ibizlab/core/ou/filter/IBZDepartmentSearchContext.java
+1
-1
IBZDeptMemberSearchContext.java
...cn/ibizlab/core/ou/filter/IBZDeptMemberSearchContext.java
+1
-1
IBZEmployeeSearchContext.java
...a/cn/ibizlab/core/ou/filter/IBZEmployeeSearchContext.java
+1
-1
IBZOrganizationSearchContext.java
.../ibizlab/core/ou/filter/IBZOrganizationSearchContext.java
+1
-1
IBZDeptMemberResource.java
.../main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
+264
-0
QueryBuildContext.java
...c/main/java/cn/ibizlab/util/filter/QueryBuildContext.java
+5
-2
QueryWrapperContext.java
...main/java/cn/ibizlab/util/filter/QueryWrapperContext.java
+5
-2
SearchContextBase.java
...c/main/java/cn/ibizlab/util/filter/SearchContextBase.java
+5
-2
未找到文件。
app_web/src/components/app-form-druipart/app-form-druipart.vue
浏览文件 @
3905eb76
...
...
@@ -240,7 +240,7 @@ export default class AppFormDRUIPart extends Vue {
}
const
formData
:
any
=
data
?
data
:
JSON
.
parse
(
this
.
data
);
const
_paramitem
=
formData
[
this
.
paramItem
];
let
viewdata
=
{
srfparentdename
:
this
.
parentName
,
srfparentkey
:
_paramitem
};
let
viewdata
=
{};
Object
.
assign
(
viewdata
,
this
.
$viewTool
.
getIndexViewParam
());
const
_parameters
:
any
[]
=
[...
this
.
$viewTool
.
getIndexParameters
(),
...
this
.
parameters
];
_parameters
.
forEach
((
parameter
:
any
)
=>
{
...
...
@@ -252,6 +252,7 @@ export default class AppFormDRUIPart extends Vue {
Object
.
assign
(
viewdata
,
{
[
this
.
paramItem
]:
_paramitem
});
//设置顶层视图唯一标识
Object
.
assign
(
viewdata
,
this
.
context
);
Object
.
assign
(
viewdata
,{
srfparentdename
:
this
.
parentName
,
srfparentkey
:
_paramitem
});
this
.
viewdata
=
JSON
.
stringify
(
viewdata
);
this
.
viewparam
=
JSON
.
stringify
(
this
.
viewparams
);
if
(
this
.
isRelationalData
)
{
...
...
app_web/src/mock/app/ouindex-view-appmenu/ouindex-view-appmenu.ts
浏览文件 @
3905eb76
...
...
@@ -43,7 +43,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
iconcls
:
'fa fa-sitemap'
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'
_3
'
,
appfunctag
:
'
Auto5
'
,
resourcetag
:
''
,
},
{
...
...
@@ -61,7 +61,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
iconcls
:
'fa fa-user'
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'
_2
'
,
appfunctag
:
'
Auto4
'
,
resourcetag
:
''
,
},
],
...
...
app_web/src/mock/entity/ibzdept-members/ibzdept-members.ts
浏览文件 @
3905eb76
...
...
@@ -146,6 +146,35 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
});
// Select
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
select$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Select"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'orgid'
,
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
select$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
let
_items
=
items
.
find
((
item
:
any
)
=>
Object
.
is
(
item
.
memberid
,
tempValue
.
memberid
));
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
_items
);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
_items
];
});
// Select
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
select$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Select"
);
...
...
@@ -203,6 +232,35 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
return
[
status
,
_items
];
});
// Select
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
select$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Select"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
select$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
let
_items
=
items
.
find
((
item
:
any
)
=>
Object
.
is
(
item
.
memberid
,
tempValue
.
memberid
));
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
_items
);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
_items
];
});
// Select
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
select$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Select"
);
...
...
@@ -286,6 +344,33 @@ mock.onPut(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
});
// Update
mock
.
onPut
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Update"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'orgid'
,
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Update
mock
.
onPut
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Update"
);
...
...
@@ -338,6 +423,33 @@ mock.onPut(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
console
.
groupEnd
();
return
[
status
,
{}];
});
// Update
mock
.
onPut
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Update"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Update
mock
.
onPut
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})
$/
)).
reply
((
config
:
any
)
=>
{
...
...
@@ -432,6 +544,33 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemploye
});
// Create
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Create"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'orgid'
,
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Create
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Create"
);
...
...
@@ -484,6 +623,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
console
.
groupEnd
();
return
[
status
,
{}];
});
// Create
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Create"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Create
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})
$/
)).
reply
((
config
:
any
)
=>
{
...
...
@@ -566,6 +732,33 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemploye
});
// Save
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
save$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Save"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'orgid'
,
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
save$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Save
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
save$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Save"
);
...
...
@@ -618,6 +811,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
console
.
groupEnd
();
return
[
status
,
{}];
});
// Save
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
save$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Save"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
save$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// Save
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
save$/
)).
reply
((
config
:
any
)
=>
{
...
...
@@ -692,6 +912,23 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
});
// GetDraft
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
getdraft$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: GetDraft"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
// GetDraft
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// GetDraft
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
getdraft$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: GetDraft"
);
...
...
@@ -725,6 +962,23 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
return
[
status
,
{}];
});
// GetDraft
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
getdraft$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: GetDraft"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
// GetDraft
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// GetDraft
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/
getdraft$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: GetDraft"
);
...
...
@@ -749,6 +1003,10 @@ mock.onGet(new RegExp(/^\/ibzdeptmembers\/getdraft$/)).reply((config: any) => {
// CheckKey
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
checkkey$/
)).
reply
((
config
:
any
)
=>
{
...
...
@@ -804,6 +1062,33 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemploye
});
// CheckKey
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
checkkey$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: CheckKey"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'orgid'
,
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
checkkey$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// CheckKey
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
checkkey$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: CheckKey"
);
...
...
@@ -856,6 +1141,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
console
.
groupEnd
();
return
[
status
,
{}];
});
// CheckKey
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
checkkey$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: CheckKey"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
checkkey$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
({});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
{}];
});
// CheckKey
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
checkkey$/
)).
reply
((
config
:
any
)
=>
{
...
...
@@ -986,6 +1298,51 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
});
// FetchDefault
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
fetchdefault$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: FetchDefault"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'orgid'
,
'deptid'
];
let
tempValue
:
any
=
{};
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
fetchdefault$/
).
exec
(
config
.
url
);
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
if
(
items
.
length
>
0
&&
paramArray
.
length
>
0
)
{
paramArray
.
forEach
((
paramkey
:
any
)
=>
{
if
(
tempValue
[
paramkey
]
&&
tempValue
[
paramkey
].
indexOf
(
";"
)
>
0
)
{
let
keysGrounp
:
Array
<
any
>
=
tempValue
[
paramkey
].
split
(
new
RegExp
(
/
[\;]
/
));
let
tempArray
:
Array
<
any
>
=
[];
keysGrounp
.
forEach
((
singlekey
:
any
)
=>
{
let
_items
=
items
.
filter
((
item
:
any
)
=>
{
return
item
[
paramkey
]
==
singlekey
});
if
(
_items
.
length
>
0
){
tempArray
.
push
(...
_items
);
}
})
items
=
tempArray
;
}
else
{
items
=
items
.
filter
((
item
:
any
)
=>
{
return
item
[
paramkey
]
==
tempValue
[
paramkey
]
});
}
})
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
items
);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
items
];
});
// FetchDefault
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
fetchdefault$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: FetchDefault"
);
...
...
@@ -1074,6 +1431,51 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
console
.
groupEnd
();
return
[
status
,
items
];
});
// FetchDefault
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
fetchdefault$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: FetchDefault"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'deptid'
];
let
tempValue
:
any
=
{};
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
fetchdefault$/
).
exec
(
config
.
url
);
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
if
(
items
.
length
>
0
&&
paramArray
.
length
>
0
)
{
paramArray
.
forEach
((
paramkey
:
any
)
=>
{
if
(
tempValue
[
paramkey
]
&&
tempValue
[
paramkey
].
indexOf
(
";"
)
>
0
)
{
let
keysGrounp
:
Array
<
any
>
=
tempValue
[
paramkey
].
split
(
new
RegExp
(
/
[\;]
/
));
let
tempArray
:
Array
<
any
>
=
[];
keysGrounp
.
forEach
((
singlekey
:
any
)
=>
{
let
_items
=
items
.
filter
((
item
:
any
)
=>
{
return
item
[
paramkey
]
==
singlekey
});
if
(
_items
.
length
>
0
){
tempArray
.
push
(...
_items
);
}
})
items
=
tempArray
;
}
else
{
items
=
items
.
filter
((
item
:
any
)
=>
{
return
item
[
paramkey
]
==
tempValue
[
paramkey
]
});
}
})
}
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
items
);
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
items
];
});
// FetchDefault
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/
fetchdefault$/
)).
reply
((
config
:
any
)
=>
{
...
...
@@ -1126,15 +1528,27 @@ mock.onGet(new RegExp(/^\/ibzdeptmembers\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
...
...
@@ -1153,8 +1567,10 @@ mock.onGet(new RegExp(/^\/ibzdeptmembers\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
...
...
@@ -1162,15 +1578,29 @@ mock.onGet(new RegExp(/^\/ibzdeptmembers\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
...
...
@@ -1239,6 +1669,34 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
return
[
status
,
_items
?
_items
:{}];
});
// Get
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Get"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'orgid'
,
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
let
_items
=
items
.
find
((
item
:
any
)
=>
Object
.
is
(
item
.
memberid
,
tempValue
.
memberid
));
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
_items
?
_items
:{});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
_items
?
_items
:{}];
});
// Get
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Get"
);
...
...
@@ -1295,6 +1753,34 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
return
[
status
,
_items
?
_items
:{}];
});
// Get
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Get"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
let
_items
=
items
.
find
((
item
:
any
)
=>
Object
.
is
(
item
.
memberid
,
tempValue
.
memberid
));
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
_items
?
_items
:{});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
_items
?
_items
:{}];
});
// Get
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Get"
);
...
...
@@ -1379,6 +1865,34 @@ mock.onDelete(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemplo
return
[
status
,
_items
?
_items
:{}];
});
// Remove
mock
.
onDelete
(
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Remove"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'orgid'
,
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzorganizations
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
let
_items
=
items
.
find
((
item
:
any
)
=>
Object
.
is
(
item
.
memberid
,
tempValue
.
memberid
));
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
_items
?
_items
:{});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
_items
?
_items
:{}];
});
// Remove
mock
.
onDelete
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Remove"
);
...
...
@@ -1435,6 +1949,34 @@ mock.onDelete(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembe
return
[
status
,
_items
?
_items
:{}];
});
// Remove
mock
.
onDelete
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Remove"
);
console
.
table
({
url
:
config
.
url
,
method
:
config
.
method
,
data
:
config
.
data
});
let
status
=
MockAdapter
.
mockStatus
(
config
);
if
(
status
!==
200
)
{
return
[
status
,
null
];
}
const
paramArray
:
Array
<
any
>
=
[
'deptid'
,
'memberid'
];
const
matchArray
:
any
=
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
).
exec
(
config
.
url
);
let
tempValue
:
any
=
{};
if
(
matchArray
&&
matchArray
.
length
>
1
&&
paramArray
&&
paramArray
.
length
>
0
){
paramArray
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
}
let
items
=
mockDatas
?
mockDatas
:
[];
let
_items
=
items
.
find
((
item
:
any
)
=>
Object
.
is
(
item
.
memberid
,
tempValue
.
memberid
));
console
.
groupCollapsed
(
"response数据 status: "
+
status
+
" data: "
);
console
.
table
(
_items
?
_items
:{});
console
.
groupEnd
();
console
.
groupEnd
();
return
[
status
,
_items
?
_items
:{}];
});
// Remove
mock
.
onDelete
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Remove"
);
...
...
app_web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue
浏览文件 @
3905eb76
...
...
@@ -882,7 +882,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
'resAppKey'
:
'userid'
},
{
view
:{
viewname
:
'ibzdepartment-mpickup-view'
,
height
:
0
,
width
:
0
,
title
:
'部门数据多项选择视图'
},
res
:[
'IBZDepartment'
],
'resAppKey'
:
''
}
'resAppKey'
:
'
userid
'
}
];
if
(
batchAddPSAppViews
.
length
==
0
||
!
this
.
context
.
srfparentdename
){
this
.
$Notice
.
warning
({
title
:
'错误'
,
desc
:
'批量添加需添加N:N关系'
});
...
...
@@ -940,9 +940,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
Object
.
assign
(
curViewParam
,
args
[
0
]);
}
let
deResParameters
:
any
[]
=
[];
if
(
curViewParam
.
ibz
employee
&&
true
){
if
(
curViewParam
.
ibz
department
&&
true
){
deResParameters
=
[
{
pathName
:
'ibz
employees'
,
parameterName
:
'ibzemployee
'
},
{
pathName
:
'ibz
departments'
,
parameterName
:
'ibzdepartment
'
},
]
}
const
parameters
:
any
[]
=
[
...
...
app_web/src/pages/ou/ouindex-view/router.ts
浏览文件 @
3905eb76
...
...
@@ -366,6 +366,21 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
caption
:
'entities.ibzdeptmember.views.gridview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzdeptmembers'
,
parameterName
:
'ibzdeptmember'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
},
{
path
:
'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
...
...
@@ -395,6 +410,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
},
{
path
:
'ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
caption
:
'entities.ibzdeptmember.views.gridview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzdeptmembers'
,
parameterName
:
'ibzdeptmember'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
},
{
path
:
'ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
...
...
@@ -618,6 +647,21 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
caption
:
'entities.ibzdeptmember.views.editview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzdeptmembers'
,
parameterName
:
'ibzdeptmember'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
},
{
path
:
'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
...
...
@@ -647,6 +691,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
},
{
path
:
'ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
caption
:
'entities.ibzdeptmember.views.editview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzdeptmembers'
,
parameterName
:
'ibzdeptmember'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
},
{
path
:
'ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
...
...
@@ -1220,6 +1278,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
},
{
path
:
'/ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
caption
:
'entities.ibzdeptmember.views.editview.caption'
,
parameters
:
[
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzdeptmembers'
,
parameterName
:
'ibzdeptmember'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
},
{
path
:
'/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
...
...
@@ -1247,6 +1319,19 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
},
{
path
:
'/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
caption
:
'entities.ibzdeptmember.views.editview.caption'
,
parameters
:
[
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzdeptmembers'
,
parameterName
:
'ibzdeptmember'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
},
{
path
:
'/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
...
...
@@ -1288,6 +1373,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
},
{
path
:
'/ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
caption
:
'entities.ibzdeptmember.views.gridview.caption'
,
parameters
:
[
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzdeptmembers'
,
parameterName
:
'ibzdeptmember'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
},
{
path
:
'/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
...
...
@@ -1315,6 +1414,19 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
},
{
path
:
'/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
caption
:
'entities.ibzdeptmember.views.gridview.caption'
,
parameters
:
[
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzdeptmembers'
,
parameterName
:
'ibzdeptmember'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
},
{
path
:
'/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
...
...
app_web/src/service/ibzdepartment/ibzdepartment-service-base.ts
浏览文件 @
3905eb76
...
...
@@ -89,6 +89,21 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData
.
ibzemployees
=
ibzemployeesData
;
let
ibzdeptmembersData
:
any
=
[];
if
(
!
Object
.
is
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
),
'undefined'
)){
ibzdeptmembersData
=
JSON
.
parse
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
)
as
any
);
if
(
ibzdeptmembersData
&&
ibzdeptmembersData
.
length
&&
ibzdeptmembersData
.
length
>
0
){
ibzdeptmembersData
.
forEach
((
item
:
any
)
=>
{
if
(
item
.
srffrontuf
){
if
(
Object
.
is
(
item
.
srffrontuf
,
"0"
)){
item
.
memberid
=
null
;
}
delete
item
.
srffrontuf
;
}
});
}
}
masterData
.
ibzdeptmembers
=
ibzdeptmembersData
;
Object
.
assign
(
data
,
masterData
);
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
data
[
this
.
APPDEKEY
]
=
null
;
...
...
@@ -99,6 +114,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/ibzdepartments`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
tempContext
.
srfsessionkey
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
tempContext
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
}
...
...
@@ -117,6 +133,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
`
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
}
...
...
@@ -150,9 +167,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData
.
ibzemployees
=
ibzemployeesData
;
let
ibzdeptmembersData
:
any
=
[];
if
(
!
Object
.
is
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
),
'undefined'
)){
ibzdeptmembersData
=
JSON
.
parse
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
)
as
any
);
if
(
ibzdeptmembersData
&&
ibzdeptmembersData
.
length
&&
ibzdeptmembersData
.
length
>
0
){
ibzdeptmembersData
.
forEach
((
item
:
any
)
=>
{
if
(
item
.
srffrontuf
){
if
(
Object
.
is
(
item
.
srffrontuf
,
"0"
)){
item
.
memberid
=
null
;
}
delete
item
.
srffrontuf
;
}
});
}
}
masterData
.
ibzdeptmembers
=
ibzdeptmembersData
;
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/save`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
}
...
...
@@ -188,6 +221,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdepartments/getdraft`
,
isloading
);
res
.
data
.
ibzdepartment
=
data
.
ibzdepartment
;
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
}
...
...
@@ -237,9 +271,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
masterData
.
ibzemployees
=
ibzemployeesData
;
let
ibzdeptmembersData
:
any
=
[];
if
(
!
Object
.
is
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
),
'undefined'
)){
ibzdeptmembersData
=
JSON
.
parse
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
)
as
any
);
if
(
ibzdeptmembersData
&&
ibzdeptmembersData
.
length
&&
ibzdeptmembersData
.
length
>
0
){
ibzdeptmembersData
.
forEach
((
item
:
any
)
=>
{
if
(
item
.
srffrontuf
){
if
(
Object
.
is
(
item
.
srffrontuf
,
"0"
)){
item
.
memberid
=
null
;
}
delete
item
.
srffrontuf
;
}
});
}
}
masterData
.
ibzdeptmembers
=
ibzdeptmembersData
;
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
}
...
...
app_web/src/service/ibzdept-member/ibzdept-member-service-base.ts
浏览文件 @
3905eb76
...
...
@@ -54,11 +54,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
}
return
Http
.
getInstance
().
get
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
}
...
...
@@ -79,12 +85,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
put
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
put
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
put
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
put
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
put
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
...
...
@@ -119,6 +131,15 @@ export default class IBZDeptMemberServiceBase extends EntityService {
}
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers`
,
data
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
true
){
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
data
[
this
.
APPDEKEY
]
=
null
;
}
if
(
data
.
srffrontuf
){
delete
data
.
srffrontuf
;
}
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers`
,
data
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
true
){
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
data
[
this
.
APPDEKEY
]
=
null
;
...
...
@@ -137,6 +158,15 @@ export default class IBZDeptMemberServiceBase extends EntityService {
}
return
Http
.
getInstance
().
post
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers`
,
data
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
true
){
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
data
[
this
.
APPDEKEY
]
=
null
;
}
if
(
data
.
srffrontuf
){
delete
data
.
srffrontuf
;
}
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers`
,
data
,
isloading
);
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
...
...
@@ -166,12 +196,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
...
...
@@ -194,12 +230,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
true
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/getdraft`
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
true
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/getdraft`
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
true
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/getdraft`
,
isloading
);
}
if
(
context
.
ibzemployee
&&
true
){
return
Http
.
getInstance
().
get
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/getdraft`
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
true
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/getdraft`
,
isloading
);
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdeptmembers/getdraft`
,
isloading
);
res
.
data
.
ibzdeptmember
=
data
.
ibzdeptmember
;
return
res
;
...
...
@@ -221,11 +263,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
return
res
;
...
...
@@ -248,11 +296,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
delete
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
delete
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
delete
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
delete
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
delete
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
return
Http
.
getInstance
().
delete
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
...
...
@@ -274,11 +328,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
}
return
Http
.
getInstance
().
post
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
}
...
...
@@ -301,6 +361,10 @@ export default class IBZDeptMemberServiceBase extends EntityService {
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
}
if
(
context
.
ibzorganization
&&
context
.
ibzdepartment
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
...
...
@@ -309,6 +373,10 @@ export default class IBZDeptMemberServiceBase extends EntityService {
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
}
if
(
context
.
ibzdepartment
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
}
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
}
...
...
app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-base.vue
浏览文件 @
3905eb76
...
...
@@ -558,14 +558,14 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
public
click
(
item
:
any
)
{
if
(
item
)
{
switch
(
item
.
appfunctag
)
{
case
'
_3
'
:
this
.
click
_3
(
item
);
case
'
Auto5
'
:
this
.
click
Auto5
(
item
);
return
;
case
'Auto3'
:
this
.
clickAuto3
(
item
);
return
;
case
'
_2
'
:
this
.
click
_2
(
item
);
case
'
Auto4
'
:
this
.
click
Auto4
(
item
);
return
;
default
:
console
.
warn
(
'未指定应用功能'
);
...
...
@@ -580,7 +580,7 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
* @param {*} [item={}]
* @memberof OUIndexView
*/
public
click
_3
(
item
:
any
=
{})
{
public
click
Auto5
(
item
:
any
=
{})
{
const
viewparam
:
any
=
{};
Object
.
assign
(
viewparam
,
{});
const
deResParameters
:
any
[]
=
[];
...
...
@@ -616,7 +616,7 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
* @param {*} [item={}]
* @memberof OUIndexView
*/
public
click
_2
(
item
:
any
=
{})
{
public
click
Auto4
(
item
:
any
=
{})
{
const
viewparam
:
any
=
{};
Object
.
assign
(
viewparam
,
{});
const
deResParameters
:
any
[]
=
[];
...
...
app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-model.ts
浏览文件 @
3905eb76
...
...
@@ -47,7 +47,7 @@ export default class OUIndexViewModel {
iconcls
:
'fa fa-sitemap'
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'
_3
'
,
appfunctag
:
'
Auto5
'
,
resourcetag
:
''
,
},
{
...
...
@@ -65,7 +65,7 @@ export default class OUIndexViewModel {
iconcls
:
'fa fa-user'
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'
_2
'
,
appfunctag
:
'
Auto4
'
,
resourcetag
:
''
,
},
];
...
...
@@ -79,7 +79,7 @@ export default class OUIndexViewModel {
*/
public
funcs
:
any
[]
=
[
{
appfunctag
:
'
_3
'
,
appfunctag
:
'
Auto5
'
,
appfuncyype
:
'APPVIEW'
,
openmode
:
''
,
codename
:
'ibzorganizationtreeexpview'
,
...
...
@@ -103,7 +103,7 @@ export default class OUIndexViewModel {
],
},
{
appfunctag
:
'
_2
'
,
appfunctag
:
'
Auto4
'
,
appfuncyype
:
'APPVIEW'
,
openmode
:
''
,
codename
:
'ibzdepartmenttreeexpview'
,
...
...
app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @
3905eb76
<
template
>
<div
class=
'grid'
style=
"height:100%;"
>
<i-form>
<i-form
style=
"height:100%"
>
<el-table
v-if=
"isDisplay === true"
:default-sort=
"
{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)"
...
...
@@ -325,7 +325,7 @@
<el-table-column></el-table-column>
</
template
>
</el-table>
</i-form>
<row
class=
'grid-pagination'
v-show=
"items.length > 0"
>
<page
class=
'pull-right'
@
on-change=
"pageOnChange($event)"
@
on-page-size-change=
"onPageSizeChange($event)"
...
...
@@ -361,6 +361,7 @@
</span>
</page>
</row>
</i-form>
</div>
</template>
<
script
lang=
'tsx'
>
...
...
app_web/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
浏览文件 @
3905eb76
<
template
>
<div
class=
'grid'
style=
"height:100%;"
>
<i-form>
<i-form
style=
"height:100%"
>
<el-table
v-if=
"isDisplay === true"
:default-sort=
"
{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)"
...
...
@@ -194,7 +194,7 @@
<el-table-column></el-table-column>
</
template
>
</el-table>
</i-form>
<row
class=
'grid-pagination'
v-show=
"items.length > 0"
>
<page
class=
'pull-right'
@
on-change=
"pageOnChange($event)"
@
on-page-size-change=
"onPageSizeChange($event)"
...
...
@@ -230,6 +230,7 @@
</span>
</page>
</row>
</i-form>
</div>
</template>
<
script
lang=
'tsx'
>
...
...
app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
浏览文件 @
3905eb76
<
template
>
<div
class=
'grid'
style=
"height:100%;"
>
<i-form>
<i-form
style=
"height:100%"
>
<el-table
v-if=
"isDisplay === true"
:default-sort=
"
{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)"
...
...
@@ -62,7 +62,7 @@
<el-table-column></el-table-column>
</
template
>
</el-table>
</i-form>
<row
class=
'grid-pagination'
v-show=
"items.length > 0"
>
<page
class=
'pull-right'
@
on-change=
"pageOnChange($event)"
@
on-page-size-change=
"onPageSizeChange($event)"
...
...
@@ -98,6 +98,7 @@
</span>
</page>
</row>
</i-form>
</div>
</template>
<
script
lang=
'tsx'
>
...
...
app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @
3905eb76
<
template
>
<div
class=
'grid'
style=
"height:100%;"
>
<i-form>
<i-form
style=
"height:100%"
>
<el-table
v-if=
"isDisplay === true"
:default-sort=
"
{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)"
...
...
@@ -307,7 +307,7 @@
<el-table-column></el-table-column>
</
template
>
</el-table>
</i-form>
<row
class=
'grid-pagination'
v-show=
"items.length > 0"
>
<page
class=
'pull-right'
@
on-change=
"pageOnChange($event)"
@
on-page-size-change=
"onPageSizeChange($event)"
...
...
@@ -343,6 +343,7 @@
</span>
</page>
</row>
</i-form>
</div>
</template>
<
script
lang=
'tsx'
>
...
...
app_web/src/widgets/ibzemployee/main-form/main-form-base.vue
浏览文件 @
3905eb76
...
...
@@ -162,7 +162,7 @@
paramItem=
'ibzemployee'
:parentdata=
'
{"srfparentdefname":"USERID","srfparentdename":"IBZEMP","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBZDEPTMEMBER_IBZEMP_USERID","SRFDER1NID":"DER1N_IBZDEPTMEMBER_IBZEMP_USERID"}'
:parameters="[
{ pathName: 'ibz
employees', parameterName: 'ibzemployee
' },
{ pathName: 'ibz
departments', parameterName: 'ibzdepartment
' },
]"
:context="context"
:viewparams="viewparams"
...
...
app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
浏览文件 @
3905eb76
<
template
>
<div
class=
'grid'
style=
"height:100%;"
>
<i-form>
<i-form
style=
"height:100%"
>
<el-table
v-if=
"isDisplay === true"
:default-sort=
"
{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)"
...
...
@@ -160,7 +160,7 @@
<el-table-column></el-table-column>
</
template
>
</el-table>
</i-form>
<row
class=
'grid-pagination'
v-show=
"items.length > 0"
>
<page
class=
'pull-right'
@
on-change=
"pageOnChange($event)"
@
on-page-size-change=
"onPageSizeChange($event)"
...
...
@@ -196,6 +196,7 @@
</span>
</page>
</row>
</i-form>
</div>
</template>
<
script
lang=
'tsx'
>
...
...
app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue
浏览文件 @
3905eb76
<
template
>
<div
class=
'grid'
style=
"height:100%;"
>
<i-form>
<i-form
style=
"height:100%"
>
<el-table
v-if=
"isDisplay === true"
:default-sort=
"
{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)"
...
...
@@ -146,7 +146,7 @@
<el-table-column></el-table-column>
</
template
>
</el-table>
</i-form>
<row
class=
'grid-pagination'
v-show=
"items.length > 0"
>
<page
class=
'pull-right'
@
on-change=
"pageOnChange($event)"
@
on-page-size-change=
"onPageSizeChange($event)"
...
...
@@ -182,6 +182,7 @@
</span>
</page>
</row>
</i-form>
</div>
</template>
<
script
lang=
'tsx'
>
...
...
config.xml
浏览文件 @
3905eb76
...
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibzou/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzou/
mvn clean package -Pweb
cd ibzou-app/ibzou-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
浏览文件 @
3905eb76
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
EXPOSE
30001
EXPOSE
8080
ADD
ibzou-app-web.jar /ibzou-app-web.jar
ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
浏览文件 @
3905eb76
...
...
@@ -3,21 +3,9 @@ services:
ibzou-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
ports
:
-
"
30001:30001
"
-
"
8080:8080
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=30001
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-
SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy
:
mode
:
replicated
replicas
:
1
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java
浏览文件 @
3905eb76
...
...
@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
java.io.Serializable
;
import
lombok.
Data
;
import
lombok.
*
;
import
org.springframework.data.annotation.Transient
;
...
...
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
/**
* 实体[部门]
*/
@Data
@Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@TableName
(
value
=
"IBZDEPT"
,
resultMap
=
"IBZDepartmentResultMap"
)
public
class
IBZDepartment
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDeptMember.java
浏览文件 @
3905eb76
...
...
@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
java.io.Serializable
;
import
lombok.
Data
;
import
lombok.
*
;
import
org.springframework.data.annotation.Transient
;
...
...
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
/**
* 实体[部门成员]
*/
@Data
@Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@TableName
(
value
=
"IBZDEPTMEMBER"
,
resultMap
=
"IBZDeptMemberResultMap"
)
public
class
IBZDeptMember
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java
浏览文件 @
3905eb76
...
...
@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
java.io.Serializable
;
import
lombok.
Data
;
import
lombok.
*
;
import
org.springframework.data.annotation.Transient
;
...
...
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
/**
* 实体[人员]
*/
@Data
@Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@TableName
(
value
=
"IBZEMP"
,
resultMap
=
"IBZEmployeeResultMap"
)
public
class
IBZEmployee
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java
浏览文件 @
3905eb76
...
...
@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
java.io.Serializable
;
import
lombok.
Data
;
import
lombok.
*
;
import
org.springframework.data.annotation.Transient
;
...
...
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
/**
* 实体[单位机构]
*/
@Data
@Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@TableName
(
value
=
"IBZORG"
,
resultMap
=
"IBZOrganizationResultMap"
)
public
class
IBZOrganization
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZDepartmentSearchContext.java
浏览文件 @
3905eb76
...
...
@@ -8,7 +8,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.HashMap
;
import
lombok.
Data
;
import
lombok.
*
;
import
lombok.extern.slf4j.Slf4j
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZDeptMemberSearchContext.java
浏览文件 @
3905eb76
...
...
@@ -8,7 +8,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.HashMap
;
import
lombok.
Data
;
import
lombok.
*
;
import
lombok.extern.slf4j.Slf4j
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZEmployeeSearchContext.java
浏览文件 @
3905eb76
...
...
@@ -8,7 +8,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.HashMap
;
import
lombok.
Data
;
import
lombok.
*
;
import
lombok.extern.slf4j.Slf4j
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZOrganizationSearchContext.java
浏览文件 @
3905eb76
...
...
@@ -8,7 +8,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.HashMap
;
import
lombok.
Data
;
import
lombok.
*
;
import
lombok.extern.slf4j.Slf4j
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.alibaba.fastjson.annotation.JSONField
;
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
浏览文件 @
3905eb76
...
...
@@ -159,6 +159,138 @@ public class IBZDeptMemberResource {
.
body
(
new
PageImpl
(
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Update-all')"
)
@ApiOperation
(
value
=
"UpdateByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
@Transactional
public
ResponseEntity
<
IBZDeptMemberDTO
>
updateByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzdeptmember_id"
)
String
ibzdeptmember_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
IBZDeptMember
domain
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
);
domain
.
setUserid
(
ibzdepartment_id
);
domain
.
setMemberid
(
ibzdeptmember_id
);
ibzdeptmemberService
.
update
(
domain
);
IBZDeptMemberDTO
dto
=
ibzdeptmemberMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Update-all')"
)
@ApiOperation
(
value
=
"UpdateBatchByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateBatchByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch"
)
public
ResponseEntity
<
Boolean
>
updateBatchByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
List
<
IBZDeptMemberDTO
>
ibzdeptmemberdtos
)
{
List
<
IBZDeptMember
>
domainlist
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdtos
);
for
(
IBZDeptMember
domain:
domainlist
){
domain
.
setUserid
(
ibzdepartment_id
);
}
ibzdeptmemberService
.
updateBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Create-all')"
)
@ApiOperation
(
value
=
"CreateByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"CreateByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers"
)
@Transactional
public
ResponseEntity
<
IBZDeptMemberDTO
>
createByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
IBZDeptMember
domain
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
);
domain
.
setUserid
(
ibzdepartment_id
);
ibzdeptmemberService
.
create
(
domain
);
IBZDeptMemberDTO
dto
=
ibzdeptmemberMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Create-all')"
)
@ApiOperation
(
value
=
"createBatchByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"createBatchByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch"
)
public
ResponseEntity
<
Boolean
>
createBatchByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
List
<
IBZDeptMemberDTO
>
ibzdeptmemberdtos
)
{
List
<
IBZDeptMember
>
domainlist
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdtos
);
for
(
IBZDeptMember
domain:
domainlist
){
domain
.
setUserid
(
ibzdepartment_id
);
}
ibzdeptmemberService
.
createBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Save-all')"
)
@ApiOperation
(
value
=
"SaveByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"SaveByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/save"
)
public
ResponseEntity
<
Boolean
>
saveByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
IBZDeptMember
domain
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
);
domain
.
setUserid
(
ibzdepartment_id
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzdeptmemberService
.
save
(
domain
));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Save-all')"
)
@ApiOperation
(
value
=
"SaveBatchByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"SaveBatchByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/savebatch"
)
public
ResponseEntity
<
Boolean
>
saveBatchByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
List
<
IBZDeptMemberDTO
>
ibzdeptmemberdtos
)
{
List
<
IBZDeptMember
>
domainlist
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdtos
);
for
(
IBZDeptMember
domain:
domainlist
){
domain
.
setUserid
(
ibzdepartment_id
);
}
ibzdeptmemberService
.
saveBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@ApiOperation
(
value
=
"GetDraftByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"GetDraftByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/getdraft"
)
public
ResponseEntity
<
IBZDeptMemberDTO
>
getDraftByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
)
{
IBZDeptMember
domain
=
new
IBZDeptMember
();
domain
.
setUserid
(
ibzdepartment_id
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzdeptmemberMapping
.
toDto
(
ibzdeptmemberService
.
getDraft
(
domain
)));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Get-all')"
)
@ApiOperation
(
value
=
"GetByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"GetByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
public
ResponseEntity
<
IBZDeptMemberDTO
>
getByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzdeptmember_id"
)
String
ibzdeptmember_id
)
{
IBZDeptMember
domain
=
ibzdeptmemberService
.
get
(
ibzdeptmember_id
);
IBZDeptMemberDTO
dto
=
ibzdeptmemberMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Remove-all')"
)
@ApiOperation
(
value
=
"RemoveByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"RemoveByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
@Transactional
public
ResponseEntity
<
Boolean
>
removeByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzdeptmember_id"
)
String
ibzdeptmember_id
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzdeptmemberService
.
remove
(
ibzdeptmember_id
));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Remove-all')"
)
@ApiOperation
(
value
=
"RemoveBatchByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"RemoveBatchByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch"
)
public
ResponseEntity
<
Boolean
>
removeBatchByIBZDepartment
(
@RequestBody
List
<
String
>
ids
)
{
ibzdeptmemberService
.
removeBatch
(
ids
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@ApiOperation
(
value
=
"CheckKeyByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"CheckKeyByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/checkkey"
)
public
ResponseEntity
<
Boolean
>
checkKeyByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzdeptmemberService
.
checkKey
(
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
)));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Default-all')"
)
@ApiOperation
(
value
=
"fetchDEFAULTByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
}
,
notes
=
"fetchDEFAULTByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZDeptMemberDTO
>>
fetchIBZDeptMemberDefaultByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
IBZDeptMemberSearchContext
context
)
{
context
.
setN_userid_eq
(
ibzdepartment_id
);
Page
<
IBZDeptMember
>
domains
=
ibzdeptmemberService
.
searchDefault
(
context
)
;
List
<
IBZDeptMemberDTO
>
list
=
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
());
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
header
(
"x-page"
,
String
.
valueOf
(
context
.
getPageable
().
getPageNumber
()))
.
header
(
"x-per-page"
,
String
.
valueOf
(
context
.
getPageable
().
getPageSize
()))
.
header
(
"x-total"
,
String
.
valueOf
(
domains
.
getTotalElements
()))
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Default-all')"
)
@ApiOperation
(
value
=
"searchDEFAULTByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
}
,
notes
=
"searchDEFAULTByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZDeptMemberDTO
>>
searchIBZDeptMemberDefaultByIBZDepartment
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDeptMemberSearchContext
context
)
{
context
.
setN_userid_eq
(
ibzdepartment_id
);
Page
<
IBZDeptMember
>
domains
=
ibzdeptmemberService
.
searchDefault
(
context
)
;
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
body
(
new
PageImpl
(
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Update-all')"
)
@ApiOperation
(
value
=
"UpdateByIBZEmployee"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZEmployee"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
@Transactional
...
...
@@ -423,6 +555,138 @@ public class IBZDeptMemberResource {
.
body
(
new
PageImpl
(
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Update-all')"
)
@ApiOperation
(
value
=
"UpdateByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
@Transactional
public
ResponseEntity
<
IBZDeptMemberDTO
>
updateByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzdeptmember_id"
)
String
ibzdeptmember_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
IBZDeptMember
domain
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
);
domain
.
setUserid
(
ibzdepartment_id
);
domain
.
setMemberid
(
ibzdeptmember_id
);
ibzdeptmemberService
.
update
(
domain
);
IBZDeptMemberDTO
dto
=
ibzdeptmemberMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Update-all')"
)
@ApiOperation
(
value
=
"UpdateBatchByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateBatchByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch"
)
public
ResponseEntity
<
Boolean
>
updateBatchByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
List
<
IBZDeptMemberDTO
>
ibzdeptmemberdtos
)
{
List
<
IBZDeptMember
>
domainlist
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdtos
);
for
(
IBZDeptMember
domain:
domainlist
){
domain
.
setUserid
(
ibzdepartment_id
);
}
ibzdeptmemberService
.
updateBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Create-all')"
)
@ApiOperation
(
value
=
"CreateByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"CreateByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers"
)
@Transactional
public
ResponseEntity
<
IBZDeptMemberDTO
>
createByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
IBZDeptMember
domain
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
);
domain
.
setUserid
(
ibzdepartment_id
);
ibzdeptmemberService
.
create
(
domain
);
IBZDeptMemberDTO
dto
=
ibzdeptmemberMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Create-all')"
)
@ApiOperation
(
value
=
"createBatchByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"createBatchByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch"
)
public
ResponseEntity
<
Boolean
>
createBatchByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
List
<
IBZDeptMemberDTO
>
ibzdeptmemberdtos
)
{
List
<
IBZDeptMember
>
domainlist
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdtos
);
for
(
IBZDeptMember
domain:
domainlist
){
domain
.
setUserid
(
ibzdepartment_id
);
}
ibzdeptmemberService
.
createBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Save-all')"
)
@ApiOperation
(
value
=
"SaveByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"SaveByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/save"
)
public
ResponseEntity
<
Boolean
>
saveByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
IBZDeptMember
domain
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
);
domain
.
setUserid
(
ibzdepartment_id
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzdeptmemberService
.
save
(
domain
));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Save-all')"
)
@ApiOperation
(
value
=
"SaveBatchByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"SaveBatchByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/savebatch"
)
public
ResponseEntity
<
Boolean
>
saveBatchByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
List
<
IBZDeptMemberDTO
>
ibzdeptmemberdtos
)
{
List
<
IBZDeptMember
>
domainlist
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdtos
);
for
(
IBZDeptMember
domain:
domainlist
){
domain
.
setUserid
(
ibzdepartment_id
);
}
ibzdeptmemberService
.
saveBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@ApiOperation
(
value
=
"GetDraftByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"GetDraftByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/getdraft"
)
public
ResponseEntity
<
IBZDeptMemberDTO
>
getDraftByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
)
{
IBZDeptMember
domain
=
new
IBZDeptMember
();
domain
.
setUserid
(
ibzdepartment_id
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzdeptmemberMapping
.
toDto
(
ibzdeptmemberService
.
getDraft
(
domain
)));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Get-all')"
)
@ApiOperation
(
value
=
"GetByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"GetByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
public
ResponseEntity
<
IBZDeptMemberDTO
>
getByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzdeptmember_id"
)
String
ibzdeptmember_id
)
{
IBZDeptMember
domain
=
ibzdeptmemberService
.
get
(
ibzdeptmember_id
);
IBZDeptMemberDTO
dto
=
ibzdeptmemberMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Remove-all')"
)
@ApiOperation
(
value
=
"RemoveByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"RemoveByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
@Transactional
public
ResponseEntity
<
Boolean
>
removeByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@PathVariable
(
"ibzdeptmember_id"
)
String
ibzdeptmember_id
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzdeptmemberService
.
remove
(
ibzdeptmember_id
));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Remove-all')"
)
@ApiOperation
(
value
=
"RemoveBatchByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"RemoveBatchByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch"
)
public
ResponseEntity
<
Boolean
>
removeBatchByIBZOrganizationIBZDepartment
(
@RequestBody
List
<
String
>
ids
)
{
ibzdeptmemberService
.
removeBatch
(
ids
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@ApiOperation
(
value
=
"CheckKeyByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"CheckKeyByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/checkkey"
)
public
ResponseEntity
<
Boolean
>
checkKeyByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzdeptmemberService
.
checkKey
(
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
)));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Default-all')"
)
@ApiOperation
(
value
=
"fetchDEFAULTByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
}
,
notes
=
"fetchDEFAULTByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/fetchdefault"
)
public
ResponseEntity
<
List
<
IBZDeptMemberDTO
>>
fetchIBZDeptMemberDefaultByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
IBZDeptMemberSearchContext
context
)
{
context
.
setN_userid_eq
(
ibzdepartment_id
);
Page
<
IBZDeptMember
>
domains
=
ibzdeptmemberService
.
searchDefault
(
context
)
;
List
<
IBZDeptMemberDTO
>
list
=
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
());
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
header
(
"x-page"
,
String
.
valueOf
(
context
.
getPageable
().
getPageNumber
()))
.
header
(
"x-per-page"
,
String
.
valueOf
(
context
.
getPageable
().
getPageSize
()))
.
header
(
"x-total"
,
String
.
valueOf
(
domains
.
getTotalElements
()))
.
body
(
list
);
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Default-all')"
)
@ApiOperation
(
value
=
"searchDEFAULTByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
}
,
notes
=
"searchDEFAULTByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/searchdefault"
)
public
ResponseEntity
<
Page
<
IBZDeptMemberDTO
>>
searchIBZDeptMemberDefaultByIBZOrganizationIBZDepartment
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDeptMemberSearchContext
context
)
{
context
.
setN_userid_eq
(
ibzdepartment_id
);
Page
<
IBZDeptMember
>
domains
=
ibzdeptmemberService
.
searchDefault
(
context
)
;
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
body
(
new
PageImpl
(
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDeptMember-Update-all')"
)
@ApiOperation
(
value
=
"UpdateByIBZOrganizationIBZEmployee"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZOrganizationIBZEmployee"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
@Transactional
...
...
ibzou-util/src/main/java/cn/ibizlab/util/filter/QueryBuildContext.java
浏览文件 @
3905eb76
...
...
@@ -3,11 +3,14 @@ package cn.ibizlab.util.filter;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.mongodb.QueryBuilder
;
import
lombok.
Data
;
import
lombok.
*
;
import
lombok.extern.slf4j.Slf4j
;
@Slf4j
@Data
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public
class
QueryBuildContext
extends
SearchContextBase
implements
ISearchContext
{
@JsonIgnore
...
...
ibzou-util/src/main/java/cn/ibizlab/util/filter/QueryWrapperContext.java
浏览文件 @
3905eb76
...
...
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.annotation.JSONField;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
lombok.
Data
;
import
lombok.
*
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.util.ObjectUtils
;
...
...
@@ -17,7 +17,10 @@ import java.util.Iterator;
import
java.util.List
;
@Slf4j
@Data
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public
class
QueryWrapperContext
<
T
>
extends
SearchContextBase
implements
ISearchContext
{
@JsonIgnore
...
...
ibzou-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java
浏览文件 @
3905eb76
...
...
@@ -4,7 +4,7 @@ import cn.ibizlab.util.security.AuthenticationUser;
import
com.fasterxml.jackson.annotation.JsonAnyGetter
;
import
com.fasterxml.jackson.annotation.JsonAnySetter
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
lombok.
Data
;
import
lombok.
*
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.data.domain.PageRequest
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
...
...
@@ -17,7 +17,10 @@ import java.util.List;
import
java.util.Map
;
@Slf4j
@Data
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public
class
SearchContextBase
implements
ISearchContext
{
/**
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录