Skip to content

I
ibzou
提交 8dba0102 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 99e64478
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 3469 行增加 和 129 行删除
app_web/package.json
浏览文件 @ 8dba0102
......@@ -27,7 +27,7 @@
"file-saver": "^2.0.2",
"font-awesome": "^4.7.0",
"ibiz-gantt-elastic": "^1.0.15",
"ibiz-vue-lib": "^0.1.9",
"ibiz-vue-lib": "^0.1.10",
"interactjs": "^1.9.4",
"moment": "^2.24.0",
"path-to-regexp": "^6.1.0",
......
app_web/src/components/ibiz-group-picker/ibiz-group-picker.vue
浏览文件 @ 8dba0102
......@@ -4,7 +4,7 @@
<div v-if="showTree" class="ibiz-group-tree">
<ibiz-select-tree :NodesData="treeItems" v-model="treeSelectVal" :treeOnly="true" :defaultChecked="true" @select="treeSelect"></ibiz-select-tree>
</div>
<div class="ibiz-group-content">
<div class="ibiz-group-content" :style="{width:showTree?'calc(100% - 400px)':'100%'}">
<ibiz-group-card :data="cardItems" text="label" value="id" groupName="group" :multiple="multiple" :defaultSelect="cardSelctVal" @select="groupSelect"></ibiz-group-card>
</div>
</div>
......@@ -275,26 +275,29 @@ export default class IBizGroupPicker extends Vue {
</script>
<style lang="less">
.ibiz-group-container {
display: flex;
height: calc(100% - 65px);
.ibiz-group-tree {
width: 400px;
border-right: 1px solid #ddd;
padding: 0 10px;
overflow: auto;
height: 100%;
.ibiz-group-picker{
height:100%;
.ibiz-group-container {
display: flex;
height: calc(100% - 65px);
.ibiz-group-tree {
width: 400px;
border-right: 1px solid #ddd;
padding: 0 10px;
overflow: auto;
height: 100%;
}
.ibiz-group-content {
flex-grow: 1;
padding: 0 10px;
overflow: auto;
height: 100%;
}
}
.ibiz-group-content {
flex-grow: 1;
padding: 0 10px;
overflow: auto;
height: 100%;
.ibiz-group-footer {
padding: 16px;
text-align: right;
border-top: 1px solid #ddd;
}
}
.ibiz-group-footer {
padding: 16px;
text-align: right;
border-top: 1px solid #ddd;
}
</style>
\ No newline at end of file
app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts
浏览文件 @ 8dba0102
......@@ -12,7 +12,7 @@ export default {
mdeptcode: '主部门代码',
mdeptname: '主部门名称',
bcode: '业务编码',
postid: '岗位',
postid: '岗位标识',
postcode: '岗位代码',
postname: '岗位名称',
orgid: '单位',
......
app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts
浏览文件 @ 8dba0102
......@@ -11,7 +11,7 @@ export default {
mdeptcode: '主部门代码',
mdeptname: '主部门名称',
bcode: '业务编码',
postid: '岗位',
postid: '岗位标识',
postcode: '岗位代码',
postname: '岗位名称',
orgid: '单位',
......
app_web/src/locale/lanres/ibzteam-member/ibzteam-member_en_US.ts
浏览文件 @ 8dba0102
export default {
fields: {
teammemberid: 'TEAMMEMBER',
teamid: 'TEAMID',
teammemberid: '组成员标识',
teamid: '组标识',
userid: '用户标识',
teamname: '组名称',
personname: '姓名',
......
app_web/src/locale/lanres/ibzteam-member/ibzteam-member_zh_CN.ts
浏览文件 @ 8dba0102
export default {
fields: {
teammemberid: 'TEAMMEMBER',
teamid: 'TEAMID',
teammemberid: '组成员标识',
teamid: '组标识',
userid: '用户标识',
teamname: '组名称',
personname: '姓名',
......
app_web/src/locale/lanres/ibzteam/ibzteam_en_US.ts
浏览文件 @ 8dba0102
export default {
fields: {
teamid: 'TEAMID',
teamid: '组标识',
teamname: '组名称',
},
};
\ No newline at end of file
app_web/src/locale/lanres/ibzteam/ibzteam_zh_CN.ts
浏览文件 @ 8dba0102
export default {
fields: {
teamid: 'TEAMID',
teamid: '组标识',
teamname: '组名称',
},
};
\ No newline at end of file
app_web/src/mock/entity/ibzteams/ibzteams.ts
浏览文件 @ 8dba0102
......@@ -114,16 +114,165 @@ mock.onGet(new RegExp(/^\/ibzteams\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((c
console.groupEnd();
return [status, _items];
});
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// Update
mock.onPut(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: 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> = ['teamid'];
const matchArray:any = new RegExp(/^\/ibzteams\/([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.teamid, tempValue.teamid));
let data = JSON.parse(config.data);
mockDatas.forEach((item)=>{
if(item['teamid'] == tempValue['teamid'] ){
for(let value in data){
if(item.hasOwnProperty(value)){
item[value] = data[value];
}
}
}
})
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(data);
console.groupEnd();
console.groupEnd();
return [status, data];
});
// Save
mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: 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> = ['teamid'];
const matchArray:any = new RegExp(/^\/ibzteams\/([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]
});
});
}
//let items = mockDatas ? mockDatas : [];
//let _items = items.find((item: any) => Object.is(item.teamid, tempValue.teamid));
let data = JSON.parse(config.data);
mockDatas.forEach((item)=>{
if(item['teamid'] == tempValue['teamid'] ){
for(let value in data){
if(item.hasOwnProperty(value)){
item[value] = data[value];
}
}
}
})
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(data);
console.groupEnd();
console.groupEnd();
return [status, data];
});
// GetDraft
mock.onGet(new RegExp(/^\/ibzteams\/getdraft$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: 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, {}];
});
// CheckKey
mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: 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> = ['teamid'];
const matchArray:any = new RegExp(/^\/ibzteams\/([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]
});
});
}
//let items = mockDatas ? mockDatas : [];
//let _items = items.find((item: any) => Object.is(item.teamid, tempValue.teamid));
let data = JSON.parse(config.data);
mockDatas.forEach((item)=>{
if(item['teamid'] == tempValue['teamid'] ){
for(let value in data){
if(item.hasOwnProperty(value)){
item[value] = data[value];
}
}
}
})
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(data);
console.groupEnd();
console.groupEnd();
return [status, data];
});
// Create
mock.onPost(new RegExp(/^\/ibzteams\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: 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> = ['teamid'];
const matchArray:any = new RegExp(/^\/ibzteams\/([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(mockDatas[0]);
console.groupEnd();
console.groupEnd();
return [status, mockDatas[0]];
});
// FetchDefault
mock.onGet(new RegExp(/^\/ibzteams\/select$/)).reply((config: any) => {
mock.onGet(new RegExp(/^\/ibzteams\/fetchdefault$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: FetchDefault");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
......@@ -138,7 +287,7 @@ mock.onGet(new RegExp(/^\/ibzteams\/select$/)).reply((config: any) => {
});
// FetchDefault
mock.onGet(new RegExp(/^\/ibzteams\/select(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
mock.onGet(new RegExp(/^\/ibzteams\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: FetchDefault");
console.table({url:config.url, method: config.method, data:config.data});
if(config.url.includes('page')){
......@@ -173,3 +322,59 @@ mock.onGet(new RegExp(/^\/ibzteams\/select(\?[\w-./?%&=,]*)*$/)).reply((config:
// URI参数传递情况未实现
// URI参数传递情况未实现
// Remove
mock.onDelete(new RegExp(/^\/ibzteams\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: 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> = ['teamid'];
const matchArray:any = new RegExp(/^\/ibzteams\/([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.teamid, tempValue.teamid));
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(_items?_items:{});
console.groupEnd();
console.groupEnd();
return [status, _items?_items:{}];
});
// Get
mock.onGet(new RegExp(/^\/ibzteams\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:ibzteam 方法: 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> = ['teamid'];
const matchArray:any = new RegExp(/^\/ibzteams\/([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.teamid, tempValue.teamid));
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(_items?_items:{});
console.groupEnd();
console.groupEnd();
return [status, _items?_items:{}];
});
app_web/src/service/ibzemployee/ibzemployee-service-base.ts
浏览文件 @ 8dba0102
......@@ -144,6 +144,21 @@ export default class IBZEmployeeServiceBase extends EntityService {
return Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/ibzemployees`,data,isloading);
}
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -168,6 +183,7 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzemployees`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -214,6 +230,21 @@ export default class IBZEmployeeServiceBase extends EntityService {
return Http.getInstance().put(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}`,data,isloading);
}
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -231,6 +262,7 @@ export default class IBZEmployeeServiceBase extends EntityService {
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzemployees/${context.ibzemployee}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -255,6 +287,21 @@ export default class IBZEmployeeServiceBase extends EntityService {
return Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}/save`,data,isloading);
}
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
let ibzdeptmembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
......@@ -272,6 +319,7 @@ export default class IBZEmployeeServiceBase extends EntityService {
masterData.ibzdeptmembers = ibzdeptmembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzemployees/${context.ibzemployee}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......@@ -296,6 +344,7 @@ export default class IBZEmployeeServiceBase extends EntityService {
return Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}/ibzemployees/${context.ibzemployee}`,isloading);
}
let res:any = await Http.getInstance().get(`/ibzemployees/${context.ibzemployee}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
......@@ -322,6 +371,7 @@ export default class IBZEmployeeServiceBase extends EntityService {
}
let res:any = await Http.getInstance().get(`/ibzemployees/getdraft`,isloading);
res.data.ibzemployee = data.ibzemployee;
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
......
app_web/src/service/ibzteam/ibzteam-service-base.ts
浏览文件 @ 8dba0102
......@@ -51,6 +51,168 @@ export default class IBZTeamServiceBase extends EntityService {
return Http.getInstance().get(`/ibzteams/${context.ibzteam}/select`,isloading);
}
/**
* Update接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZTeamServiceBase
*/
public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzteams/${context.ibzteam}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
/**
* Remove接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZTeamServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().delete(`/ibzteams/${context.ibzteam}`,isloading);
}
/**
* Get接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZTeamServiceBase
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzteams/${context.ibzteam}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
/**
* Save接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZTeamServiceBase
*/
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzteams/${context.ibzteam}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
/**
* GetDraft接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZTeamServiceBase
*/
public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzteams/getdraft`,isloading);
res.data.ibzteam = data.ibzteam;
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
/**
* CheckKey接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZTeamServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/ibzteams/${context.ibzteam}/checkkey`,data,isloading);
}
/**
* Create接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZTeamServiceBase
*/
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
}
if(data.srffrontuf){
delete data.srffrontuf;
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzteams`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
/**
* FetchDefault接口方法
*
......@@ -62,6 +224,6 @@ export default class IBZTeamServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzteams/select`,tempData,isloading);
return Http.getInstance().get(`/ibzteams/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-model.ts
浏览文件 @ 8dba0102
......@@ -26,6 +26,11 @@ export default class EditGridModel {
]
}else{
return [
{
name: 'postid',
prop: 'postid',
dataType: 'PICKUP',
},
{
name: 'sex',
prop: 'sex',
......
app_web/src/widgets/ibzemployee/main-grid/main-grid-model.ts
浏览文件 @ 8dba0102
......@@ -26,6 +26,11 @@ export default class MainModel {
]
}else{
return [
{
name: 'postid',
prop: 'postid',
dataType: 'PICKUP',
},
{
name: 'sex',
prop: 'sex',
......
ibzou-core/pom.xml
浏览文件 @ 8dba0102
......@@ -92,6 +92,12 @@
<artifactId>liquibase-core</artifactId>
</dependency>
<!--xxl-job定时服务 -->
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
</dependency>
</dependencies>
<properties>
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java
浏览文件 @ 8dba0102
......@@ -117,7 +117,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
@JsonProperty("bcode")
private String bcode;
/**
* 岗位
* 岗位标识
*/
@TableField(value = "postid")
@JSONField(name = "postid")
......@@ -133,7 +133,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
/**
* 岗位名称
*/
@TableField(value = "postname")
@TableField(exist = false)
@JSONField(name = "postname")
@JsonProperty("postname")
private String postname;
......@@ -317,6 +317,14 @@ public class IBZEmployee extends EntityMP implements Serializable {
@TableField(exist = false)
private cn.ibizlab.core.ou.domain.IBZOrganization org;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.core.ou.domain.IBZPost post;
/**
......@@ -390,7 +398,7 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.modify("bcode",bcode);
}
/**
* 设置 [岗位]
* 设置 [岗位标识]
*/
public void setPostid(String postid){
this.postid = postid ;
......@@ -403,13 +411,6 @@ public class IBZEmployee extends EntityMP implements Serializable {
this.postcode = postcode ;
this.modify("postcode",postcode);
}
/**
* 设置 [岗位名称]
*/
public void setPostname(String postname){
this.postname = postname ;
this.modify("postname",postname);
}
/**
* 设置 [单位代码]
*/
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZPost.java
浏览文件 @ 8dba0102
......@@ -39,7 +39,7 @@ public class IBZPost extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
/**
* POSTID
* 岗位标识
*/
@DEField(isKeyField=true)
@TableId(value= "postid",type=IdType.UUID)
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeam.java
浏览文件 @ 8dba0102
......@@ -39,7 +39,7 @@ public class IBZTeam extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
/**
* TEAMID
* 组标识
*/
@DEField(isKeyField=true)
@TableId(value= "teamid",type=IdType.UUID)
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeamMember.java
浏览文件 @ 8dba0102
......@@ -39,7 +39,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
/**
* TEAMMEMBER
* 组成员标识
*/
@DEField(isKeyField=true)
@TableId(value= "teammemberid",type=IdType.UUID)
......@@ -47,7 +47,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
@JsonProperty("teammemberid")
private String teammemberid;
/**
* TEAMID
* 组标识
*/
@TableField(value = "teamid")
@JSONField(name = "teamid")
......@@ -94,7 +94,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
/**
* 设置 [TEAMID]
* 设置 [组标识]
*/
public void setTeamid(String teamid){
this.teamid = teamid ;
......@@ -108,6 +108,22 @@ public class IBZTeamMember extends EntityMP implements Serializable {
this.modify("userid",userid);
}
/**
* 获取 [组成员标识]
*/
public String getTeammemberid(){
if(ObjectUtils.isEmpty(teammemberid)){
teammemberid=(String)getDefaultKey(true);
}
return teammemberid;
}
@Override
public Serializable getDefaultKey(boolean gen) {
if((!ObjectUtils.isEmpty(this.getTeamid()))&&(!ObjectUtils.isEmpty(this.getUserid())))
return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getTeamid(),this.getUserid()).getBytes());
return null;
}
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZEmployeeSearchContext.java
浏览文件 @ 8dba0102
......@@ -61,6 +61,27 @@ public class IBZEmployeeSearchContext extends QueryWrapperContext<IBZEmployee> {
if(!ObjectUtils.isEmpty(this.n_bcode_like)){
this.getSelectCond().like("bcode", n_bcode_like);
}
}
private String n_postid_eq;//[岗位标识]
public void setN_postid_eq(String n_postid_eq) {
this.n_postid_eq = n_postid_eq;
if(!ObjectUtils.isEmpty(this.n_postid_eq)){
this.getSelectCond().eq("postid", n_postid_eq);
}
}
private String n_postname_eq;//[岗位名称]
public void setN_postname_eq(String n_postname_eq) {
this.n_postname_eq = n_postname_eq;
if(!ObjectUtils.isEmpty(this.n_postname_eq)){
this.getSelectCond().eq("postname", n_postname_eq);
}
}
private String n_postname_like;//[岗位名称]
public void setN_postname_like(String n_postname_like) {
this.n_postname_like = n_postname_like;
if(!ObjectUtils.isEmpty(this.n_postname_like)){
this.getSelectCond().like("postname", n_postname_like);
}
}
private String n_orgid_eq;//[单位]
public void setN_orgid_eq(String n_orgid_eq) {
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZPostSearchContext.java
浏览文件 @ 8dba0102
......@@ -43,7 +43,7 @@ public class IBZPostSearchContext extends QueryWrapperContext<IBZPost> {
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper ->
wrapper.like("postcode", query)
wrapper.like("postname", query)
);
}
}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZTeamMemberSearchContext.java
浏览文件 @ 8dba0102
......@@ -27,14 +27,14 @@ import cn.ibizlab.core.ou.domain.IBZTeamMember;
@Data
public class IBZTeamMemberSearchContext extends QueryWrapperContext<IBZTeamMember> {
private String n_teammemberid_like;//[TEAMMEMBER]
private String n_teammemberid_like;//[组成员标识]
public void setN_teammemberid_like(String n_teammemberid_like) {
this.n_teammemberid_like = n_teammemberid_like;
if(!ObjectUtils.isEmpty(this.n_teammemberid_like)){
this.getSelectCond().like("teammemberid", n_teammemberid_like);
}
}
private String n_teamid_eq;//[TEAMID]
private String n_teamid_eq;//[组标识]
public void setN_teamid_eq(String n_teamid_eq) {
this.n_teamid_eq = n_teamid_eq;
if(!ObjectUtils.isEmpty(this.n_teamid_eq)){
......@@ -85,7 +85,7 @@ public class IBZTeamMemberSearchContext extends QueryWrapperContext<IBZTeamMembe
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper ->
wrapper.like("teammemberid", query)
wrapper.like("personname", query)
);
}
}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZTeamSearchContext.java
浏览文件 @ 8dba0102
......@@ -27,7 +27,7 @@ import cn.ibizlab.core.ou.domain.IBZTeam;
@Data
public class IBZTeamSearchContext extends QueryWrapperContext<IBZTeam> {
private String n_teamid_like;//[TEAMID]
private String n_teamid_like;//[组标识]
public void setN_teamid_like(String n_teamid_like) {
this.n_teamid_like = n_teamid_like;
if(!ObjectUtils.isEmpty(this.n_teamid_like)){
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZEmployeeMapper.java
浏览文件 @ 8dba0102
......@@ -71,4 +71,6 @@ public interface IBZEmployeeMapper extends BaseMapper<IBZEmployee>{
List<IBZEmployee> selectByOrgid(@Param("orgid") Serializable orgid) ;
List<IBZEmployee> selectByPostid(@Param("postid") Serializable postid) ;
}
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/IIBZEmployeeService.java
浏览文件 @ 8dba0102
......@@ -48,6 +48,9 @@ public interface IIBZEmployeeService extends IService<IBZEmployee>{
List<IBZEmployee> selectByOrgid(String orgid) ;
@CacheEvict(value="ibzemployee",allEntries=true)
void removeByOrgid(String orgid) ;
List<IBZEmployee> selectByPostid(String postid) ;
@CacheEvict(value="ibzemployee",allEntries=true)
void removeByPostid(String postid) ;
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZEmployeeServiceImpl.java
浏览文件 @ 8dba0102
......@@ -56,6 +56,9 @@ public class IBZEmployeeServiceImpl extends ServiceImpl<IBZEmployeeMapper, IBZEm
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZOrganizationService ibzorganizationService;
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZPostService ibzpostService;
@Autowired
@Lazy
......@@ -194,6 +197,16 @@ public class IBZEmployeeServiceImpl extends ServiceImpl<IBZEmployeeMapper, IBZEm
this.remove(new QueryWrapper<IBZEmployee>().eq("orgid",orgid));
}
@Override
public List<IBZEmployee> selectByPostid(String postid) {
return baseMapper.selectByPostid(postid);
}
@Override
public void removeByPostid(String postid) {
this.remove(new QueryWrapper<IBZEmployee>().eq("postid",postid));
}
/**
* 查询集合 DEFAULT
......@@ -233,6 +246,16 @@ public class IBZEmployeeServiceImpl extends ServiceImpl<IBZEmployeeMapper, IBZEm
et.setOrgcode(org.getOrgcode());
et.setOrgname(org.getOrgname());
}
//实体关系[DER1N_IBZEMP_IBZPOST_POSTID]
if(!ObjectUtils.isEmpty(et.getPostid())){
cn.ibizlab.core.ou.domain.IBZPost post=et.getPost();
if(ObjectUtils.isEmpty(post)){
cn.ibizlab.core.ou.domain.IBZPost majorEntity=ibzpostService.get(et.getPostid());
et.setPost(majorEntity);
post=majorEntity;
}
et.setPostname(post.getPostname());
}
}
@Override
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZPostServiceImpl.java
浏览文件 @ 8dba0102
......@@ -44,6 +44,9 @@ import org.springframework.util.StringUtils;
@Service("IBZPostServiceImpl")
public class IBZPostServiceImpl extends ServiceImpl<IBZPostMapper, IBZPost> implements IIBZPostService {
@Autowired
@Lazy
private cn.ibizlab.core.ou.service.IIBZEmployeeService ibzemployeeService;
private int batchSize = 500;
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZTeamMemberServiceImpl.java
浏览文件 @ 8dba0102
......@@ -151,7 +151,7 @@ public class IBZTeamMemberServiceImpl extends ServiceImpl<IBZTeamMemberMapper, I
@Override
public void createBatch(List<IBZTeamMember> list) {
list.forEach(item->fillParentData(item));
this.saveBatch(list,batchSize);
this.saveOrUpdateBatch(list,batchSize);
}
......
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 8dba0102
......@@ -32,7 +32,7 @@
<!--输出实体[IBZTEAM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzteam-32-2">
<changeSet author="a_A_5d9d78509" id="tab-ibzteam-35-2">
<createTable tableName="IBZTEAM">
<column name="TEAMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZTEAM_TEAMID"/>
......@@ -44,7 +44,7 @@
<!--输出实体[IBZEMP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzemp-647-3">
<changeSet author="a_A_5d9d78509" id="tab-ibzemp-654-3">
<createTable tableName="IBZEMP">
<column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
......@@ -73,8 +73,6 @@
</column>
<column name="POSTCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="POSTNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="ORGID" remarks="" type="VARCHAR(100)">
</column>
<column name="ORGCODE" remarks="" type="VARCHAR(100)">
......@@ -124,7 +122,7 @@
<!--输出实体[IBZPOST]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzpost-7-4">
<changeSet author="a_A_5d9d78509" id="tab-ibzpost-13-4">
<createTable tableName="IBZPOST">
<column name="POSTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZPOST_POSTID"/>
......@@ -188,7 +186,7 @@
<!--输出实体[IBZTEAMMEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzteammember-24-7">
<changeSet author="a_A_5d9d78509" id="tab-ibzteammember-28-7">
<createTable tableName="IBZTEAMMEMBER">
<column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZTEAMMEMBER_TEAMMEMBERID"/>
......@@ -206,32 +204,35 @@
</changeSet>
<!--输出实体[IBZTEAM]外键关系 -->
<!--输出实体[IBZEMP]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-647-9">
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-654-9">
<addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZDEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-647-10">
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-654-10">
<addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-654-11">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZPOST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<!--输出实体[IBZPOST]外键关系 -->
<!--输出实体[IBZDEPTMEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-30-11">
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-30-12">
<addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZDEPT_DE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-30-12">
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-30-13">
<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-701-13">
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-701-14">
<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-701-14">
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-701-15">
<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>
<!--输出实体[IBZTEAMMEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-24-15">
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-28-16">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_IBZTEAMMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-24-16">
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-28-17">
<addForeignKeyConstraint baseColumnNames="TEAMID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_IBZTEAMMEMBER_IBZTEAM_TE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TEAMID" referencedTableName="IBZTEAM" validate="true"/>
</changeSet>
......
ibzou-core/src/main/resources/mapper/ou/ibzemployee/IBZEmployeeMapper.xml
浏览文件 @ 8dba0102
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="IBZEmployeeResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`CREATEDATE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`ENABLE`, t1.`FONTSIZE`, t1.`IPADDR`, t1.`LANG`, t1.`LOGINNAME`, t1.`MDEPTCODE`, t1.`MDEPTID`, t1.`MDEPTNAME`, t1.`MEMO`, t1.`NICKNAME`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PASSWORD`, t1.`PERSONNAME`, t1.`PHONE`, t1.`POSTCODE`, t1.`POSTID`, t1.`POSTNAME`, t1.`RESERVER`, t1.`SEX`, t1.`SHOWORDER`, t1.`THEME`, t1.`UPDATEDATE`, t1.`USERCODE`, t1.`USERICON`, t1.`USERID`, t1.`USERNAME` FROM `IBZEMP` t1 ) t1 where userid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`CREATEDATE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`ENABLE`, t1.`FONTSIZE`, t1.`IPADDR`, t1.`LANG`, t1.`LOGINNAME`, t1.`MDEPTCODE`, t1.`MDEPTID`, t1.`MDEPTNAME`, t1.`MEMO`, t1.`NICKNAME`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PASSWORD`, t1.`PERSONNAME`, t1.`PHONE`, t1.`POSTCODE`, t1.`POSTID`, t11.`POSTNAME`, t1.`RESERVER`, t1.`SEX`, t1.`SHOWORDER`, t1.`THEME`, t1.`UPDATEDATE`, t1.`USERCODE`, t1.`USERICON`, t1.`USERID`, t1.`USERNAME` FROM `IBZEMP` t1 LEFT JOIN IBZPOST t11 ON t1.POSTID = t11.POSTID ) t1 where userid=#{id}]]>
</select>
<select id="selectById" resultMap="IBZEmployeeResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.ADDR, t1.AVATAR, t1.BCODE, t1.BIRTHDAY, t1.CERTCODE, t1.CREATEDATE, t1.DOMAINS, t1.EMAIL, t1.ENABLE, t1.FONTSIZE, t1.GZZ, t1.IPADDR, t1.LANG, t1.LOGINNAME, t1.MDEPTCODE, t1.MDEPTID, t1.MDEPTNAME, t1.MEMO, t1.NICKNAME, t1.ORGCODE, t1.ORGID, t1.ORGNAME, t1.PASSWORD, t1.PERSONNAME, t1.PHONE, t1.POSTCODE, t1.POSTID, t1.POSTNAME, t1.RESERVER, t1.RYZJ, t1.SEX, t1.SHOWORDER, t1.SXQM, t1.THEME, t1.UPDATEDATE, t1.USERCODE, t1.USERICON, t1.USERID, t1.USERNAME, t1.ZW FROM IBZEMP t1 ) t1 where userid=#{id}]]>
......@@ -15,6 +15,7 @@
<resultMap id="IBZEmployeeResultMap" type="cn.ibizlab.core.ou.domain.IBZEmployee" autoMapping="true">
<id property="userid" column="userid" /><!--主键字段映射-->
<result property="mdeptid" column="mdeptid" />
<result property="postid" column="postid" />
<result property="orgid" column="orgid" />
......@@ -22,6 +23,8 @@
<association property="maindept" javaType="cn.ibizlab.core.ou.domain.IBZDepartment" column="mdeptid" select="cn.ibizlab.core.ou.mapper.IBZDepartmentMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="org" javaType="cn.ibizlab.core.ou.domain.IBZOrganization" column="orgid" select="cn.ibizlab.core.ou.mapper.IBZOrganizationMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="post" javaType="cn.ibizlab.core.ou.domain.IBZPost" column="postid" select="cn.ibizlab.core.ou.mapper.IBZPostMapper.selectById" fetchType="lazy"></association>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_IBZEMP_IBZDEPT_MDEPTID] -->
......@@ -37,6 +40,13 @@
<include refid="Default" />
) t1
where orgid=#{orgid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_IBZEMP_IBZPOST_POSTID] -->
<select id="selectByPostid" resultMap="IBZEmployeeResultMap">
select t1.* from (
<include refid="Default" />
) t1
where postid=#{postid}
</select>
<!--数据集合[Default]-->
......@@ -50,7 +60,7 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`CREATEDATE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`ENABLE`, t1.`FONTSIZE`, t1.`IPADDR`, t1.`LANG`, t1.`LOGINNAME`, t1.`MDEPTCODE`, t1.`MDEPTID`, t1.`MDEPTNAME`, t1.`MEMO`, t1.`NICKNAME`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PASSWORD`, t1.`PERSONNAME`, t1.`PHONE`, t1.`POSTCODE`, t1.`POSTID`, t1.`POSTNAME`, t1.`RESERVER`, t1.`SEX`, t1.`SHOWORDER`, t1.`THEME`, t1.`UPDATEDATE`, t1.`USERCODE`, t1.`USERICON`, t1.`USERID`, t1.`USERNAME` FROM `IBZEMP` t1
<![CDATA[ SELECT t1.`ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`CREATEDATE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`ENABLE`, t1.`FONTSIZE`, t1.`IPADDR`, t1.`LANG`, t1.`LOGINNAME`, t1.`MDEPTCODE`, t1.`MDEPTID`, t1.`MDEPTNAME`, t1.`MEMO`, t1.`NICKNAME`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PASSWORD`, t1.`PERSONNAME`, t1.`PHONE`, t1.`POSTCODE`, t1.`POSTID`, t11.`POSTNAME`, t1.`RESERVER`, t1.`SEX`, t1.`SHOWORDER`, t1.`THEME`, t1.`UPDATEDATE`, t1.`USERCODE`, t1.`USERICON`, t1.`USERID`, t1.`USERNAME` FROM `IBZEMP` t1 LEFT JOIN IBZPOST t11 ON t1.POSTID = t11.POSTID
WHERE t1.ENABLE = 1
]]>
</sql>
......@@ -64,7 +74,7 @@
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`CREATEDATE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`ENABLE`, t1.`FONTSIZE`, t1.`IPADDR`, t1.`LANG`, t1.`LOGINNAME`, t1.`MDEPTCODE`, t1.`MDEPTID`, t1.`MDEPTNAME`, t1.`MEMO`, t1.`NICKNAME`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PASSWORD`, t1.`PERSONNAME`, t1.`PHONE`, t1.`POSTCODE`, t1.`POSTID`, t1.`POSTNAME`, t1.`RESERVER`, t1.`SEX`, t1.`SHOWORDER`, t1.`THEME`, t1.`UPDATEDATE`, t1.`USERCODE`, t1.`USERICON`, t1.`USERID`, t1.`USERNAME` FROM `IBZEMP` t1
<![CDATA[ SELECT t1.`ADDR`, t1.`AVATAR`, t1.`BCODE`, t1.`BIRTHDAY`, t1.`CERTCODE`, t1.`CREATEDATE`, t1.`DOMAINS`, t1.`EMAIL`, t1.`ENABLE`, t1.`FONTSIZE`, t1.`IPADDR`, t1.`LANG`, t1.`LOGINNAME`, t1.`MDEPTCODE`, t1.`MDEPTID`, t1.`MDEPTNAME`, t1.`MEMO`, t1.`NICKNAME`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PASSWORD`, t1.`PERSONNAME`, t1.`PHONE`, t1.`POSTCODE`, t1.`POSTID`, t11.`POSTNAME`, t1.`RESERVER`, t1.`SEX`, t1.`SHOWORDER`, t1.`THEME`, t1.`UPDATEDATE`, t1.`USERCODE`, t1.`USERICON`, t1.`USERID`, t1.`USERNAME` FROM `IBZEMP` t1 LEFT JOIN IBZPOST t11 ON t1.POSTID = t11.POSTID
WHERE t1.ENABLE = 1
]]>
</sql>
......
ibzou-dependencies/pom.xml
浏览文件 @ 8dba0102
......@@ -317,12 +317,6 @@
<artifactId>h2</artifactId>
</dependency>
<!--xxl-job定时服务 -->
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
</dependency>
<!-- Error -->
<!-- Security -->
......
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/IBZEmployeeDTO.java
浏览文件 @ 8dba0102
......@@ -411,14 +411,6 @@ public class IBZEmployeeDTO extends DTOBase implements Serializable {
this.modify("postcode",postcode);
}
/**
* 设置 [POSTNAME]
*/
public void setPostname(String postname){
this.postname = postname ;
this.modify("postname",postname);
}
/**
* 设置 [ORGCODE]
*/
......
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZPostResource.java
浏览文件 @ 8dba0102
......@@ -46,5 +46,117 @@ public class IBZPostResource {
@Lazy
public IBZPostMapping ibzpostMapping;
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Update-all')")
@ApiOperation(value = "更新岗位", tags = {"岗位" }, notes = "更新岗位")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzposts/{ibzpost_id}")
@Transactional
public ResponseEntity<IBZPostDTO> update(@PathVariable("ibzpost_id") String ibzpost_id, @RequestBody IBZPostDTO ibzpostdto) {
IBZPost domain = ibzpostMapping.toDomain(ibzpostdto);
domain .setPostid(ibzpost_id);
ibzpostService.update(domain );
IBZPostDTO dto = ibzpostMapping.toDto(domain );
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Update-all')")
@ApiOperation(value = "批量更新岗位", tags = {"岗位" }, notes = "批量更新岗位")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzposts/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZPostDTO> ibzpostdtos) {
ibzpostService.updateBatch(ibzpostMapping.toDomain(ibzpostdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@ApiOperation(value = "获取岗位草稿", tags = {"岗位" }, notes = "获取岗位草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzposts/getdraft")
public ResponseEntity<IBZPostDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(ibzpostMapping.toDto(ibzpostService.getDraft(new IBZPost())));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Save-all')")
@ApiOperation(value = "保存岗位", tags = {"岗位" }, notes = "保存岗位")
@RequestMapping(method = RequestMethod.POST, value = "/ibzposts/save")
public ResponseEntity<Boolean> save(@RequestBody IBZPostDTO ibzpostdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzpostService.save(ibzpostMapping.toDomain(ibzpostdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Save-all')")
@ApiOperation(value = "批量保存岗位", tags = {"岗位" }, notes = "批量保存岗位")
@RequestMapping(method = RequestMethod.POST, value = "/ibzposts/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZPostDTO> ibzpostdtos) {
ibzpostService.saveBatch(ibzpostMapping.toDomain(ibzpostdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@ApiOperation(value = "检查岗位", tags = {"岗位" }, notes = "检查岗位")
@RequestMapping(method = RequestMethod.POST, value = "/ibzposts/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody IBZPostDTO ibzpostdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzpostService.checkKey(ibzpostMapping.toDomain(ibzpostdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Remove-all')")
@ApiOperation(value = "删除岗位", tags = {"岗位" }, notes = "删除岗位")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzposts/{ibzpost_id}")
@Transactional
public ResponseEntity<Boolean> remove(@PathVariable("ibzpost_id") String ibzpost_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzpostService.remove(ibzpost_id));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Remove-all')")
@ApiOperation(value = "批量删除岗位", tags = {"岗位" }, notes = "批量删除岗位")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzposts/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
ibzpostService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Get-all')")
@ApiOperation(value = "获取岗位", tags = {"岗位" }, notes = "获取岗位")
@RequestMapping(method = RequestMethod.GET, value = "/ibzposts/{ibzpost_id}")
public ResponseEntity<IBZPostDTO> get(@PathVariable("ibzpost_id") String ibzpost_id) {
IBZPost domain = ibzpostService.get(ibzpost_id);
IBZPostDTO dto = ibzpostMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Create-all')")
@ApiOperation(value = "新建岗位", tags = {"岗位" }, notes = "新建岗位")
@RequestMapping(method = RequestMethod.POST, value = "/ibzposts")
@Transactional
public ResponseEntity<IBZPostDTO> create(@RequestBody IBZPostDTO ibzpostdto) {
IBZPost domain = ibzpostMapping.toDomain(ibzpostdto);
ibzpostService.create(domain);
IBZPostDTO dto = ibzpostMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Create-all')")
@ApiOperation(value = "批量新建岗位", tags = {"岗位" }, notes = "批量新建岗位")
@RequestMapping(method = RequestMethod.POST, value = "/ibzposts/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZPostDTO> ibzpostdtos) {
ibzpostService.createBatch(ibzpostMapping.toDomain(ibzpostdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Default-all')")
@ApiOperation(value = "获取DEFAULT", tags = {"岗位" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzposts/fetchdefault")
public ResponseEntity<List<IBZPostDTO>> fetchDefault(IBZPostSearchContext context) {
Page<IBZPost> domains = ibzpostService.searchDefault(context) ;
List<IBZPostDTO> list = ibzpostMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZPost-Default-all')")
@ApiOperation(value = "查询DEFAULT", tags = {"岗位" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzposts/searchdefault")
public ResponseEntity<Page<IBZPostDTO>> searchDefault(@RequestBody IBZPostSearchContext context) {
Page<IBZPost> domains = ibzpostService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzpostMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZTeamResource.java
浏览文件 @ 8dba0102
......@@ -46,5 +46,117 @@ public class IBZTeamResource {
@Lazy
public IBZTeamMapping ibzteamMapping;
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Update-all')")
@ApiOperation(value = "更新组", tags = {"组" }, notes = "更新组")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzteams/{ibzteam_id}")
@Transactional
public ResponseEntity<IBZTeamDTO> update(@PathVariable("ibzteam_id") String ibzteam_id, @RequestBody IBZTeamDTO ibzteamdto) {
IBZTeam domain = ibzteamMapping.toDomain(ibzteamdto);
domain .setTeamid(ibzteam_id);
ibzteamService.update(domain );
IBZTeamDTO dto = ibzteamMapping.toDto(domain );
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Update-all')")
@ApiOperation(value = "批量更新组", tags = {"组" }, notes = "批量更新组")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzteams/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZTeamDTO> ibzteamdtos) {
ibzteamService.updateBatch(ibzteamMapping.toDomain(ibzteamdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Remove-all')")
@ApiOperation(value = "删除组", tags = {"组" }, notes = "删除组")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzteams/{ibzteam_id}")
@Transactional
public ResponseEntity<Boolean> remove(@PathVariable("ibzteam_id") String ibzteam_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzteamService.remove(ibzteam_id));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Remove-all')")
@ApiOperation(value = "批量删除组", tags = {"组" }, notes = "批量删除组")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzteams/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
ibzteamService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Get-all')")
@ApiOperation(value = "获取组", tags = {"组" }, notes = "获取组")
@RequestMapping(method = RequestMethod.GET, value = "/ibzteams/{ibzteam_id}")
public ResponseEntity<IBZTeamDTO> get(@PathVariable("ibzteam_id") String ibzteam_id) {
IBZTeam domain = ibzteamService.get(ibzteam_id);
IBZTeamDTO dto = ibzteamMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Save-all')")
@ApiOperation(value = "保存组", tags = {"组" }, notes = "保存组")
@RequestMapping(method = RequestMethod.POST, value = "/ibzteams/save")
public ResponseEntity<Boolean> save(@RequestBody IBZTeamDTO ibzteamdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzteamService.save(ibzteamMapping.toDomain(ibzteamdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Save-all')")
@ApiOperation(value = "批量保存组", tags = {"组" }, notes = "批量保存组")
@RequestMapping(method = RequestMethod.POST, value = "/ibzteams/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZTeamDTO> ibzteamdtos) {
ibzteamService.saveBatch(ibzteamMapping.toDomain(ibzteamdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@ApiOperation(value = "获取组草稿", tags = {"组" }, notes = "获取组草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzteams/getdraft")
public ResponseEntity<IBZTeamDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(ibzteamMapping.toDto(ibzteamService.getDraft(new IBZTeam())));
}
@ApiOperation(value = "检查组", tags = {"组" }, notes = "检查组")
@RequestMapping(method = RequestMethod.POST, value = "/ibzteams/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody IBZTeamDTO ibzteamdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzteamService.checkKey(ibzteamMapping.toDomain(ibzteamdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Create-all')")
@ApiOperation(value = "新建组", tags = {"组" }, notes = "新建组")
@RequestMapping(method = RequestMethod.POST, value = "/ibzteams")
@Transactional
public ResponseEntity<IBZTeamDTO> create(@RequestBody IBZTeamDTO ibzteamdto) {
IBZTeam domain = ibzteamMapping.toDomain(ibzteamdto);
ibzteamService.create(domain);
IBZTeamDTO dto = ibzteamMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Create-all')")
@ApiOperation(value = "批量新建组", tags = {"组" }, notes = "批量新建组")
@RequestMapping(method = RequestMethod.POST, value = "/ibzteams/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZTeamDTO> ibzteamdtos) {
ibzteamService.createBatch(ibzteamMapping.toDomain(ibzteamdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Default-all')")
@ApiOperation(value = "获取DEFAULT", tags = {"组" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzteams/fetchdefault")
public ResponseEntity<List<IBZTeamDTO>> fetchDefault(IBZTeamSearchContext context) {
Page<IBZTeam> domains = ibzteamService.searchDefault(context) ;
List<IBZTeamDTO> list = ibzteamMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZTeam-Default-all')")
@ApiOperation(value = "查询DEFAULT", tags = {"组" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzteams/searchdefault")
public ResponseEntity<Page<IBZTeamDTO>> searchDefault(@RequestBody IBZTeamSearchContext context) {
Page<IBZTeam> domains = ibzteamService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzteamMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或