Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
fe75d00d
提交
fe75d00d
编写于
5月 26, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
e58f1668
变更
13
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
278 行增加
和
328 行删除
+278
-328
edit-grid-grid-base.vue
...gets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
+45
-54
main-form-base.vue
...eb/src/widgets/ibzdepartment/main-form/main-form-base.vue
+1
-1
main-grid-base.vue
...eb/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
+45
-54
new-form-form-base.vue
...idgets/ibzdepartment/new-form-form/new-form-form-base.vue
+2
-2
main-grid-base.vue
...b/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
+15
-18
edit-grid-grid-base.vue
...idgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
+55
-66
main-grid-base.vue
app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
+55
-66
main-grid-base.vue
.../src/widgets/ibzorganization/main-grid/main-grid-base.vue
+40
-48
h2_table.xml
ibzou-core/src/main/resources/liquibase/h2_table.xml
+3
-3
IBZDepartmentResource.java
.../main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java
+4
-4
IBZDeptMemberResource.java
.../main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
+4
-4
IBZEmployeeResource.java
...rc/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java
+5
-4
IBZOrganizationResource.java
...ain/java/cn/ibizlab/api/rest/IBZOrganizationResource.java
+4
-4
未找到文件。
app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @
fe75d00d
...
...
@@ -23,12 +23,11 @@
</
template
>
<
template
v-if=
"getColumnState('deptid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptid'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.deptid')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.deptid'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.deptid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
@@ -53,12 +52,11 @@
</template>
<
template
v-if=
"getColumnState('deptcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptcode'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.deptcode')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.deptcode'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.deptcode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
@@ -83,12 +81,11 @@
</template>
<
template
v-if=
"getColumnState('deptname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptname'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.deptname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.deptname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.deptname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
@@ -113,12 +110,11 @@
</template>
<
template
v-if=
"getColumnState('shortname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'shortname'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.shortname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.shortname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.shortname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
@@ -143,12 +139,11 @@
</template>
<
template
v-if=
"getColumnState('deptlevel')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptlevel'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.deptlevel')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.deptlevel'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.deptlevel'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
@@ -173,12 +168,11 @@
</template>
<
template
v-if=
"getColumnState('bcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'bcode'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.bcode')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.bcode'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.bcode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
@@ -203,12 +197,11 @@
</template>
<
template
v-if=
"getColumnState('showorder')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'showorder'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.showorder')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.showorder'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.showorder'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
@@ -233,12 +226,11 @@
</template>
<
template
v-if=
"getColumnState('createdate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'createdate'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.createdate')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.createdate'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.createdate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.createdate"
></app-format-data>
</
template
>
...
...
@@ -246,12 +238,11 @@
</template>
<
template
v-if=
"getColumnState('updatedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.updatedate')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.updatedate'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.updatedate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
</
template
>
...
...
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @
fe75d00d
...
...
@@ -52,7 +52,7 @@
:value=
'data.leadername'
valueitem=
"leaderid"
:multiple=
"true"
filter=
"
srf
orgid"
filter=
"orgid"
:fillmap=
"
{'id':'leaderid','label':'leadername'}"
:disabled="detailsModel.leadername.disabled"
:data="data"
...
...
app_web/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
浏览文件 @
fe75d00d
...
...
@@ -23,12 +23,11 @@
</
template
>
<
template
v-if=
"getColumnState('deptid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptid'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.deptid')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.deptid'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.deptid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
deptid
}}
</span>
</
template
>
...
...
@@ -36,12 +35,11 @@
</template>
<
template
v-if=
"getColumnState('deptcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptcode'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.deptcode')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.deptcode'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.deptcode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
deptcode
}}
</span>
</
template
>
...
...
@@ -49,12 +47,11 @@
</template>
<
template
v-if=
"getColumnState('deptname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptname'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.deptname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.deptname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.deptname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
deptname
}}
</span>
</
template
>
...
...
@@ -62,12 +59,11 @@
</template>
<
template
v-if=
"getColumnState('shortname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'shortname'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.shortname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.shortname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.shortname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
shortname
}}
</span>
</
template
>
...
...
@@ -75,12 +71,11 @@
</template>
<
template
v-if=
"getColumnState('deptlevel')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptlevel'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.deptlevel')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.deptlevel'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.deptlevel'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
deptlevel
}}
</span>
</
template
>
...
...
@@ -88,12 +83,11 @@
</template>
<
template
v-if=
"getColumnState('bcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'bcode'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.bcode')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.bcode'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.bcode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
bcode
}}
</span>
</
template
>
...
...
@@ -101,12 +95,11 @@
</template>
<
template
v-if=
"getColumnState('showorder')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'showorder'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.showorder')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.showorder'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.showorder'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
showorder
}}
</span>
</
template
>
...
...
@@ -114,12 +107,11 @@
</template>
<
template
v-if=
"getColumnState('createdate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'createdate'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.createdate')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.createdate'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.createdate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.createdate"
></app-format-data>
</
template
>
...
...
@@ -127,12 +119,11 @@
</template>
<
template
v-if=
"getColumnState('updatedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.ibzdepartment.main_grid.columns.updatedate')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.updatedate'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.main_grid.columns.updatedate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
</
template
>
...
...
app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-base.vue
浏览文件 @
fe75d00d
...
...
@@ -20,13 +20,13 @@
</i-col>
<i-col
v-show=
"detailsModel.orgname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'orgname'
:itemRules=
"this.rules.orgname"
class=
''
:caption=
"$t('entities.ibzdepartment.newform_form.details.orgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.orgname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'orgid','label':'orgname'}" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'orgid','label':'orgname'}"
filter="srforgid"
:multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.pdeptname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'pdeptname'
:itemRules=
"this.rules.pdeptname"
class=
''
:caption=
"$t('entities.ibzdepartment.newform_form.details.pdeptname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.pdeptname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'pdeptid','label':'pdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'pdeptid','label':'pdeptname'}"
filter="srforgid"
:multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
</app-form-item>
</i-col>
...
...
app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
浏览文件 @
fe75d00d
...
...
@@ -23,12 +23,11 @@
</
template
>
<
template
v-if=
"getColumnState('deptname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptname'"
:label=
"$t('entities.ibzdeptmember.main_grid.columns.deptname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdeptmember.main_grid.columns.deptname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdeptmember.main_grid.columns.deptname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
@@ -45,12 +44,11 @@
</template>
<
template
v-if=
"getColumnState('personname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'personname'"
:label=
"$t('entities.ibzdeptmember.main_grid.columns.personname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdeptmember.main_grid.columns.personname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdeptmember.main_grid.columns.personname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
personname
}}
</span>
</
template
>
...
...
@@ -58,12 +56,11 @@
</template>
<
template
v-if=
"getColumnState('deptid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'deptid'"
:label=
"$t('entities.ibzdeptmember.main_grid.columns.deptid')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdeptmember.main_grid.columns.deptid'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdeptmember.main_grid.columns.deptid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
v-if=
"actualIsOpenEdit"
>
<i-form
style=
"height:100%;"
:model=
"row"
>
...
...
app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @
fe75d00d
此差异已折叠。
点击以展开。
app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
浏览文件 @
fe75d00d
...
...
@@ -23,12 +23,11 @@
</
template
>
<
template
v-if=
"getColumnState('usercode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'usercode'"
:label=
"$t('entities.ibzemployee.main_grid.columns.usercode')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.usercode'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.usercode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
usercode
}}
</span>
</
template
>
...
...
@@ -36,12 +35,11 @@
</template>
<
template
v-if=
"getColumnState('personname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'personname'"
:label=
"$t('entities.ibzemployee.main_grid.columns.personname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.personname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.personname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
personname
}}
</span>
</
template
>
...
...
@@ -49,12 +47,11 @@
</template>
<
template
v-if=
"getColumnState('loginname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'loginname'"
:label=
"$t('entities.ibzemployee.main_grid.columns.loginname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.loginname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.loginname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
loginname
}}
</span>
</
template
>
...
...
@@ -62,12 +59,11 @@
</template>
<
template
v-if=
"getColumnState('orgcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'orgcode'"
:label=
"$t('entities.ibzemployee.main_grid.columns.orgcode')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.orgcode'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.orgcode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
orgcode
}}
</span>
</
template
>
...
...
@@ -75,12 +71,11 @@
</template>
<
template
v-if=
"getColumnState('orgname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'orgname'"
:label=
"$t('entities.ibzemployee.main_grid.columns.orgname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.orgname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.orgname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
orgname
}}
</span>
</
template
>
...
...
@@ -88,12 +83,11 @@
</template>
<
template
v-if=
"getColumnState('mdeptcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'mdeptcode'"
:label=
"$t('entities.ibzemployee.main_grid.columns.mdeptcode')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.mdeptcode'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.mdeptcode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
mdeptcode
}}
</span>
</
template
>
...
...
@@ -101,12 +95,11 @@
</template>
<
template
v-if=
"getColumnState('mdeptname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'mdeptname'"
:label=
"$t('entities.ibzemployee.main_grid.columns.mdeptname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.mdeptname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.mdeptname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
mdeptname
}}
</span>
</
template
>
...
...
@@ -114,12 +107,11 @@
</template>
<
template
v-if=
"getColumnState('sex')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sex'"
:label=
"$t('entities.ibzemployee.main_grid.columns.sex')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.sex'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.sex'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<template
>
<codelist
:value=
"row.sex"
tag=
'CLIBZSex'
codelistType=
'STATIC'
></codelist>
...
...
@@ -129,12 +121,11 @@
</template>
<
template
v-if=
"getColumnState('phone')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'phone'"
:label=
"$t('entities.ibzemployee.main_grid.columns.phone')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.phone'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.phone'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
phone
}}
</span>
</
template
>
...
...
@@ -142,12 +133,11 @@
</template>
<
template
v-if=
"getColumnState('ipaddr')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'ipaddr'"
:label=
"$t('entities.ibzemployee.main_grid.columns.ipaddr')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.ipaddr'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.ipaddr'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
ipaddr
}}
</span>
</
template
>
...
...
@@ -155,12 +145,11 @@
</template>
<
template
v-if=
"getColumnState('showorder')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'showorder'"
:label=
"$t('entities.ibzemployee.main_grid.columns.showorder')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.showorder'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzemployee.main_grid.columns.showorder'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
showorder
}}
</span>
</
template
>
...
...
app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue
浏览文件 @
fe75d00d
...
...
@@ -23,12 +23,11 @@
</
template
>
<
template
v-if=
"getColumnState('orgid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'orgid'"
:label=
"$t('entities.ibzorganization.main_grid.columns.orgid')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.orgid'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.orgid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
orgid
}}
</span>
</
template
>
...
...
@@ -36,12 +35,11 @@
</template>
<
template
v-if=
"getColumnState('orgcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'orgcode'"
:label=
"$t('entities.ibzorganization.main_grid.columns.orgcode')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.orgcode'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.orgcode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
orgcode
}}
</span>
</
template
>
...
...
@@ -49,12 +47,11 @@
</template>
<
template
v-if=
"getColumnState('orgname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'orgname'"
:label=
"$t('entities.ibzorganization.main_grid.columns.orgname')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.orgname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.orgname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
orgname
}}
</span>
</
template
>
...
...
@@ -62,12 +59,11 @@
</template>
<
template
v-if=
"getColumnState('orglevel')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'orglevel'"
:label=
"$t('entities.ibzorganization.main_grid.columns.orglevel')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.orglevel'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.orglevel'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
orglevel
}}
</span>
</
template
>
...
...
@@ -75,12 +71,11 @@
</template>
<
template
v-if=
"getColumnState('shortname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'shortname'"
:label=
"$t('entities.ibzorganization.main_grid.columns.shortname')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.shortname'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.shortname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
shortname
}}
</span>
</
template
>
...
...
@@ -88,12 +83,11 @@
</template>
<
template
v-if=
"getColumnState('showorder')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'showorder'"
:label=
"$t('entities.ibzorganization.main_grid.columns.showorder')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.showorder'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.showorder'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
showorder
}}
</span>
</
template
>
...
...
@@ -101,12 +95,11 @@
</template>
<
template
v-if=
"getColumnState('createdate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'createdate'"
:label=
"$t('entities.ibzorganization.main_grid.columns.createdate')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.createdate'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.createdate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.createdate"
></app-format-data>
</
template
>
...
...
@@ -114,12 +107,11 @@
</template>
<
template
v-if=
"getColumnState('updatedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.ibzorganization.main_grid.columns.updatedate')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.updatedate'
)
}}
</span>
</
template
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.updatedate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
</
template
>
...
...
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
fe75d00d
...
...
@@ -126,7 +126,7 @@
<!--输出实体[IBZDEPT]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-62
5
-4"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-62
8
-4"
>
<createTable
tableName=
"IBZDEPT"
>
<column
name=
"DEPTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZDEPT_DEPTID"
/>
...
...
@@ -179,10 +179,10 @@
<addForeignKeyConstraint
baseColumnNames=
"USERID"
baseTableName=
"IBZDEPTMEMBER"
constraintName=
"DER1N_IBZDEPTMEMBER_IBZEMP_USE"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"USERID"
referencedTableName=
"IBZEMP"
validate=
"true"
/>
</changeSet>
<!--输出实体[IBZDEPT]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-62
5
-10"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-62
8
-10"
>
<addForeignKeyConstraint
baseColumnNames=
"PDEPTID"
baseTableName=
"IBZDEPT"
constraintName=
"DER1N_IBZDEPT_IBZDEPT_PDEPTID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"DEPTID"
referencedTableName=
"IBZDEPT"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-62
5
-11"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-62
8
-11"
>
<addForeignKeyConstraint
baseColumnNames=
"ORGID"
baseTableName=
"IBZDEPT"
constraintName=
"DER1N_IBZDEPT_IBZORG_ORGID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGID"
referencedTableName=
"IBZORG"
validate=
"true"
/>
</changeSet>
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java
浏览文件 @
fe75d00d
...
...
@@ -125,10 +125,10 @@ public class IBZDepartmentResource {
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzdepartments/{ibzdepartment_id}"
)
@Transactional
public
ResponseEntity
<
IBZDepartmentDTO
>
update
(
@PathVariable
(
"ibzdepartment_id"
)
String
ibzdepartment_id
,
@RequestBody
IBZDepartmentDTO
ibzdepartmentdto
)
{
IBZDepartment
domain
=
ibzdepartmentMapping
.
toDomain
(
ibzdepartmentdto
);
domain
.
setDeptid
(
ibzdepartment_id
);
ibzdepartmentService
.
update
(
domain
);
IBZDepartmentDTO
dto
=
ibzdepartmentMapping
.
toDto
(
domain
);
IBZDepartment
domain
=
ibzdepartmentMapping
.
toDomain
(
ibzdepartmentdto
);
domain
.
setDeptid
(
ibzdepartment_id
);
ibzdepartmentService
.
update
(
domain
);
IBZDepartmentDTO
dto
=
ibzdepartmentMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java
浏览文件 @
fe75d00d
...
...
@@ -52,10 +52,10 @@ public class IBZDeptMemberResource {
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzdeptmembers/{ibzdeptmember_id}"
)
@Transactional
public
ResponseEntity
<
IBZDeptMemberDTO
>
update
(
@PathVariable
(
"ibzdeptmember_id"
)
String
ibzdeptmember_id
,
@RequestBody
IBZDeptMemberDTO
ibzdeptmemberdto
)
{
IBZDeptMember
domain
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
);
domain
.
setMemberid
(
ibzdeptmember_id
);
ibzdeptmemberService
.
update
(
domain
);
IBZDeptMemberDTO
dto
=
ibzdeptmemberMapping
.
toDto
(
domain
);
IBZDeptMember
domain
=
ibzdeptmemberMapping
.
toDomain
(
ibzdeptmemberdto
);
domain
.
setMemberid
(
ibzdeptmember_id
);
ibzdeptmemberService
.
update
(
domain
);
IBZDeptMemberDTO
dto
=
ibzdeptmemberMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java
浏览文件 @
fe75d00d
...
...
@@ -69,6 +69,7 @@ public class IBZEmployeeResource {
@Transactional
public
ResponseEntity
<
IBZEmployeeDTO
>
initPwd
(
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
@RequestBody
IBZEmployeeDTO
ibzemployeedto
)
{
IBZEmployee
ibzemployee
=
ibzemployeeMapping
.
toDomain
(
ibzemployeedto
);
ibzemployee
.
setUserid
(
ibzemployee_id
);
ibzemployee
=
ibzemployeeService
.
initPwd
(
ibzemployee
);
ibzemployeedto
=
ibzemployeeMapping
.
toDto
(
ibzemployee
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
ibzemployeedto
);
...
...
@@ -105,10 +106,10 @@ public class IBZEmployeeResource {
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzemployees/{ibzemployee_id}"
)
@Transactional
public
ResponseEntity
<
IBZEmployeeDTO
>
update
(
@PathVariable
(
"ibzemployee_id"
)
String
ibzemployee_id
,
@RequestBody
IBZEmployeeDTO
ibzemployeedto
)
{
IBZEmployee
domain
=
ibzemployeeMapping
.
toDomain
(
ibzemployeedto
);
domain
.
setUserid
(
ibzemployee_id
);
ibzemployeeService
.
update
(
domain
);
IBZEmployeeDTO
dto
=
ibzemployeeMapping
.
toDto
(
domain
);
IBZEmployee
domain
=
ibzemployeeMapping
.
toDomain
(
ibzemployeedto
);
domain
.
setUserid
(
ibzemployee_id
);
ibzemployeeService
.
update
(
domain
);
IBZEmployeeDTO
dto
=
ibzemployeeMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
...
...
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZOrganizationResource.java
浏览文件 @
fe75d00d
...
...
@@ -59,10 +59,10 @@ public class IBZOrganizationResource {
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/ibzorganizations/{ibzorganization_id}"
)
@Transactional
public
ResponseEntity
<
IBZOrganizationDTO
>
update
(
@PathVariable
(
"ibzorganization_id"
)
String
ibzorganization_id
,
@RequestBody
IBZOrganizationDTO
ibzorganizationdto
)
{
IBZOrganization
domain
=
ibzorganizationMapping
.
toDomain
(
ibzorganizationdto
);
domain
.
setOrgid
(
ibzorganization_id
);
ibzorganizationService
.
update
(
domain
);
IBZOrganizationDTO
dto
=
ibzorganizationMapping
.
toDto
(
domain
);
IBZOrganization
domain
=
ibzorganizationMapping
.
toDomain
(
ibzorganizationdto
);
domain
.
setOrgid
(
ibzorganization_id
);
ibzorganizationService
.
update
(
domain
);
IBZOrganizationDTO
dto
=
ibzorganizationMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录