Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzrt
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzrt
提交
1d3bc849
提交
1d3bc849
编写于
4年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
408b2cfe
master
无相关合并请求
变更
24
显示空白字符变更
内嵌
并排
正在显示
24 个修改的文件
包含
1425 行增加
和
335 行删除
+1425
-335
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/rt/index/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
main-form-base.vue
app_Web/src/widgets/ibzemployee/main-form/main-form-base.vue
+1
-1
application-web-prod.yml
...ibzrt-app-web/src/main/resources/application-web-prod.yml
+2
-2
application-dev.yml
ibzrt-boot/src/main/resources/application-dev.yml
+8
-0
WFGroupFallback.java
...java/cn/ibizlab/core/workflow/client/WFGroupFallback.java
+76
-0
WFGroupFeignClient.java
...a/cn/ibizlab/core/workflow/client/WFGroupFeignClient.java
+71
-0
WFUserFallback.java
.../java/cn/ibizlab/core/workflow/client/WFUserFallback.java
+76
-0
WFUserFeignClient.java
...va/cn/ibizlab/core/workflow/client/WFUserFeignClient.java
+71
-0
WFGroup.java
...rc/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java
+9
-15
WFUser.java
...src/main/java/cn/ibizlab/core/workflow/domain/WFUser.java
+7
-12
WFGroupSearchContext.java
...cn/ibizlab/core/workflow/filter/WFGroupSearchContext.java
+5
-24
WFUserSearchContext.java
.../cn/ibizlab/core/workflow/filter/WFUserSearchContext.java
+5
-24
IWFGroupService.java
...ava/cn/ibizlab/core/workflow/service/IWFGroupService.java
+2
-18
IWFUserService.java
...java/cn/ibizlab/core/workflow/service/IWFUserService.java
+2
-18
WFGroupServiceImpl.java
...bizlab/core/workflow/service/impl/WFGroupServiceImpl.java
+33
-90
WFUserServiceImpl.java
...ibizlab/core/workflow/service/impl/WFUserServiceImpl.java
+32
-85
h2_table.xml
ibzrt-core/src/main/resources/liquibase/h2_table.xml
+0
-13
IBZDeptMemberResource.java
.../main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
+242
-0
WFGroupResource.java
...pi/src/main/java/cn/ibizlab/api/rest/WFGroupResource.java
+4
-15
WFUserResource.java
...api/src/main/java/cn/ibizlab/api/rest/WFUserResource.java
+4
-15
未找到文件。
app_Web/src/mock/entity/ibzdept-members/ibzdept-members.ts
浏览文件 @
1d3bc849
...
@@ -146,6 +146,35 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
...
@@ -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
// 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
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Select"
);
...
@@ -203,6 +232,35 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
...
@@ -203,6 +232,35 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
return
[
status
,
_items
];
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
// Select
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
select$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})\/
select$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Select"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Select"
);
...
@@ -286,6 +344,33 @@ mock.onPut(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
...
@@ -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
// 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
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Update"
);
...
@@ -339,6 +424,33 @@ mock.onPut(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
...
@@ -339,6 +424,33 @@ mock.onPut(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
return
[
status
,
{}];
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
// Update
mock
.
onPut
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})
$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPut
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Update"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Update"
);
...
@@ -382,6 +494,8 @@ mock.onPut(new RegExp(/^\/ibzdeptmembers\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((co
...
@@ -382,6 +494,8 @@ mock.onPut(new RegExp(/^\/ibzdeptmembers\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((co
// CheckKey
// 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
)
=>
{
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
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: CheckKey"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: CheckKey"
);
...
@@ -436,6 +550,33 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemploye
...
@@ -436,6 +550,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
// 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
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: CheckKey"
);
...
@@ -489,6 +630,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
...
@@ -489,6 +630,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
return
[
status
,
{}];
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
// CheckKey
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
checkkey$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
checkkey$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: CheckKey"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: CheckKey"
);
...
@@ -532,6 +700,8 @@ mock.onPost(new RegExp(/^\/ibzdeptmembers\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)
...
@@ -532,6 +700,8 @@ mock.onPost(new RegExp(/^\/ibzdeptmembers\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)
// Create
// Create
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})
$/
)).
reply
((
config
:
any
)
=>
{
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})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Create"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Create"
);
...
@@ -586,6 +756,33 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemploye
...
@@ -586,6 +756,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
// 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
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Create"
);
...
@@ -639,6 +836,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
...
@@ -639,6 +836,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
return
[
status
,
{}];
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
// Create
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})
$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Create"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Create"
);
...
@@ -700,6 +924,23 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
...
@@ -700,6 +924,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
// GetDraft
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
getdraft$/
)).
reply
((
config
:
any
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: GetDraft"
);
...
@@ -733,6 +974,23 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
...
@@ -733,6 +974,23 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
return
[
status
,
{}];
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
// GetDraft
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/
getdraft$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/
getdraft$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: GetDraft"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: GetDraft"
);
...
@@ -804,6 +1062,33 @@ mock.onPost(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemploye
...
@@ -804,6 +1062,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
// 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
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Save"
);
...
@@ -857,6 +1142,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
...
@@ -857,6 +1142,33 @@ mock.onPost(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers
return
[
status
,
{}];
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
// Save
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
save$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onPost
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/?([
a-zA-Z0-9
\-\;]{0,35})\/
save$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Save"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Save"
);
...
@@ -986,6 +1298,51 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
...
@@ -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
// FetchDefault
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdepartments
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzemployees
\/([
a-zA-Z0-9
\-\;]{1,35})\/
ibzdeptmembers
\/
fetchdefault$/
)).
reply
((
config
:
any
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: FetchDefault"
);
...
@@ -1075,6 +1432,51 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
...
@@ -1075,6 +1432,51 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
return
[
status
,
items
];
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
// FetchDefault
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/
fetchdefault$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/
fetchdefault$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: FetchDefault"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: FetchDefault"
);
...
@@ -1126,15 +1528,27 @@ mock.onGet(new RegExp(/^\/ibzdeptmembers\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
...
@@ -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参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
...
@@ -1153,8 +1567,10 @@ mock.onGet(new RegExp(/^\/ibzdeptmembers\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
...
@@ -1153,8 +1567,10 @@ mock.onGet(new RegExp(/^\/ibzdeptmembers\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
...
@@ -1162,15 +1578,29 @@ mock.onGet(new RegExp(/^\/ibzdeptmembers\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
...
@@ -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参数传递情况未实现
// 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
...
@@ -1239,6 +1669,34 @@ mock.onGet(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemployee
return
[
status
,
_items
?
_items
:{}];
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
// 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
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Get"
);
...
@@ -1295,6 +1753,34 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
...
@@ -1295,6 +1753,34 @@ mock.onGet(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembers\
return
[
status
,
_items
?
_items
:{}];
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
// Get
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onGet
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Get"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Get"
);
...
@@ -1379,6 +1865,34 @@ mock.onDelete(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemplo
...
@@ -1379,6 +1865,34 @@ mock.onDelete(new RegExp(/^\/ibzorganizations\/([a-zA-Z0-9\-\;]{1,35})\/ibzemplo
return
[
status
,
_items
?
_items
:{}];
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
// 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
)
=>
{
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"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Remove"
);
...
@@ -1435,6 +1949,34 @@ mock.onDelete(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembe
...
@@ -1435,6 +1949,34 @@ mock.onDelete(new RegExp(/^\/ibzemployees\/([a-zA-Z0-9\-\;]{1,35})\/ibzdeptmembe
return
[
status
,
_items
?
_items
:{}];
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
// Remove
mock
.
onDelete
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
mock
.
onDelete
(
new
RegExp
(
/^
\/
ibzdeptmembers
\/([
a-zA-Z0-9
\-\;]{1,35})
$/
)).
reply
((
config
:
any
)
=>
{
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Remove"
);
console
.
groupCollapsed
(
"实体:ibzdeptmember 方法: Remove"
);
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue
浏览文件 @
1d3bc849
...
@@ -1070,7 +1070,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
...
@@ -1070,7 +1070,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
'resAppKey'
:
'userid'
},
'resAppKey'
:
'userid'
},
{
view
:{
viewname
:
'ibzdepartment-mpickup-view'
,
height
:
0
,
width
:
0
,
title
:
'部门数据多项选择视图'
},
{
view
:{
viewname
:
'ibzdepartment-mpickup-view'
,
height
:
0
,
width
:
0
,
title
:
'部门数据多项选择视图'
},
res
:[
'IBZDepartment'
],
res
:[
'IBZDepartment'
],
'resAppKey'
:
''
}
'resAppKey'
:
'
userid
'
}
];
];
if
(
batchAddPSAppViews
.
length
==
0
||
!
this
.
context
.
srfparentdename
){
if
(
batchAddPSAppViews
.
length
==
0
||
!
this
.
context
.
srfparentdename
){
this
.
$Notice
.
warning
({
title
:
'错误'
,
desc
:
'批量添加需添加N:N关系'
});
this
.
$Notice
.
warning
({
title
:
'错误'
,
desc
:
'批量添加需添加N:N关系'
});
...
@@ -1128,9 +1128,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
...
@@ -1128,9 +1128,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
Object
.
assign
(
curViewParam
,
args
[
0
]);
Object
.
assign
(
curViewParam
,
args
[
0
]);
}
}
let
deResParameters
:
any
[]
=
[];
let
deResParameters
:
any
[]
=
[];
if
(
curViewParam
.
ibz
employee
&&
true
){
if
(
curViewParam
.
ibz
department
&&
true
){
deResParameters
=
[
deResParameters
=
[
{
pathName
:
'ibz
employees'
,
parameterName
:
'ibzemployee
'
},
{
pathName
:
'ibz
departments'
,
parameterName
:
'ibzdepartment
'
},
]
]
}
}
const
parameters
:
any
[]
=
[
const
parameters
:
any
[]
=
[
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/pages/rt/index/router.ts
浏览文件 @
1d3bc849
...
@@ -449,6 +449,21 @@ const router = new Router({
...
@@ -449,6 +449,21 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
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
:
'index'
,
parameterName
:
'index'
},
{
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?'
,
path
:
'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
meta
:
{
...
@@ -478,6 +493,20 @@ const router = new Router({
...
@@ -478,6 +493,20 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
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
:
'index'
,
parameterName
:
'index'
},
{
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?'
,
path
:
'ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
meta
:
{
...
@@ -1049,6 +1078,21 @@ const router = new Router({
...
@@ -1049,6 +1078,21 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
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
:
'index'
,
parameterName
:
'index'
},
{
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?'
,
path
:
'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
meta
:
{
...
@@ -1078,6 +1122,20 @@ const router = new Router({
...
@@ -1078,6 +1122,20 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
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
:
'index'
,
parameterName
:
'index'
},
{
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?'
,
path
:
'ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
meta
:
{
...
@@ -1529,6 +1587,20 @@ const router = new Router({
...
@@ -1529,6 +1587,20 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
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?'
,
path
:
'/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
meta
:
{
...
@@ -1556,6 +1628,19 @@ const router = new Router({
...
@@ -1556,6 +1628,19 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'
),
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?'
,
path
:
'/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?'
,
meta
:
{
meta
:
{
...
@@ -2047,6 +2132,20 @@ const router = new Router({
...
@@ -2047,6 +2132,20 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
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?'
,
path
:
'/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
meta
:
{
...
@@ -2074,6 +2173,19 @@ const router = new Router({
...
@@ -2074,6 +2173,19 @@ const router = new Router({
},
},
component
:
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
),
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?'
,
path
:
'/ibzdeptmembers/:ibzdeptmember?/editview/:editview?'
,
meta
:
{
meta
:
{
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/service/ibzdepartment/ibzdepartment-service-base.ts
浏览文件 @
1d3bc849
...
@@ -83,9 +83,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
...
@@ -83,9 +83,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
}
}
masterData
.
ibzemployees
=
ibzemployeesData
;
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
);
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/save`
,
data
,
isloading
);
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
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
return
res
;
}
}
...
@@ -104,6 +120,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
...
@@ -104,6 +120,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
`
,
isloading
);
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
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
return
res
;
}
}
...
@@ -170,9 +187,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
...
@@ -170,9 +187,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
}
}
masterData
.
ibzemployees
=
ibzemployeesData
;
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
);
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
`
,
data
,
isloading
);
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
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
return
res
;
}
}
...
@@ -211,6 +244,21 @@ export default class IBZDepartmentServiceBase extends EntityService {
...
@@ -211,6 +244,21 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
}
}
}
masterData
.
ibzemployees
=
ibzemployeesData
;
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
);
Object
.
assign
(
data
,
masterData
);
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
data
[
this
.
APPDEKEY
]
=
null
;
data
[
this
.
APPDEKEY
]
=
null
;
...
@@ -221,6 +269,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
...
@@ -221,6 +269,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/ibzdepartments`
,
data
,
isloading
);
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
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
tempContext
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
return
res
;
}
}
...
@@ -240,6 +289,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
...
@@ -240,6 +289,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdepartments/getdraft`
,
isloading
);
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdepartments/getdraft`
,
isloading
);
res
.
data
.
ibzdepartment
=
data
.
ibzdepartment
;
res
.
data
.
ibzdepartment
=
data
.
ibzdepartment
;
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzemployees'
,
JSON
.
stringify
(
res
.
data
.
ibzemployees
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_ibzdeptmembers'
,
JSON
.
stringify
(
res
.
data
.
ibzdeptmembers
));
return
res
;
return
res
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/service/ibzdept-member/ibzdept-member-service-base.ts
浏览文件 @
1d3bc849
...
@@ -54,11 +54,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -54,11 +54,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
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
){
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
}
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
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
);
return
Http
.
getInstance
().
get
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/select`
,
isloading
);
}
}
...
@@ -79,12 +85,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -79,12 +85,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
put
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
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
){
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
put
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
return
Http
.
getInstance
().
put
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
}
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
put
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
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
=
{};
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
data
,
isloading
);
...
@@ -107,11 +119,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -107,11 +119,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
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
){
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
get
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
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
);
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
return
res
;
return
res
;
...
@@ -134,11 +152,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -134,11 +152,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
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
){
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
}
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
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
);
return
Http
.
getInstance
().
post
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/checkkey`
,
data
,
isloading
);
}
}
...
@@ -159,11 +183,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -159,11 +183,17 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
delete
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
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
){
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
delete
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
return
Http
.
getInstance
().
delete
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
}
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
delete
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
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
);
return
Http
.
getInstance
().
delete
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
`
,
isloading
);
...
@@ -197,6 +227,15 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -197,6 +227,15 @@ export default class IBZDeptMemberServiceBase extends EntityService {
}
}
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers`
,
data
,
isloading
);
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
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
true
){
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
data
[
this
.
APPDEKEY
]
=
null
;
data
[
this
.
APPDEKEY
]
=
null
;
...
@@ -215,6 +254,15 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -215,6 +254,15 @@ export default class IBZDeptMemberServiceBase extends EntityService {
}
}
return
Http
.
getInstance
().
post
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers`
,
data
,
isloading
);
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
=
{};
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
Object
.
assign
(
data
,
masterData
);
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
...
@@ -244,12 +292,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -244,12 +292,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
true
){
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
true
){
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/getdraft`
,
isloading
);
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
){
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
true
){
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/getdraft`
,
isloading
);
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/getdraft`
,
isloading
);
}
}
if
(
context
.
ibzemployee
&&
true
){
if
(
context
.
ibzemployee
&&
true
){
return
Http
.
getInstance
().
get
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/getdraft`
,
isloading
);
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
);
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/ibzdeptmembers/getdraft`
,
isloading
);
res
.
data
.
ibzdeptmember
=
data
.
ibzdeptmember
;
res
.
data
.
ibzdeptmember
=
data
.
ibzdeptmember
;
return
res
;
return
res
;
...
@@ -271,12 +325,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -271,12 +325,18 @@ export default class IBZDeptMemberServiceBase extends EntityService {
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzorganization
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
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
){
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
return
Http
.
getInstance
().
post
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
}
}
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
if
(
context
.
ibzemployee
&&
context
.
ibzdeptmember
){
return
Http
.
getInstance
().
post
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
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
=
{};
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/ibzdeptmembers/
${
context
.
ibzdeptmember
}
/save`
,
data
,
isloading
);
...
@@ -301,6 +361,10 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -301,6 +361,10 @@ export default class IBZDeptMemberServiceBase extends EntityService {
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzorganizations/
${
context
.
ibzorganization
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
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
){
if
(
context
.
ibzdepartment
&&
context
.
ibzemployee
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
return
Http
.
getInstance
().
get
(
`/ibzdepartments/
${
context
.
ibzdepartment
}
/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
...
@@ -309,6 +373,10 @@ export default class IBZDeptMemberServiceBase extends EntityService {
...
@@ -309,6 +373,10 @@ export default class IBZDeptMemberServiceBase extends EntityService {
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzemployees/
${
context
.
ibzemployee
}
/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
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
));
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
return
Http
.
getInstance
().
get
(
`/ibzdeptmembers/fetchdefault`
,
tempData
,
isloading
);
}
}
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/ibzemployee/main-form/main-form-base.vue
浏览文件 @
1d3bc849
...
@@ -162,7 +162,7 @@
...
@@ -162,7 +162,7 @@
paramItem=
'ibzemployee'
paramItem=
'ibzemployee'
:parentdata=
'
{"srfparentdefname":"USERID","srfparentdename":"IBZEMP","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBZDEPTMEMBER_IBZEMP_USERID","SRFDER1NID":"DER1N_IBZDEPTMEMBER_IBZEMP_USERID"}'
:parentdata=
'
{"srfparentdefname":"USERID","srfparentdename":"IBZEMP","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBZDEPTMEMBER_IBZEMP_USERID","SRFDER1NID":"DER1N_IBZDEPTMEMBER_IBZEMP_USERID"}'
:parameters="[
:parameters="[
{ pathName: 'ibz
employees', parameterName: 'ibzemployee
' },
{ pathName: 'ibz
departments', parameterName: 'ibzdepartment
' },
]"
]"
:context="context"
:context="context"
:viewparams="viewparams"
:viewparams="viewparams"
...
...
This diff is collapsed.
Click to expand it.
ibzrt-app/ibzrt-app-web/src/main/resources/application-web-prod.yml
浏览文件 @
1d3bc849
...
@@ -21,7 +21,7 @@ zuul:
...
@@ -21,7 +21,7 @@ zuul:
stripPrefix
:
false
stripPrefix
:
false
wf_user
:
wf_user
:
path
:
/wfusers/**
path
:
/wfusers/**
serviceId
:
ibz
rt
-api
serviceId
:
ibz
wf
-api
stripPrefix
:
false
stripPrefix
:
false
ibzorg
:
ibzorg
:
path
:
/ibzorganizations/**
path
:
/ibzorganizations/**
...
@@ -29,7 +29,7 @@ zuul:
...
@@ -29,7 +29,7 @@ zuul:
stripPrefix
:
false
stripPrefix
:
false
wf_group
:
wf_group
:
path
:
/wfgroups/**
path
:
/wfgroups/**
serviceId
:
ibz
rt
-api
serviceId
:
ibz
wf
-api
stripPrefix
:
false
stripPrefix
:
false
wf_model
:
wf_model
:
path
:
/wfremodels/**
path
:
/wfremodels/**
...
...
This diff is collapsed.
Click to expand it.
ibzrt-boot/src/main/resources/application-dev.yml
浏览文件 @
1d3bc849
...
@@ -52,6 +52,14 @@ zuul:
...
@@ -52,6 +52,14 @@ zuul:
path
:
/sys_users/**
path
:
/sys_users/**
serviceId
:
ibzuaa-api
serviceId
:
ibzuaa-api
stripPrefix
:
false
stripPrefix
:
false
wf_user
:
path
:
/wf_users/**
serviceId
:
ibzwf-api
stripPrefix
:
false
wf_group
:
path
:
/wf_groups/**
serviceId
:
ibzwf-api
stripPrefix
:
false
ibzdict
:
ibzdict
:
path
:
/ibzdicts/**
path
:
/ibzdicts/**
serviceId
:
ibzdict-api
serviceId
:
ibzdict-api
...
...
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFGroupFallback.java
0 → 100644
浏览文件 @
1d3bc849
package
cn
.
ibizlab
.
core
.
workflow
.
client
;
import
java.sql.Timestamp
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.HashMap
;
import
java.util.Collection
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.web.bind.annotation.*
;
import
cn.ibizlab.core.workflow.domain.WFGroup
;
import
cn.ibizlab.core.workflow.filter.WFGroupSearchContext
;
import
org.springframework.stereotype.Component
;
/**
* 实体[WFGroup] 服务对象接口
*/
@Component
public
class
WFGroupFallback
implements
WFGroupFeignClient
{
public
Page
<
WFGroup
>
select
(){
return
null
;
}
public
Boolean
remove
(
String
id
){
return
false
;
}
public
Boolean
removeBatch
(
Collection
<
String
>
idList
){
return
false
;
}
public
Boolean
save
(
WFGroup
wfgroup
){
return
false
;
}
public
Boolean
saveBatch
(
List
<
WFGroup
>
wfgroups
){
return
false
;
}
public
WFGroup
get
(
String
id
){
return
null
;
}
public
WFGroup
create
(
WFGroup
wfgroup
){
return
null
;
}
public
Boolean
createBatch
(
List
<
WFGroup
>
wfgroups
){
return
false
;
}
public
WFGroup
getDraft
(){
return
null
;
}
public
Boolean
checkKey
(
WFGroup
wfgroup
){
return
false
;
}
public
WFGroup
update
(
String
id
,
WFGroup
wfgroup
){
return
null
;
}
public
Boolean
updateBatch
(
List
<
WFGroup
>
wfgroups
){
return
false
;
}
public
Page
<
WFGroup
>
searchDefault
(
WFGroupSearchContext
context
){
return
null
;
}
}
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFGroupFeignClient.java
0 → 100644
浏览文件 @
1d3bc849
package
cn
.
ibizlab
.
core
.
workflow
.
client
;
import
java.sql.Timestamp
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.HashMap
;
import
java.util.Collection
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.web.bind.annotation.*
;
import
cn.ibizlab.core.workflow.domain.WFGroup
;
import
cn.ibizlab.core.workflow.filter.WFGroupSearchContext
;
import
org.springframework.cloud.openfeign.FeignClient
;
/**
* 实体[WFGroup] 服务对象接口
*/
@FeignClient
(
value
=
"ibzwf-api"
,
contextId
=
"WFGroup"
,
fallback
=
WFGroupFallback
.
class
)
public
interface
WFGroupFeignClient
{
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfgroups/select"
)
Page
<
WFGroup
>
select
();
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfgroups/{id}"
)
Boolean
remove
(
@PathVariable
(
"id"
)
String
id
);
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfgroups/batch}"
)
Boolean
removeBatch
(
@RequestBody
Collection
<
String
>
idList
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/save"
)
Boolean
save
(
@RequestBody
WFGroup
wfgroup
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/save"
)
Boolean
saveBatch
(
@RequestBody
List
<
WFGroup
>
wfgroups
);
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfgroups/{id}"
)
WFGroup
get
(
@PathVariable
(
"id"
)
String
id
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups"
)
WFGroup
create
(
@RequestBody
WFGroup
wfgroup
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/batch"
)
Boolean
createBatch
(
@RequestBody
List
<
WFGroup
>
wfgroups
);
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfgroups/getdraft"
)
WFGroup
getDraft
();
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/checkkey"
)
Boolean
checkKey
(
@RequestBody
WFGroup
wfgroup
);
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfgroups/{id}"
)
WFGroup
update
(
@PathVariable
(
"id"
)
String
id
,
@RequestBody
WFGroup
wfgroup
);
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfgroups/batch"
)
Boolean
updateBatch
(
@RequestBody
List
<
WFGroup
>
wfgroups
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/searchdefault"
)
Page
<
WFGroup
>
searchDefault
(
@RequestBody
WFGroupSearchContext
context
);
}
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFUserFallback.java
0 → 100644
浏览文件 @
1d3bc849
package
cn
.
ibizlab
.
core
.
workflow
.
client
;
import
java.sql.Timestamp
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.HashMap
;
import
java.util.Collection
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.web.bind.annotation.*
;
import
cn.ibizlab.core.workflow.domain.WFUser
;
import
cn.ibizlab.core.workflow.filter.WFUserSearchContext
;
import
org.springframework.stereotype.Component
;
/**
* 实体[WFUser] 服务对象接口
*/
@Component
public
class
WFUserFallback
implements
WFUserFeignClient
{
public
Page
<
WFUser
>
select
(){
return
null
;
}
public
WFUser
update
(
String
id
,
WFUser
wfuser
){
return
null
;
}
public
Boolean
updateBatch
(
List
<
WFUser
>
wfusers
){
return
false
;
}
public
WFUser
getDraft
(){
return
null
;
}
public
WFUser
get
(
String
id
){
return
null
;
}
public
WFUser
create
(
WFUser
wfuser
){
return
null
;
}
public
Boolean
createBatch
(
List
<
WFUser
>
wfusers
){
return
false
;
}
public
Boolean
checkKey
(
WFUser
wfuser
){
return
false
;
}
public
Boolean
save
(
WFUser
wfuser
){
return
false
;
}
public
Boolean
saveBatch
(
List
<
WFUser
>
wfusers
){
return
false
;
}
public
Boolean
remove
(
String
id
){
return
false
;
}
public
Boolean
removeBatch
(
Collection
<
String
>
idList
){
return
false
;
}
public
Page
<
WFUser
>
searchDefault
(
WFUserSearchContext
context
){
return
null
;
}
}
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/client/WFUserFeignClient.java
0 → 100644
浏览文件 @
1d3bc849
package
cn
.
ibizlab
.
core
.
workflow
.
client
;
import
java.sql.Timestamp
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.HashMap
;
import
java.util.Collection
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.web.bind.annotation.*
;
import
cn.ibizlab.core.workflow.domain.WFUser
;
import
cn.ibizlab.core.workflow.filter.WFUserSearchContext
;
import
org.springframework.cloud.openfeign.FeignClient
;
/**
* 实体[WFUser] 服务对象接口
*/
@FeignClient
(
value
=
"ibzwf-api"
,
contextId
=
"WFUser"
,
fallback
=
WFUserFallback
.
class
)
public
interface
WFUserFeignClient
{
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfusers/select"
)
Page
<
WFUser
>
select
();
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfusers/{id}"
)
WFUser
update
(
@PathVariable
(
"id"
)
String
id
,
@RequestBody
WFUser
wfuser
);
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfusers/batch"
)
Boolean
updateBatch
(
@RequestBody
List
<
WFUser
>
wfusers
);
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfusers/getdraft"
)
WFUser
getDraft
();
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfusers/{id}"
)
WFUser
get
(
@PathVariable
(
"id"
)
String
id
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers"
)
WFUser
create
(
@RequestBody
WFUser
wfuser
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/batch"
)
Boolean
createBatch
(
@RequestBody
List
<
WFUser
>
wfusers
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/checkkey"
)
Boolean
checkKey
(
@RequestBody
WFUser
wfuser
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/save"
)
Boolean
save
(
@RequestBody
WFUser
wfuser
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/save"
)
Boolean
saveBatch
(
@RequestBody
List
<
WFUser
>
wfusers
);
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfusers/{id}"
)
Boolean
remove
(
@PathVariable
(
"id"
)
String
id
);
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfusers/batch}"
)
Boolean
removeBatch
(
@RequestBody
Collection
<
String
>
idList
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/searchdefault"
)
Page
<
WFUser
>
searchDefault
(
@RequestBody
WFUserSearchContext
context
);
}
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java
浏览文件 @
1d3bc849
...
@@ -21,54 +21,48 @@ import java.io.Serializable;
...
@@ -21,54 +21,48 @@ import java.io.Serializable;
import
lombok.Data
;
import
lombok.Data
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
import
cn.ibizlab.util.domain.EntityClient
;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
/**
*
实体[角色/用户组]
*
ServiceApi [角色/用户组] 对象
*/
*/
@Data
@Data
@TableName
(
value
=
"IBZWFGROUP"
,
resultMap
=
"WFGroupResultMap"
)
public
class
WFGroup
extends
EntityClient
implements
Serializable
{
public
class
WFGroup
extends
EntityMP
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
/**
* 组标识
* 组标识
*/
*/
@DEField
(
name
=
"groupid"
,
isKeyField
=
true
)
@DEField
(
name
=
"groupid"
,
isKeyField
=
true
)
@TableId
(
value
=
"groupid"
,
type
=
IdType
.
UUID
)
@JSONField
(
name
=
"id"
)
@JSONField
(
name
=
"id"
)
@JsonProperty
(
"id"
)
@JsonProperty
(
"id"
)
private
String
id
;
private
String
id
;
/**
/**
* 组名称
* 组名称
*/
*/
@DEField
(
name
=
"groupname"
)
@DEField
(
name
=
"groupname"
)
@TableField
(
value
=
"groupname"
)
@JSONField
(
name
=
"name"
)
@JSONField
(
name
=
"name"
)
@JsonProperty
(
"name"
)
@JsonProperty
(
"name"
)
private
String
name
;
private
String
name
;
/**
/**
* 范围
* 范围
*/
*/
@TableField
(
value
=
"groupscope"
)
@JSONField
(
name
=
"groupscope"
)
@JSONField
(
name
=
"groupscope"
)
@JsonProperty
(
"groupscope"
)
@JsonProperty
(
"groupscope"
)
private
String
groupscope
;
private
String
groupscope
;
/**
/**
* 成员
* 成员
*/
*/
@JsonIgnore
@JSONField
(
name
=
"wfmembers"
)
@JSONField
(
serialize
=
false
)
@JsonProperty
(
"wfmembers"
)
@TableField
(
exist
=
false
)
private
List
<
cn
.
ibizlab
.
core
.
workflow
.
domain
.
WFMember
>
wfmember
;
private
List
<
cn
.
ibizlab
.
core
.
workflow
.
domain
.
WFMember
>
wfmember
;
/**
/**
* 设置 [组名称]
* 设置 [组名称]
*/
*/
...
...
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/domain/WFUser.java
浏览文件 @
1d3bc849
...
@@ -21,47 +21,42 @@ import java.io.Serializable;
...
@@ -21,47 +21,42 @@ import java.io.Serializable;
import
lombok.Data
;
import
lombok.Data
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
import
cn.ibizlab.util.domain.EntityClient
;
import
com.baomidou.mybatisplus.annotation.*
;
import
cn.ibizlab.util.domain.EntityMP
;
/**
/**
*
实体[用户]
*
ServiceApi [用户] 对象
*/
*/
@Data
@Data
@TableName
(
value
=
"IBZUSER"
,
resultMap
=
"WFUserResultMap"
)
public
class
WFUser
extends
EntityClient
implements
Serializable
{
public
class
WFUser
extends
EntityMP
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
/**
* 用户标识
* 用户标识
*/
*/
@DEField
(
name
=
"userid"
,
isKeyField
=
true
)
@DEField
(
name
=
"userid"
,
isKeyField
=
true
)
@TableId
(
value
=
"userid"
,
type
=
IdType
.
UUID
)
@JSONField
(
name
=
"id"
)
@JSONField
(
name
=
"id"
)
@JsonProperty
(
"id"
)
@JsonProperty
(
"id"
)
private
String
id
;
private
String
id
;
/**
/**
* 用户全局名
* 用户全局名
*/
*/
@DEField
(
name
=
"username"
)
@DEField
(
name
=
"username"
)
@TableField
(
value
=
"username"
)
@JSONField
(
name
=
"firstname"
)
@JSONField
(
name
=
"firstname"
)
@JsonProperty
(
"firstname"
)
@JsonProperty
(
"firstname"
)
private
String
firstname
;
private
String
firstname
;
/**
/**
* 用户名称
* 用户名称
*/
*/
@DEField
(
name
=
"personname"
)
@DEField
(
name
=
"personname"
)
@TableField
(
value
=
"personname"
)
@JSONField
(
name
=
"displayname"
)
@JSONField
(
name
=
"displayname"
)
@JsonProperty
(
"displayname"
)
@JsonProperty
(
"displayname"
)
private
String
displayname
;
private
String
displayname
;
/**
/**
* 设置 [用户全局名]
* 设置 [用户全局名]
*/
*/
...
...
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/filter/WFGroupSearchContext.java
浏览文件 @
1d3bc849
...
@@ -17,36 +17,17 @@ import org.springframework.util.ObjectUtils;
...
@@ -17,36 +17,17 @@ import org.springframework.util.ObjectUtils;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
cn.ibizlab.util.filter.QueryWrapperContext
;
import
cn.ibizlab.util.filter.SearchContextBase
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
cn.ibizlab.core.workflow.domain.WFGroup
;
/**
/**
*
关系型
数据实体[WFGroup] 查询条件对象
*
ServiceApi
数据实体[WFGroup] 查询条件对象
*/
*/
@Slf4j
@Slf4j
@Data
@Data
public
class
WFGroupSearchContext
extends
QueryWrapperContext
<
WFGroup
>
{
public
class
WFGroupSearchContext
extends
SearchContextBase
{
private
String
n_groupname_like
;
//[组名称]
private
String
n_groupname_like
;
//[组名称]
public
void
setN_groupname_like
(
String
n_groupname_like
)
{
this
.
n_groupname_like
=
n_groupname_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_groupname_like
)){
this
.
getSelectCond
().
like
(
"groupname"
,
n_groupname_like
);
}
}
/**
* 启用快速搜索
*/
public
void
setQuery
(
String
query
)
{
this
.
query
=
query
;
if
(!
StringUtils
.
isEmpty
(
query
)){
this
.
getSelectCond
().
or
().
like
(
"groupname"
,
query
);
}
}
}
}
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/filter/WFUserSearchContext.java
浏览文件 @
1d3bc849
...
@@ -17,36 +17,17 @@ import org.springframework.util.ObjectUtils;
...
@@ -17,36 +17,17 @@ import org.springframework.util.ObjectUtils;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
cn.ibizlab.util.filter.QueryWrapperContext
;
import
cn.ibizlab.util.filter.SearchContextBase
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
cn.ibizlab.core.workflow.domain.WFUser
;
/**
/**
*
关系型
数据实体[WFUser] 查询条件对象
*
ServiceApi
数据实体[WFUser] 查询条件对象
*/
*/
@Slf4j
@Slf4j
@Data
@Data
public
class
WFUserSearchContext
extends
QueryWrapperContext
<
WFUser
>
{
public
class
WFUserSearchContext
extends
SearchContextBase
{
private
String
n_personname_like
;
//[用户名称]
private
String
n_personname_like
;
//[用户名称]
public
void
setN_personname_like
(
String
n_personname_like
)
{
this
.
n_personname_like
=
n_personname_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_personname_like
)){
this
.
getSelectCond
().
like
(
"personname"
,
n_personname_like
);
}
}
/**
* 启用快速搜索
*/
public
void
setQuery
(
String
query
)
{
this
.
query
=
query
;
if
(!
StringUtils
.
isEmpty
(
query
)){
this
.
getSelectCond
().
or
().
like
(
"personname"
,
query
);
}
}
}
}
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/service/IWFGroupService.java
浏览文件 @
1d3bc849
...
@@ -18,12 +18,10 @@ import cn.ibizlab.core.workflow.domain.WFGroup;
...
@@ -18,12 +18,10 @@ import cn.ibizlab.core.workflow.domain.WFGroup;
import
cn.ibizlab.core.workflow.filter.WFGroupSearchContext
;
import
cn.ibizlab.core.workflow.filter.WFGroupSearchContext
;
import
com.baomidou.mybatisplus.extension.service.IService
;
/**
/**
* 实体[WFGroup] 服务对象接口
* 实体[WFGroup] 服务对象接口
*/
*/
public
interface
IWFGroupService
extends
IService
<
WFGroup
>
{
public
interface
IWFGroupService
{
boolean
remove
(
String
key
)
;
boolean
remove
(
String
key
)
;
void
removeBatch
(
Collection
<
String
>
idList
)
;
void
removeBatch
(
Collection
<
String
>
idList
)
;
...
@@ -37,22 +35,8 @@ public interface IWFGroupService extends IService<WFGroup>{
...
@@ -37,22 +35,8 @@ public interface IWFGroupService extends IService<WFGroup>{
boolean
update
(
WFGroup
et
)
;
boolean
update
(
WFGroup
et
)
;
void
updateBatch
(
List
<
WFGroup
>
list
)
;
void
updateBatch
(
List
<
WFGroup
>
list
)
;
Page
<
WFGroup
>
searchDefault
(
WFGroupSearchContext
context
)
;
Page
<
WFGroup
>
searchDefault
(
WFGroupSearchContext
context
)
;
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
* @param param 参数列表 param.put("param","1");
* @return select * from table where id = '1'
*/
List
<
JSONObject
>
select
(
String
sql
,
Map
param
);
/**
*自定义SQL
* @param sql update table set name ='test' where id =#{et.param}
* @param param 参数列表 param.put("param","1");
* @return update table set name ='test' where id = '1'
*/
boolean
execute
(
String
sql
,
Map
param
);
}
}
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/service/IWFUserService.java
浏览文件 @
1d3bc849
...
@@ -18,12 +18,10 @@ import cn.ibizlab.core.workflow.domain.WFUser;
...
@@ -18,12 +18,10 @@ import cn.ibizlab.core.workflow.domain.WFUser;
import
cn.ibizlab.core.workflow.filter.WFUserSearchContext
;
import
cn.ibizlab.core.workflow.filter.WFUserSearchContext
;
import
com.baomidou.mybatisplus.extension.service.IService
;
/**
/**
* 实体[WFUser] 服务对象接口
* 实体[WFUser] 服务对象接口
*/
*/
public
interface
IWFUserService
extends
IService
<
WFUser
>
{
public
interface
IWFUserService
{
boolean
update
(
WFUser
et
)
;
boolean
update
(
WFUser
et
)
;
void
updateBatch
(
List
<
WFUser
>
list
)
;
void
updateBatch
(
List
<
WFUser
>
list
)
;
...
@@ -37,22 +35,8 @@ public interface IWFUserService extends IService<WFUser>{
...
@@ -37,22 +35,8 @@ public interface IWFUserService extends IService<WFUser>{
boolean
remove
(
String
key
)
;
boolean
remove
(
String
key
)
;
void
removeBatch
(
Collection
<
String
>
idList
)
;
void
removeBatch
(
Collection
<
String
>
idList
)
;
Page
<
WFUser
>
searchDefault
(
WFUserSearchContext
context
)
;
Page
<
WFUser
>
searchDefault
(
WFUserSearchContext
context
)
;
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
* @param param 参数列表 param.put("param","1");
* @return select * from table where id = '1'
*/
List
<
JSONObject
>
select
(
String
sql
,
Map
param
);
/**
*自定义SQL
* @param sql update table set name ='test' where id =#{et.param}
* @param param 参数列表 param.put("param","1");
* @return update table set name ='test' where id = '1'
*/
boolean
execute
(
String
sql
,
Map
param
);
}
}
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFGroupServiceImpl.java
浏览文件 @
1d3bc849
...
@@ -30,160 +30,103 @@ import cn.ibizlab.core.workflow.service.IWFGroupService;
...
@@ -30,160 +30,103 @@ import cn.ibizlab.core.workflow.service.IWFGroupService;
import
cn.ibizlab.util.helper.CachedBeanCopier
;
import
cn.ibizlab.util.helper.CachedBeanCopier
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
cn.ibizlab.core.workflow.client.WFGroupFeignClient
;
import
cn.ibizlab.core.workflow.mapper.WFGroupMapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.alibaba.fastjson.JSONObject
;
import
org.springframework.util.StringUtils
;
/**
/**
* 实体[角色/用户组] 服务对象接口实现
* 实体[角色/用户组] 服务对象接口实现
*/
*/
@Slf4j
@Slf4j
@Service
(
"WFGroupServiceImpl"
)
@Service
public
class
WFGroupServiceImpl
extends
ServiceImpl
<
WFGroupMapper
,
WFGroup
>
implements
IWFGroupService
{
public
class
WFGroupServiceImpl
implements
IWFGroupService
{
@Autowired
@Autowired
@Lazy
WFGroupFeignClient
wFGroupFeignClient
;
private
cn
.
ibizlab
.
core
.
workflow
.
service
.
IWFMemberService
wfmemberService
;
private
int
batchSize
=
500
;
@Override
@Override
@Transactional
public
boolean
remove
(
String
id
)
{
public
boolean
remove
(
String
key
)
{
boolean
result
=
wFGroupFeignClient
.
remove
(
id
)
;
wfmemberService
.
removeByGroupid
(
key
)
;
return
result
;
boolean
result
=
removeById
(
key
);
return
result
;
}
}
@Override
public
void
removeBatch
(
Collection
<
String
>
idList
){
public
void
removeBatch
(
Collection
<
String
>
idList
)
{
wFGroupFeignClient
.
removeBatch
(
idList
);
removeByIds
(
idList
);
}
}
@Override
@Override
@Transactional
@Transactional
public
boolean
save
(
WFGroup
et
)
{
public
boolean
save
(
WFGroup
et
)
{
if
(!
saveOrUpdate
(
et
))
if
(
et
.
getId
()==
null
)
et
.
setId
((
String
)
et
.
getDefaultKey
(
true
));
if
(!
wFGroupFeignClient
.
save
(
et
))
return
false
;
return
false
;
return
true
;
return
true
;
}
}
@Override
@Transactional
(
rollbackFor
=
{
Exception
.
class
}
)
public
boolean
saveOrUpdate
(
WFGroup
et
)
{
if
(
null
==
et
)
{
return
false
;
}
else
{
return
checkKey
(
et
)
?
this
.
update
(
et
)
:
this
.
create
(
et
);
}
}
@Override
public
boolean
saveBatch
(
Collection
<
WFGroup
>
list
)
{
saveOrUpdateBatch
(
list
,
batchSize
);
return
true
;
}
@Override
@Override
public
void
saveBatch
(
List
<
WFGroup
>
list
)
{
public
void
saveBatch
(
List
<
WFGroup
>
list
)
{
saveOrUpdateBatch
(
list
,
batchSize
)
;
wFGroupFeignClient
.
saveBatch
(
list
)
;
}
}
@Override
@Override
@Transactional
public
WFGroup
get
(
String
id
)
{
public
WFGroup
get
(
String
key
)
{
WFGroup
et
=
wFGroupFeignClient
.
get
(
id
);
WFGroup
et
=
getById
(
key
);
if
(
et
==
null
){
if
(
et
==
null
){
et
=
new
WFGroup
();
et
=
new
WFGroup
();
et
.
setId
(
key
);
et
.
setId
(
id
);
}
}
else
{
else
{
et
.
setWfmember
(
wfmemberService
.
selectByGroupid
(
key
));
}
}
return
et
;
return
et
;
}
}
@Override
@Override
@Transactional
public
boolean
create
(
WFGroup
et
)
{
public
boolean
create
(
WFGroup
et
)
{
if
(!
this
.
retBool
(
this
.
baseMapper
.
insert
(
et
)))
WFGroup
rt
=
wFGroupFeignClient
.
create
(
et
);
if
(
rt
==
null
)
return
false
;
return
false
;
wfmemberService
.
saveByGroupid
(
et
.
getId
(),
et
.
getWfmember
());
CachedBeanCopier
.
copy
(
rt
,
et
);
CachedBeanCopier
.
copy
(
get
(
et
.
getId
()),
et
);
return
true
;
return
true
;
}
}
@Override
public
void
createBatch
(
List
<
WFGroup
>
list
){
public
void
createBatch
(
List
<
WFGroup
>
list
)
{
wFGroupFeignClient
.
createBatch
(
list
)
;
this
.
saveBatch
(
list
,
batchSize
);
}
}
@Override
@Override
public
WFGroup
getDraft
(
WFGroup
et
)
{
public
WFGroup
getDraft
(
WFGroup
et
)
{
et
=
wFGroupFeignClient
.
getDraft
();
return
et
;
return
et
;
}
}
@Override
@Override
public
boolean
checkKey
(
WFGroup
et
)
{
public
boolean
checkKey
(
WFGroup
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getId
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getId
()))
);
return
wFGroupFeignClient
.
checkKey
(
et
);
}
}
@Override
@Override
@Transactional
public
boolean
update
(
WFGroup
et
)
{
public
boolean
update
(
WFGroup
et
)
{
if
(!
update
(
et
,(
Wrapper
)
et
.
getUpdateWrapper
(
true
).
eq
(
"groupid"
,
et
.
getId
())))
WFGroup
rt
=
wFGroupFeignClient
.
update
(
et
.
getId
(),
et
);
if
(
rt
==
null
)
return
false
;
return
false
;
wfmemberService
.
saveByGroupid
(
et
.
getId
(),
et
.
getWfmember
());
CachedBeanCopier
.
copy
(
rt
,
et
);
CachedBeanCopier
.
copy
(
get
(
et
.
getId
()),
et
);
return
true
;
return
true
;
}
}
@Override
public
void
updateBatch
(
List
<
WFGroup
>
list
){
public
void
updateBatch
(
List
<
WFGroup
>
list
)
{
wFGroupFeignClient
.
updateBatch
(
list
)
;
updateBatchById
(
list
,
batchSize
);
}
}
/**
/**
* 查询集合 DEFAULT
* 查询集合 DEFAULT
*/
*/
@Override
@Override
public
Page
<
WFGroup
>
searchDefault
(
WFGroupSearchContext
context
)
{
public
Page
<
WFGroup
>
searchDefault
(
WFGroupSearchContext
context
)
{
com
.
baomidou
.
mybatisplus
.
extension
.
plugins
.
pagination
.
Page
<
WFGroup
>
pages
=
baseMapper
.
searchDefault
(
context
.
getPages
(),
context
,
context
.
getSelectCond
());
Page
<
WFGroup
>
wFGroups
=
wFGroupFeignClient
.
searchDefault
(
context
);
return
new
PageImpl
<
WFGroup
>(
pages
.
getRecords
(),
context
.
getPageable
(),
pages
.
getTotal
());
return
wFGroups
;
}
@Override
public
List
<
JSONObject
>
select
(
String
sql
,
Map
param
){
return
this
.
baseMapper
.
selectBySQL
(
sql
,
param
);
}
@Override
@Transactional
public
boolean
execute
(
String
sql
,
Map
param
){
if
(
sql
==
null
||
sql
.
isEmpty
())
{
return
false
;
}
if
(
sql
.
toLowerCase
().
trim
().
startsWith
(
"insert"
))
{
return
this
.
baseMapper
.
insertBySQL
(
sql
,
param
);
}
if
(
sql
.
toLowerCase
().
trim
().
startsWith
(
"update"
))
{
return
this
.
baseMapper
.
updateBySQL
(
sql
,
param
);
}
if
(
sql
.
toLowerCase
().
trim
().
startsWith
(
"delete"
))
{
return
this
.
baseMapper
.
deleteBySQL
(
sql
,
param
);
}
log
.
warn
(
"暂未支持的SQL语法"
);
return
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFUserServiceImpl.java
浏览文件 @
1d3bc849
...
@@ -30,52 +30,45 @@ import cn.ibizlab.core.workflow.service.IWFUserService;
...
@@ -30,52 +30,45 @@ import cn.ibizlab.core.workflow.service.IWFUserService;
import
cn.ibizlab.util.helper.CachedBeanCopier
;
import
cn.ibizlab.util.helper.CachedBeanCopier
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
cn.ibizlab.core.workflow.client.WFUserFeignClient
;
import
cn.ibizlab.core.workflow.mapper.WFUserMapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.alibaba.fastjson.JSONObject
;
import
org.springframework.util.StringUtils
;
/**
/**
* 实体[用户] 服务对象接口实现
* 实体[用户] 服务对象接口实现
*/
*/
@Slf4j
@Slf4j
@Service
(
"WFUserServiceImpl"
)
@Service
public
class
WFUserServiceImpl
extends
ServiceImpl
<
WFUserMapper
,
WFUser
>
implements
IWFUserService
{
public
class
WFUserServiceImpl
implements
IWFUserService
{
@Autowired
@Autowired
@Lazy
WFUserFeignClient
wFUserFeignClient
;
private
cn
.
ibizlab
.
core
.
workflow
.
service
.
IWFMemberService
wfmemberService
;
private
int
batchSize
=
500
;
@Override
@Override
@Transactional
public
boolean
update
(
WFUser
et
)
{
public
boolean
update
(
WFUser
et
)
{
if
(!
update
(
et
,(
Wrapper
)
et
.
getUpdateWrapper
(
true
).
eq
(
"userid"
,
et
.
getId
())))
WFUser
rt
=
wFUserFeignClient
.
update
(
et
.
getId
(),
et
);
if
(
rt
==
null
)
return
false
;
return
false
;
CachedBeanCopier
.
copy
(
get
(
et
.
getId
())
,
et
);
CachedBeanCopier
.
copy
(
rt
,
et
);
return
true
;
return
true
;
}
}
@Override
public
void
updateBatch
(
List
<
WFUser
>
list
){
public
void
updateBatch
(
List
<
WFUser
>
list
)
{
wFUserFeignClient
.
updateBatch
(
list
)
;
updateBatchById
(
list
,
batchSize
);
}
}
@Override
@Override
public
WFUser
getDraft
(
WFUser
et
)
{
public
WFUser
getDraft
(
WFUser
et
)
{
et
=
wFUserFeignClient
.
getDraft
();
return
et
;
return
et
;
}
}
@Override
@Override
@Transactional
public
WFUser
get
(
String
id
)
{
public
WFUser
get
(
String
key
)
{
WFUser
et
=
wFUserFeignClient
.
get
(
id
);
WFUser
et
=
getById
(
key
);
if
(
et
==
null
){
if
(
et
==
null
){
et
=
new
WFUser
();
et
=
new
WFUser
();
et
.
setId
(
key
);
et
.
setId
(
id
);
}
}
else
{
else
{
}
}
...
@@ -83,66 +76,47 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
...
@@ -83,66 +76,47 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
}
}
@Override
@Override
@Transactional
public
boolean
create
(
WFUser
et
)
{
public
boolean
create
(
WFUser
et
)
{
if
(!
this
.
retBool
(
this
.
baseMapper
.
insert
(
et
)))
WFUser
rt
=
wFUserFeignClient
.
create
(
et
);
if
(
rt
==
null
)
return
false
;
return
false
;
CachedBeanCopier
.
copy
(
get
(
et
.
getId
())
,
et
);
CachedBeanCopier
.
copy
(
rt
,
et
);
return
true
;
return
true
;
}
}
@Override
public
void
createBatch
(
List
<
WFUser
>
list
){
public
void
createBatch
(
List
<
WFUser
>
list
)
{
wFUserFeignClient
.
createBatch
(
list
)
;
this
.
saveBatch
(
list
,
batchSize
);
}
}
@Override
@Override
public
boolean
checkKey
(
WFUser
et
)
{
public
boolean
checkKey
(
WFUser
et
)
{
return
(!
ObjectUtils
.
isEmpty
(
et
.
getId
()))&&(!
Objects
.
isNull
(
this
.
getById
(
et
.
getId
()))
);
return
wFUserFeignClient
.
checkKey
(
et
);
}
}
@Override
@Override
@Transactional
@Transactional
public
boolean
save
(
WFUser
et
)
{
public
boolean
save
(
WFUser
et
)
{
if
(!
saveOrUpdate
(
et
))
if
(
et
.
getId
()==
null
)
et
.
setId
((
String
)
et
.
getDefaultKey
(
true
));
if
(!
wFUserFeignClient
.
save
(
et
))
return
false
;
return
false
;
return
true
;
return
true
;
}
}
@Override
@Override
@Transactional
(
public
void
saveBatch
(
List
<
WFUser
>
list
)
{
rollbackFor
=
{
Exception
.
class
}
wFUserFeignClient
.
saveBatch
(
list
)
;
)
public
boolean
saveOrUpdate
(
WFUser
et
)
{
if
(
null
==
et
)
{
return
false
;
}
else
{
return
checkKey
(
et
)
?
this
.
update
(
et
)
:
this
.
create
(
et
);
}
}
}
@Override
@Override
public
boolean
saveBatch
(
Collection
<
WFUser
>
list
)
{
public
boolean
remove
(
String
id
)
{
saveOrUpdateBatch
(
list
,
batchSize
)
;
boolean
result
=
wFUserFeignClient
.
remove
(
id
)
;
return
true
;
return
result
;
}
}
@Override
public
void
removeBatch
(
Collection
<
String
>
idList
){
public
void
saveBatch
(
List
<
WFUser
>
list
)
{
wFUserFeignClient
.
removeBatch
(
idList
);
saveOrUpdateBatch
(
list
,
batchSize
);
}
}
@Override
@Transactional
public
boolean
remove
(
String
key
)
{
boolean
result
=
removeById
(
key
);
return
result
;
}
@Override
public
void
removeBatch
(
Collection
<
String
>
idList
)
{
removeByIds
(
idList
);
}
...
@@ -151,35 +125,8 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
...
@@ -151,35 +125,8 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
*/
*/
@Override
@Override
public
Page
<
WFUser
>
searchDefault
(
WFUserSearchContext
context
)
{
public
Page
<
WFUser
>
searchDefault
(
WFUserSearchContext
context
)
{
com
.
baomidou
.
mybatisplus
.
extension
.
plugins
.
pagination
.
Page
<
WFUser
>
pages
=
baseMapper
.
searchDefault
(
context
.
getPages
(),
context
,
context
.
getSelectCond
());
Page
<
WFUser
>
wFUsers
=
wFUserFeignClient
.
searchDefault
(
context
);
return
new
PageImpl
<
WFUser
>(
pages
.
getRecords
(),
context
.
getPageable
(),
pages
.
getTotal
());
return
wFUsers
;
}
@Override
public
List
<
JSONObject
>
select
(
String
sql
,
Map
param
){
return
this
.
baseMapper
.
selectBySQL
(
sql
,
param
);
}
@Override
@Transactional
public
boolean
execute
(
String
sql
,
Map
param
){
if
(
sql
==
null
||
sql
.
isEmpty
())
{
return
false
;
}
if
(
sql
.
toLowerCase
().
trim
().
startsWith
(
"insert"
))
{
return
this
.
baseMapper
.
insertBySQL
(
sql
,
param
);
}
if
(
sql
.
toLowerCase
().
trim
().
startsWith
(
"update"
))
{
return
this
.
baseMapper
.
updateBySQL
(
sql
,
param
);
}
if
(
sql
.
toLowerCase
().
trim
().
startsWith
(
"delete"
))
{
return
this
.
baseMapper
.
deleteBySQL
(
sql
,
param
);
}
log
.
warn
(
"暂未支持的SQL语法"
);
return
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
1d3bc849
...
@@ -29,18 +29,6 @@
...
@@ -29,18 +29,6 @@
<!--输出实体[WF_GROUP]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-wf_group-3-1"
>
<createTable
tableName=
"IBZWFGROUP"
>
<column
name=
"GROUPID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_WF_GROUP_GROUPID"
/>
</column>
<column
name=
"GROUPNAME"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"GROUPSCOPE"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
</createTable>
</changeSet>
...
@@ -60,6 +48,5 @@
...
@@ -60,6 +48,5 @@
<!--输出实体[WF_GROUP]外键关系 -->
</databaseChangeLog>
</databaseChangeLog>
This diff is collapsed.
Click to expand it.
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
浏览文件 @
1d3bc849
...
@@ -147,6 +147,127 @@ public class IBZDeptMemberResource {
...
@@ -147,6 +147,127 @@ public class IBZDeptMemberResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
body
(
new
PageImpl
(
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
.
body
(
new
PageImpl
(
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
}
}
@ApiOperation
(
value
=
"UpdateByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
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
);
}
@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
);
}
@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
);
}
@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
)));
}
@ApiOperation
(
value
=
"RemoveByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"RemoveByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
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
));
}
@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
=
"CreateByIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"CreateByIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers"
)
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
);
}
@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
);
}
@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
)));
}
@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
));
}
@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
=
"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
);
}
@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
()));
}
@ApiOperation
(
value
=
"UpdateByIBZEmployee"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZEmployee"
)
@ApiOperation
(
value
=
"UpdateByIBZEmployee"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZEmployee"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
...
@@ -389,6 +510,127 @@ public class IBZDeptMemberResource {
...
@@ -389,6 +510,127 @@ public class IBZDeptMemberResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
body
(
new
PageImpl
(
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
.
body
(
new
PageImpl
(
ibzdeptmemberMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
}
}
@ApiOperation
(
value
=
"UpdateByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
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
);
}
@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
);
}
@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
);
}
@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
)));
}
@ApiOperation
(
value
=
"RemoveByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"RemoveByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
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
));
}
@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
=
"CreateByIBZOrganizationIBZDepartment"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"CreateByIBZOrganizationIBZDepartment"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers"
)
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
);
}
@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
);
}
@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
)));
}
@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
));
}
@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
=
"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
);
}
@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
()));
}
@ApiOperation
(
value
=
"UpdateByIBZOrganizationIBZEmployee"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZOrganizationIBZEmployee"
)
@ApiOperation
(
value
=
"UpdateByIBZOrganizationIBZEmployee"
,
tags
=
{
"IBZDeptMember"
},
notes
=
"UpdateByIBZOrganizationIBZEmployee"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}"
)
...
...
This diff is collapsed.
Click to expand it.
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFGroupResource.java
浏览文件 @
1d3bc849
...
@@ -11,7 +11,7 @@ import com.alibaba.fastjson.JSONObject;
...
@@ -11,7 +11,7 @@ import com.alibaba.fastjson.JSONObject;
import
javax.servlet.ServletRequest
;
import
javax.servlet.ServletRequest
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.cglib.beans.BeanCopier
;
import
org.springframework.cglib.beans.BeanCopier
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
...
@@ -46,15 +46,13 @@ public class WFGroupResource {
...
@@ -46,15 +46,13 @@ public class WFGroupResource {
@Lazy
@Lazy
public
WFGroupMapping
wfgroupMapping
;
public
WFGroupMapping
wfgroupMapping
;
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Remove-all')"
)
@ApiOperation
(
value
=
"Remove"
,
tags
=
{
"WFGroup"
},
notes
=
"Remove"
)
@ApiOperation
(
value
=
"Remove"
,
tags
=
{
"WFGroup"
},
notes
=
"Remove"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfgroups/{wfgroup_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfgroups/{wfgroup_id}"
)
@Transactional
public
ResponseEntity
<
Boolean
>
remove
(
@PathVariable
(
"wfgroup_id"
)
String
wfgroup_id
)
{
public
ResponseEntity
<
Boolean
>
remove
(
@PathVariable
(
"wfgroup_id"
)
String
wfgroup_id
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfgroupService
.
remove
(
wfgroup_id
));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfgroupService
.
remove
(
wfgroup_id
));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Remove-all')"
)
@ApiOperation
(
value
=
"RemoveBatch"
,
tags
=
{
"WFGroup"
},
notes
=
"RemoveBatch"
)
@ApiOperation
(
value
=
"RemoveBatch"
,
tags
=
{
"WFGroup"
},
notes
=
"RemoveBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfgroups/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfgroups/batch"
)
public
ResponseEntity
<
Boolean
>
removeBatch
(
@RequestBody
List
<
String
>
ids
)
{
public
ResponseEntity
<
Boolean
>
removeBatch
(
@RequestBody
List
<
String
>
ids
)
{
...
@@ -62,14 +60,12 @@ public class WFGroupResource {
...
@@ -62,14 +60,12 @@ public class WFGroupResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Save-all')"
)
@ApiOperation
(
value
=
"Save"
,
tags
=
{
"WFGroup"
},
notes
=
"Save"
)
@ApiOperation
(
value
=
"Save"
,
tags
=
{
"WFGroup"
},
notes
=
"Save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/save"
)
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
WFGroupDTO
wfgroupdto
)
{
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
WFGroupDTO
wfgroupdto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfgroupService
.
save
(
wfgroupMapping
.
toDomain
(
wfgroupdto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfgroupService
.
save
(
wfgroupMapping
.
toDomain
(
wfgroupdto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Save-all')"
)
@ApiOperation
(
value
=
"SaveBatch"
,
tags
=
{
"WFGroup"
},
notes
=
"SaveBatch"
)
@ApiOperation
(
value
=
"SaveBatch"
,
tags
=
{
"WFGroup"
},
notes
=
"SaveBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/savebatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/savebatch"
)
public
ResponseEntity
<
Boolean
>
saveBatch
(
@RequestBody
List
<
WFGroupDTO
>
wfgroupdtos
)
{
public
ResponseEntity
<
Boolean
>
saveBatch
(
@RequestBody
List
<
WFGroupDTO
>
wfgroupdtos
)
{
...
@@ -77,7 +73,6 @@ public class WFGroupResource {
...
@@ -77,7 +73,6 @@ public class WFGroupResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Get-all')"
)
@ApiOperation
(
value
=
"Get"
,
tags
=
{
"WFGroup"
},
notes
=
"Get"
)
@ApiOperation
(
value
=
"Get"
,
tags
=
{
"WFGroup"
},
notes
=
"Get"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfgroups/{wfgroup_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfgroups/{wfgroup_id}"
)
public
ResponseEntity
<
WFGroupDTO
>
get
(
@PathVariable
(
"wfgroup_id"
)
String
wfgroup_id
)
{
public
ResponseEntity
<
WFGroupDTO
>
get
(
@PathVariable
(
"wfgroup_id"
)
String
wfgroup_id
)
{
...
@@ -86,10 +81,9 @@ public class WFGroupResource {
...
@@ -86,10 +81,9 @@ public class WFGroupResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Create-all')"
)
@ApiOperation
(
value
=
"Create"
,
tags
=
{
"WFGroup"
},
notes
=
"Create"
)
@ApiOperation
(
value
=
"Create"
,
tags
=
{
"WFGroup"
},
notes
=
"Create"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups"
)
@Transactional
public
ResponseEntity
<
WFGroupDTO
>
create
(
@RequestBody
WFGroupDTO
wfgroupdto
)
{
public
ResponseEntity
<
WFGroupDTO
>
create
(
@RequestBody
WFGroupDTO
wfgroupdto
)
{
WFGroup
domain
=
wfgroupMapping
.
toDomain
(
wfgroupdto
);
WFGroup
domain
=
wfgroupMapping
.
toDomain
(
wfgroupdto
);
wfgroupService
.
create
(
domain
);
wfgroupService
.
create
(
domain
);
...
@@ -97,7 +91,6 @@ public class WFGroupResource {
...
@@ -97,7 +91,6 @@ public class WFGroupResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Create-all')"
)
@ApiOperation
(
value
=
"createBatch"
,
tags
=
{
"WFGroup"
},
notes
=
"createBatch"
)
@ApiOperation
(
value
=
"createBatch"
,
tags
=
{
"WFGroup"
},
notes
=
"createBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/batch"
)
public
ResponseEntity
<
Boolean
>
createBatch
(
@RequestBody
List
<
WFGroupDTO
>
wfgroupdtos
)
{
public
ResponseEntity
<
Boolean
>
createBatch
(
@RequestBody
List
<
WFGroupDTO
>
wfgroupdtos
)
{
...
@@ -117,10 +110,9 @@ public class WFGroupResource {
...
@@ -117,10 +110,9 @@ public class WFGroupResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfgroupService
.
checkKey
(
wfgroupMapping
.
toDomain
(
wfgroupdto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfgroupService
.
checkKey
(
wfgroupMapping
.
toDomain
(
wfgroupdto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Update-all')"
)
@ApiOperation
(
value
=
"Update"
,
tags
=
{
"WFGroup"
},
notes
=
"Update"
)
@ApiOperation
(
value
=
"Update"
,
tags
=
{
"WFGroup"
},
notes
=
"Update"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfgroups/{wfgroup_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfgroups/{wfgroup_id}"
)
@Transactional
public
ResponseEntity
<
WFGroupDTO
>
update
(
@PathVariable
(
"wfgroup_id"
)
String
wfgroup_id
,
@RequestBody
WFGroupDTO
wfgroupdto
)
{
public
ResponseEntity
<
WFGroupDTO
>
update
(
@PathVariable
(
"wfgroup_id"
)
String
wfgroup_id
,
@RequestBody
WFGroupDTO
wfgroupdto
)
{
WFGroup
domain
=
wfgroupMapping
.
toDomain
(
wfgroupdto
);
WFGroup
domain
=
wfgroupMapping
.
toDomain
(
wfgroupdto
);
domain
.
setId
(
wfgroup_id
);
domain
.
setId
(
wfgroup_id
);
...
@@ -129,7 +121,6 @@ public class WFGroupResource {
...
@@ -129,7 +121,6 @@ public class WFGroupResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Update-all')"
)
@ApiOperation
(
value
=
"UpdateBatch"
,
tags
=
{
"WFGroup"
},
notes
=
"UpdateBatch"
)
@ApiOperation
(
value
=
"UpdateBatch"
,
tags
=
{
"WFGroup"
},
notes
=
"UpdateBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfgroups/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfgroups/batch"
)
public
ResponseEntity
<
Boolean
>
updateBatch
(
@RequestBody
List
<
WFGroupDTO
>
wfgroupdtos
)
{
public
ResponseEntity
<
Boolean
>
updateBatch
(
@RequestBody
List
<
WFGroupDTO
>
wfgroupdtos
)
{
...
@@ -137,7 +128,6 @@ public class WFGroupResource {
...
@@ -137,7 +128,6 @@ public class WFGroupResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Default-all')"
)
@ApiOperation
(
value
=
"fetchDEFAULT"
,
tags
=
{
"WFGroup"
}
,
notes
=
"fetchDEFAULT"
)
@ApiOperation
(
value
=
"fetchDEFAULT"
,
tags
=
{
"WFGroup"
}
,
notes
=
"fetchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfgroups/fetchdefault"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfgroups/fetchdefault"
)
public
ResponseEntity
<
List
<
WFGroupDTO
>>
fetchDefault
(
WFGroupSearchContext
context
)
{
public
ResponseEntity
<
List
<
WFGroupDTO
>>
fetchDefault
(
WFGroupSearchContext
context
)
{
...
@@ -150,7 +140,6 @@ public class WFGroupResource {
...
@@ -150,7 +140,6 @@ public class WFGroupResource {
.
body
(
list
);
.
body
(
list
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFGroup-Default-all')"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"WFGroup"
}
,
notes
=
"searchDEFAULT"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"WFGroup"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/searchdefault"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfgroups/searchdefault"
)
public
ResponseEntity
<
Page
<
WFGroupDTO
>>
searchDefault
(
@RequestBody
WFGroupSearchContext
context
)
{
public
ResponseEntity
<
Page
<
WFGroupDTO
>>
searchDefault
(
@RequestBody
WFGroupSearchContext
context
)
{
...
...
This diff is collapsed.
Click to expand it.
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFUserResource.java
浏览文件 @
1d3bc849
...
@@ -11,7 +11,7 @@ import com.alibaba.fastjson.JSONObject;
...
@@ -11,7 +11,7 @@ import com.alibaba.fastjson.JSONObject;
import
javax.servlet.ServletRequest
;
import
javax.servlet.ServletRequest
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.cglib.beans.BeanCopier
;
import
org.springframework.cglib.beans.BeanCopier
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
...
@@ -46,10 +46,9 @@ public class WFUserResource {
...
@@ -46,10 +46,9 @@ public class WFUserResource {
@Lazy
@Lazy
public
WFUserMapping
wfuserMapping
;
public
WFUserMapping
wfuserMapping
;
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Update-all')"
)
@ApiOperation
(
value
=
"Update"
,
tags
=
{
"WFUser"
},
notes
=
"Update"
)
@ApiOperation
(
value
=
"Update"
,
tags
=
{
"WFUser"
},
notes
=
"Update"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfusers/{wfuser_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfusers/{wfuser_id}"
)
@Transactional
public
ResponseEntity
<
WFUserDTO
>
update
(
@PathVariable
(
"wfuser_id"
)
String
wfuser_id
,
@RequestBody
WFUserDTO
wfuserdto
)
{
public
ResponseEntity
<
WFUserDTO
>
update
(
@PathVariable
(
"wfuser_id"
)
String
wfuser_id
,
@RequestBody
WFUserDTO
wfuserdto
)
{
WFUser
domain
=
wfuserMapping
.
toDomain
(
wfuserdto
);
WFUser
domain
=
wfuserMapping
.
toDomain
(
wfuserdto
);
domain
.
setId
(
wfuser_id
);
domain
.
setId
(
wfuser_id
);
...
@@ -58,7 +57,6 @@ public class WFUserResource {
...
@@ -58,7 +57,6 @@ public class WFUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Update-all')"
)
@ApiOperation
(
value
=
"UpdateBatch"
,
tags
=
{
"WFUser"
},
notes
=
"UpdateBatch"
)
@ApiOperation
(
value
=
"UpdateBatch"
,
tags
=
{
"WFUser"
},
notes
=
"UpdateBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfusers/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/wfusers/batch"
)
public
ResponseEntity
<
Boolean
>
updateBatch
(
@RequestBody
List
<
WFUserDTO
>
wfuserdtos
)
{
public
ResponseEntity
<
Boolean
>
updateBatch
(
@RequestBody
List
<
WFUserDTO
>
wfuserdtos
)
{
...
@@ -72,7 +70,6 @@ public class WFUserResource {
...
@@ -72,7 +70,6 @@ public class WFUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfuserMapping
.
toDto
(
wfuserService
.
getDraft
(
new
WFUser
())));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfuserMapping
.
toDto
(
wfuserService
.
getDraft
(
new
WFUser
())));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Get-all')"
)
@ApiOperation
(
value
=
"Get"
,
tags
=
{
"WFUser"
},
notes
=
"Get"
)
@ApiOperation
(
value
=
"Get"
,
tags
=
{
"WFUser"
},
notes
=
"Get"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfusers/{wfuser_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfusers/{wfuser_id}"
)
public
ResponseEntity
<
WFUserDTO
>
get
(
@PathVariable
(
"wfuser_id"
)
String
wfuser_id
)
{
public
ResponseEntity
<
WFUserDTO
>
get
(
@PathVariable
(
"wfuser_id"
)
String
wfuser_id
)
{
...
@@ -81,10 +78,9 @@ public class WFUserResource {
...
@@ -81,10 +78,9 @@ public class WFUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Create-all')"
)
@ApiOperation
(
value
=
"Create"
,
tags
=
{
"WFUser"
},
notes
=
"Create"
)
@ApiOperation
(
value
=
"Create"
,
tags
=
{
"WFUser"
},
notes
=
"Create"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers"
)
@Transactional
public
ResponseEntity
<
WFUserDTO
>
create
(
@RequestBody
WFUserDTO
wfuserdto
)
{
public
ResponseEntity
<
WFUserDTO
>
create
(
@RequestBody
WFUserDTO
wfuserdto
)
{
WFUser
domain
=
wfuserMapping
.
toDomain
(
wfuserdto
);
WFUser
domain
=
wfuserMapping
.
toDomain
(
wfuserdto
);
wfuserService
.
create
(
domain
);
wfuserService
.
create
(
domain
);
...
@@ -92,7 +88,6 @@ public class WFUserResource {
...
@@ -92,7 +88,6 @@ public class WFUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Create-all')"
)
@ApiOperation
(
value
=
"createBatch"
,
tags
=
{
"WFUser"
},
notes
=
"createBatch"
)
@ApiOperation
(
value
=
"createBatch"
,
tags
=
{
"WFUser"
},
notes
=
"createBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/batch"
)
public
ResponseEntity
<
Boolean
>
createBatch
(
@RequestBody
List
<
WFUserDTO
>
wfuserdtos
)
{
public
ResponseEntity
<
Boolean
>
createBatch
(
@RequestBody
List
<
WFUserDTO
>
wfuserdtos
)
{
...
@@ -106,14 +101,12 @@ public class WFUserResource {
...
@@ -106,14 +101,12 @@ public class WFUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfuserService
.
checkKey
(
wfuserMapping
.
toDomain
(
wfuserdto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfuserService
.
checkKey
(
wfuserMapping
.
toDomain
(
wfuserdto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Save-all')"
)
@ApiOperation
(
value
=
"Save"
,
tags
=
{
"WFUser"
},
notes
=
"Save"
)
@ApiOperation
(
value
=
"Save"
,
tags
=
{
"WFUser"
},
notes
=
"Save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/save"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/save"
)
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
WFUserDTO
wfuserdto
)
{
public
ResponseEntity
<
Boolean
>
save
(
@RequestBody
WFUserDTO
wfuserdto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfuserService
.
save
(
wfuserMapping
.
toDomain
(
wfuserdto
)));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfuserService
.
save
(
wfuserMapping
.
toDomain
(
wfuserdto
)));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Save-all')"
)
@ApiOperation
(
value
=
"SaveBatch"
,
tags
=
{
"WFUser"
},
notes
=
"SaveBatch"
)
@ApiOperation
(
value
=
"SaveBatch"
,
tags
=
{
"WFUser"
},
notes
=
"SaveBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/savebatch"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/savebatch"
)
public
ResponseEntity
<
Boolean
>
saveBatch
(
@RequestBody
List
<
WFUserDTO
>
wfuserdtos
)
{
public
ResponseEntity
<
Boolean
>
saveBatch
(
@RequestBody
List
<
WFUserDTO
>
wfuserdtos
)
{
...
@@ -121,15 +114,13 @@ public class WFUserResource {
...
@@ -121,15 +114,13 @@ public class WFUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Remove-all')"
)
@ApiOperation
(
value
=
"Remove"
,
tags
=
{
"WFUser"
},
notes
=
"Remove"
)
@ApiOperation
(
value
=
"Remove"
,
tags
=
{
"WFUser"
},
notes
=
"Remove"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfusers/{wfuser_id}"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfusers/{wfuser_id}"
)
@Transactional
public
ResponseEntity
<
Boolean
>
remove
(
@PathVariable
(
"wfuser_id"
)
String
wfuser_id
)
{
public
ResponseEntity
<
Boolean
>
remove
(
@PathVariable
(
"wfuser_id"
)
String
wfuser_id
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfuserService
.
remove
(
wfuser_id
));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfuserService
.
remove
(
wfuser_id
));
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Remove-all')"
)
@ApiOperation
(
value
=
"RemoveBatch"
,
tags
=
{
"WFUser"
},
notes
=
"RemoveBatch"
)
@ApiOperation
(
value
=
"RemoveBatch"
,
tags
=
{
"WFUser"
},
notes
=
"RemoveBatch"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfusers/batch"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/wfusers/batch"
)
public
ResponseEntity
<
Boolean
>
removeBatch
(
@RequestBody
List
<
String
>
ids
)
{
public
ResponseEntity
<
Boolean
>
removeBatch
(
@RequestBody
List
<
String
>
ids
)
{
...
@@ -137,7 +128,6 @@ public class WFUserResource {
...
@@ -137,7 +128,6 @@ public class WFUserResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Default-all')"
)
@ApiOperation
(
value
=
"fetchDEFAULT"
,
tags
=
{
"WFUser"
}
,
notes
=
"fetchDEFAULT"
)
@ApiOperation
(
value
=
"fetchDEFAULT"
,
tags
=
{
"WFUser"
}
,
notes
=
"fetchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfusers/fetchdefault"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/wfusers/fetchdefault"
)
public
ResponseEntity
<
List
<
WFUserDTO
>>
fetchDefault
(
WFUserSearchContext
context
)
{
public
ResponseEntity
<
List
<
WFUserDTO
>>
fetchDefault
(
WFUserSearchContext
context
)
{
...
@@ -150,7 +140,6 @@ public class WFUserResource {
...
@@ -150,7 +140,6 @@ public class WFUserResource {
.
body
(
list
);
.
body
(
list
);
}
}
@PreAuthorize
(
"hasAnyAuthority('ROLE_SUPERADMIN','ibzrt-WFUser-Default-all')"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"WFUser"
}
,
notes
=
"searchDEFAULT"
)
@ApiOperation
(
value
=
"searchDEFAULT"
,
tags
=
{
"WFUser"
}
,
notes
=
"searchDEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/searchdefault"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/wfusers/searchdefault"
)
public
ResponseEntity
<
Page
<
WFUserDTO
>>
searchDefault
(
@RequestBody
WFUserSearchContext
context
)
{
public
ResponseEntity
<
Page
<
WFUserDTO
>>
searchDefault
(
@RequestBody
WFUserSearchContext
context
)
{
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录