Skip to content

I
ibzrt
提交 e6c0df08 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_qyk 发布系统代码

上级 1f5c5749
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 590 行增加 和 637 行删除
app_Web/src/components/filter-tree/filter-mode.vue
浏览文件 @ e6c0df08
<template>
<el-select size="small" class="filter-mode" placeholder="条件逻辑" clearable v-model="curVal" @change="onChange">
<el-select size="small" class="filter-mode" placeholder="条件逻辑" v-model="curVal" @change="onChange">
<el-option
v-for="mode in filterMode"
:key="mode.value"
:label="mode.en"
:label="getLabel(mode)"
:value="mode.value"
>
</el-option>
......@@ -43,23 +43,36 @@ export default class FilterMode extends Vue {
public filterMode: any[] = [
// { name: 'AND', value: '$and' },
// { name: 'OR', value: '$or' },
{ zh: '等于(=)', en: 'EQ', value: '$eq' },
{ zh: '', en: 'NE', value: '$ne' },
{ zh: '', en: 'GT', value: '$gt' },
{ zh: '', en: 'GE', value: '$gte' },
{ zh: '', en: 'LT', value: '$lt' },
{ zh: '', en: 'LE', value: '$lte' },
{ zh: '', en: 'IS_NULL', value: '$null' },
{ zh: '', en: 'IS_NOT_NULL', value: '$notNull' },
{ zh: '', en: 'IN', value: '$in' },
{ zh: '', en: 'NOTIN', value: '$notIn' },
{ zh: '', en: 'LIKE', value: '$like' },
{ zh: '', en: 'LIFTLIKE', value: '$startsWith' },
{ zh: '', en: 'RIGHTLIKE', value: '$endsWith' },
{ zh: '', en: 'EXISTS', value: '$exists' },
{ zh: '', en: 'NOTEXISTS', value: '$notExists' }
{ 'zh-CN': '等于(=)', 'en-US': 'EQ', value: '$eq' },
{ 'zh-CN': '不等于(<>)', 'en-US': 'NE', value: '$ne' },
{ 'zh-CN': '大于(>)', 'en-US': 'GT', value: '$gt' },
{ 'zh-CN': '大于等于(>=)', 'en-US': 'GE', value: '$gte' },
{ 'zh-CN': '小于(<)', 'en-US': 'LT', value: '$lt' },
{ 'zh-CN': '小于(<=)', 'en-US': 'LE', value: '$lte' },
{ 'zh-CN': '值为空(Nil)', 'en-US': 'IS_NULL', value: '$null' },
{ 'zh-CN': '值不为空(NotNil)', 'en-US': 'IS_NOT_NULL', value: '$notNull' },
{ 'zh-CN': '值在范围中(In)', 'en-US': 'IN', value: '$in' },
{ 'zh-CN': '值不在范围中(NotIn)', 'en-US': 'NOTIN', value: '$notIn' },
{ 'zh-CN': '文本包含(%)', 'en-US': 'LIKE', value: '$like' },
{ 'zh-CN': '文本左包含(%#)', 'en-US': 'LIFTLIKE', value: '$startsWith' },
{ 'zh-CN': '文本右包含(#%)', 'en-US': 'RIGHTLIKE', value: '$endsWith' },
// { 'zh-CN': '', en: 'EXISTS', value: '$exists' },
// { 'zh-CN': '', en: 'NOTEXISTS', value: '$notExists' }
];
/**
* 获取语言文本
*
* @return {string}
* @memberof FilterMode
*/
getLabel(mode: any): string {
if(this.$i18n.locale) {
return mode[this.$i18n.locale];
}
return mode['zh-CN'];
}
/**
* 值改变
*
......
app_Web/src/components/filter-tree/filter-tree.less
浏览文件 @ e6c0df08
.filter-item {
display: flex;
// margin-top: 10px;
.fa-trash-o {
color: red;
}
.filter-item-group {
width: 100px;
margin-left: 5px;
}
.filter-item-field {
width: 200px;
margin-left: 5px;
}
.filter-item-mode {
width: 200px;
margin-left: 5px;
}
.filter-item-value {
margin-left: 5px;
flex-grow: 1;
}
}
.filter-tree {
.el-tree-node__content {
height: 40px;
......
app_Web/src/components/filter-tree/filter-tree.vue
浏览文件 @ e6c0df08
<template>
<el-tree class="filter-tree" :data="treeItems" :props="defaultProps" :expand-on-click-node="false" default-expand-all>
<el-tree class="filter-tree" :data="treeItems" :expand-on-click-node="false" default-expand-all>
<template slot-scope="{ node, data }">
<template v-if="Object.is(data.name, '$and') || Object.is(data.name, '$or')">
<template v-if="Object.is(data.label, '$and') || Object.is(data.label, '$or')">
<div class="filter-tree-item">
<el-select size="small" v-model="data.name">
<el-option v-for="mode in relationModes" :key="mode.value" :label="mode.zh" :value="mode.value"></el-option>
<el-select size="small" v-model="data.label" :disabled="data.isroot">
<el-option v-for="mode in relationModes" :key="mode.value" :label="getLabel(mode)" :value="mode.value"></el-option>
</el-select>
<div class="filter-tree-action">
<i-button title="添加条件" @click="onAddItem(data)"><i class="fa fa-plus" aria-hidden="true"></i> 添加条件</i-button>
<i-button title="添加组" @click="onAddGroup(data)"><i class="fa fa-plus" aria-hidden="true"></i> 添加组</i-button>
<i-button v-if="!data.isroot" @click="onRemoveItem(node, data)" title="删除"><i class="fa fa-trash-o" aria-hidden="true"></i></i-button>
</div>
</div>
</template>
......@@ -47,24 +48,44 @@ import FilterMode from './filter-mode.vue';
})
export default class FilterTree extends Vue {
/**
* 数据集
*
* @type {*}
* @memberof FilterTree
*/
@Prop() datas: any;
/**
* 过滤项集合
*
* @type {*}
* @memberof FilterTree
*/
@Prop() fields: any;
protected defaultProps: any = {
children: 'items',
label: 'name'
};
/**
* 组条件集合
*
* @type {*}
* @memberof FilterTree
*/
protected relationModes: any[] = [
{ zh: '并且', en: 'AND', value: '$and' },
{ zh: '或', en: 'OR', value: '$or' }
{ 'zh-CN': '并且', 'en-US': 'AND', value: '$and' },
{ 'zh-CN': '或', 'en-US': 'OR', value: '$or' }
];
/**
* 树数据集合
*
* @type {*}
* @memberof FilterTree
*/
get treeItems() {
let root: any = {
name: '$and',
items: this.datas
label: '$and',
isroot: true,
children: this.datas
};
if(this.datas.length == 0) {
this.onAddItem(root);
......@@ -73,35 +94,72 @@ export default class FilterTree extends Vue {
return [root];
}
/**
* 获取语言文本
*
* @return {string}
* @memberof FilterTree
*/
getLabel(mode: any): string {
if(this.$i18n.locale) {
return mode[this.$i18n.locale];
}
return mode['zh-CN'];
}
/**
* 属性变化
*
* @return {*}
* @memberof FilterTree
*/
public onFieldChange(data: any) {
if(!data.mode) {
data.mode = '$eq';
}
}
/**
* 添加条件
*
* @return {*}
* @memberof FilterTree
*/
public onAddItem(data: any) {
if(data && data.items) {
data.items.push({
if(data && data.children) {
data.children.push({
field: null,
mode: null
});
}
}
/**
* 添加组
*
* @return {*}
* @memberof FilterTree
*/
public onAddGroup(data: any) {
if(data && data.items) {
data.items.push({
name: '$and',
items: []
if(data && data.children) {
data.children.push({
label: '$and',
children: []
})
}
}
/**
* 删除条件/组
*
* @return {*}
* @memberof FilterTree
*/
public onRemoveItem(node: any, data: any) {
if(node && node.parent) {
let pData: any = node.parent.data;
if(pData.items.indexOf(data) >= 0) {
pData.items.splice(pData.items.indexOf(data), 1)
if(pData.children.indexOf(data) >= 0) {
pData.children.splice(pData.children.indexOf(data), 1)
}
}
}
......
app_Web/src/service/dict-catalog/dict-catalog-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class DictCatalogServiceBase extends EntityService {
* @memberof DictCatalogServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/select`,isloading);
return res;
return Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/select`,isloading);
}
/**
......@@ -133,8 +132,7 @@ export default class DictCatalogServiceBase extends EntityService {
* @memberof DictCatalogServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}`,isloading);
return res;
return Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}`,isloading);
}
/**
......@@ -178,8 +176,7 @@ export default class DictCatalogServiceBase extends EntityService {
* @memberof DictCatalogServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/checkkey`,data,isloading);
}
/**
......@@ -225,7 +222,6 @@ export default class DictCatalogServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/dictcatalogs/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/dictcatalogs/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/dict-option/dict-option-service-base.ts
浏览文件 @ e6c0df08
......@@ -49,10 +49,9 @@ export default class DictOptionServiceBase extends EntityService {
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.dictcatalog && context.dictoption){
let res:any = await Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/select`,isloading);
return Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/select`,isloading);
}
let res:any = await Http.getInstance().get(`/dictoptions/${context.dictoption}/select`,isloading);
return res;
return Http.getInstance().get(`/dictoptions/${context.dictoption}/select`,isloading);
}
/**
......@@ -76,6 +75,7 @@ export default class DictOptionServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -104,6 +104,7 @@ export default class DictOptionServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -122,10 +123,9 @@ export default class DictOptionServiceBase extends EntityService {
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.dictcatalog && context.dictoption){
let res:any = await Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,isloading);
return Http.getInstance().delete(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,isloading);
}
let res:any = await Http.getInstance().delete(`/dictoptions/${context.dictoption}`,isloading);
return res;
return Http.getInstance().delete(`/dictoptions/${context.dictoption}`,isloading);
}
/**
......@@ -140,6 +140,7 @@ export default class DictOptionServiceBase extends EntityService {
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.dictcatalog && context.dictoption){
let res:any = await Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}`,isloading);
return res;
}
let res:any = await Http.getInstance().get(`/dictoptions/${context.dictoption}`,isloading);
return res;
......@@ -158,6 +159,7 @@ export default class DictOptionServiceBase extends EntityService {
if(context.dictcatalog && true){
let res:any = await Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/getdraft`,isloading);
res.data.dictoption = data.dictoption;
return res;
}
let res:any = await Http.getInstance().get(`/dictoptions/getdraft`,isloading);
res.data.dictoption = data.dictoption;
......@@ -178,10 +180,10 @@ export default class DictOptionServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/checkkey`,data,isloading);
}
let res:any = await Http.getInstance().post(`/dictoptions/${context.dictoption}/checkkey`,data,isloading);
return res;
}
return Http.getInstance().post(`/dictoptions/${context.dictoption}/checkkey`,data,isloading);
}
/**
* Save接口方法
......@@ -197,6 +199,7 @@ export default class DictOptionServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/dictcatalogs/${context.dictcatalog}/dictoptions/${context.dictoption}/save`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -216,10 +219,9 @@ export default class DictOptionServiceBase extends EntityService {
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.dictcatalog && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/fetchdefault`,tempData,isloading);
return Http.getInstance().get(`/dictcatalogs/${context.dictcatalog}/dictoptions/fetchdefault`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/dictoptions/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/dictoptions/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/ibzdepartment/ibzdepartment-service-base.ts
浏览文件 @ e6c0df08
......@@ -49,10 +49,9 @@ export default class IBZDepartmentServiceBase extends EntityService {
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/select`,isloading);
return Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/select`,isloading);
}
let res:any = await Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}/select`,isloading);
return res;
return Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}/select`,isloading);
}
/**
......@@ -108,6 +107,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzemployeesData:any = [];
......@@ -200,6 +200,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
let res:any = await Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzemployeesData:any = [];
......@@ -250,10 +251,9 @@ export default class IBZDepartmentServiceBase extends EntityService {
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
let res:any = await Http.getInstance().delete(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,isloading);
return Http.getInstance().delete(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,isloading);
}
let res:any = await Http.getInstance().delete(`/ibzdepartments/${context.ibzdepartment}`,isloading);
return res;
return Http.getInstance().delete(`/ibzdepartments/${context.ibzdepartment}`,isloading);
}
/**
......@@ -270,6 +270,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let res:any = await Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
......@@ -292,6 +293,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
res.data.ibzdepartment = data.ibzdepartment;
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let res:any = await Http.getInstance().get(`/ibzdepartments/getdraft`,isloading);
res.data.ibzdepartment = data.ibzdepartment;
......@@ -346,10 +348,10 @@ export default class IBZDepartmentServiceBase extends EntityService {
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/checkkey`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
}
let res:any = await Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/checkkey`,data,isloading);
return res;
}
return Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/checkkey`,data,isloading);
}
/**
* Save接口方法
......@@ -397,6 +399,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
return res;
}
let masterData:any = {};
let ibzemployeesData:any = [];
......@@ -448,10 +451,9 @@ export default class IBZDepartmentServiceBase extends EntityService {
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/fetchdefault`,tempData,isloading);
return Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/fetchdefault`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/ibzdepartments/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/ibzdepartments/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/ibzorganization/ibzorganization-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class IBZOrganizationServiceBase extends EntityService {
* @memberof IBZOrganizationServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/select`,isloading);
return res;
return Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/select`,isloading);
}
/**
......@@ -165,8 +164,7 @@ export default class IBZOrganizationServiceBase extends EntityService {
* @memberof IBZOrganizationServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/ibzorganizations/${context.ibzorganization}`,isloading);
return res;
return Http.getInstance().delete(`/ibzorganizations/${context.ibzorganization}`,isloading);
}
/**
......@@ -212,8 +210,7 @@ export default class IBZOrganizationServiceBase extends EntityService {
* @memberof IBZOrganizationServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/checkkey`,data,isloading);
}
/**
......@@ -275,7 +272,6 @@ export default class IBZOrganizationServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/ibzorganizations/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/ibzorganizations/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/ibzpost/ibzpost-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class IBZPostServiceBase extends EntityService {
* @memberof IBZPostServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzposts/${context.ibzpost}/select`,isloading);
return res;
return Http.getInstance().get(`/ibzposts/${context.ibzpost}/select`,isloading);
}
/**
......@@ -101,8 +100,7 @@ export default class IBZPostServiceBase extends EntityService {
* @memberof IBZPostServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/ibzposts/${context.ibzpost}`,isloading);
return res;
return Http.getInstance().delete(`/ibzposts/${context.ibzpost}`,isloading);
}
/**
......@@ -144,8 +142,7 @@ export default class IBZPostServiceBase extends EntityService {
* @memberof IBZPostServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/ibzposts/${context.ibzpost}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/ibzposts/${context.ibzpost}/checkkey`,data,isloading);
}
/**
......@@ -175,7 +172,6 @@ export default class IBZPostServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/ibzposts/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/ibzposts/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/ibzteam/ibzteam-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class IBZTeamServiceBase extends EntityService {
* @memberof IBZTeamServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzteams/${context.ibzteam}/select`,isloading);
return res;
return Http.getInstance().get(`/ibzteams/${context.ibzteam}/select`,isloading);
}
/**
......@@ -133,8 +132,7 @@ export default class IBZTeamServiceBase extends EntityService {
* @memberof IBZTeamServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/ibzteams/${context.ibzteam}`,isloading);
return res;
return Http.getInstance().delete(`/ibzteams/${context.ibzteam}`,isloading);
}
/**
......@@ -178,8 +176,7 @@ export default class IBZTeamServiceBase extends EntityService {
* @memberof IBZTeamServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/ibzteams/${context.ibzteam}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/ibzteams/${context.ibzteam}/checkkey`,data,isloading);
}
/**
......@@ -225,7 +222,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));
let res:any = await Http.getInstance().get(`/ibzteams/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/ibzteams/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/jobs-info/jobs-info-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/jobsinfos/${context.jobsinfo}/select`,isloading);
return res;
return Http.getInstance().get(`/jobsinfos/${context.jobsinfo}/select`,isloading);
}
/**
......@@ -101,8 +100,7 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/jobsinfos/${context.jobsinfo}`,isloading);
return res;
return Http.getInstance().delete(`/jobsinfos/${context.jobsinfo}`,isloading);
}
/**
......@@ -144,8 +142,7 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/checkkey`,data,isloading);
}
/**
......@@ -158,8 +155,7 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Execute(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/execute`,data,isloading);
return res;
return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/execute`,data,isloading);
}
/**
......@@ -188,8 +184,7 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Start(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/start`,data,isloading);
return res;
return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/start`,data,isloading);
}
/**
......@@ -202,8 +197,7 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Stop(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/stop`,data,isloading);
return res;
return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/stop`,data,isloading);
}
/**
......@@ -217,7 +211,6 @@ export default class JobsInfoServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/jobsinfos/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/jobsinfos/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/jobs-log/jobs-log-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class JobsLogServiceBase extends EntityService {
* @memberof JobsLogServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/jobslogs/${context.jobslog}/select`,isloading);
return res;
return Http.getInstance().get(`/jobslogs/${context.jobslog}/select`,isloading);
}
/**
......@@ -101,8 +100,7 @@ export default class JobsLogServiceBase extends EntityService {
* @memberof JobsLogServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/jobslogs/${context.jobslog}`,isloading);
return res;
return Http.getInstance().delete(`/jobslogs/${context.jobslog}`,isloading);
}
/**
......@@ -144,8 +142,7 @@ export default class JobsLogServiceBase extends EntityService {
* @memberof JobsLogServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/jobslogs/${context.jobslog}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/jobslogs/${context.jobslog}/checkkey`,data,isloading);
}
/**
......@@ -175,7 +172,6 @@ export default class JobsLogServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/jobslogs/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/jobslogs/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/jobs-registry/jobs-registry-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class JobsRegistryServiceBase extends EntityService {
* @memberof JobsRegistryServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/jobsregistries/${context.jobsregistry}/select`,isloading);
return res;
return Http.getInstance().get(`/jobsregistries/${context.jobsregistry}/select`,isloading);
}
/**
......@@ -101,8 +100,7 @@ export default class JobsRegistryServiceBase extends EntityService {
* @memberof JobsRegistryServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/jobsregistries/${context.jobsregistry}`,isloading);
return res;
return Http.getInstance().delete(`/jobsregistries/${context.jobsregistry}`,isloading);
}
/**
......@@ -144,8 +142,7 @@ export default class JobsRegistryServiceBase extends EntityService {
* @memberof JobsRegistryServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/jobsregistries/${context.jobsregistry}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/jobsregistries/${context.jobsregistry}/checkkey`,data,isloading);
}
/**
......@@ -175,7 +172,6 @@ export default class JobsRegistryServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/jobsregistries/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/jobsregistries/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/sys-app/sys-app-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class SysAppServiceBase extends EntityService {
* @memberof SysAppServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/sysapps/${context.sysapp}/select`,isloading);
return res;
return Http.getInstance().get(`/sysapps/${context.sysapp}/select`,isloading);
}
/**
......@@ -101,8 +100,7 @@ export default class SysAppServiceBase extends EntityService {
* @memberof SysAppServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/sysapps/${context.sysapp}`,isloading);
return res;
return Http.getInstance().delete(`/sysapps/${context.sysapp}`,isloading);
}
/**
......@@ -144,8 +142,7 @@ export default class SysAppServiceBase extends EntityService {
* @memberof SysAppServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/sysapps/${context.sysapp}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/sysapps/${context.sysapp}/checkkey`,data,isloading);
}
/**
......@@ -175,7 +172,6 @@ export default class SysAppServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysapps/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/sysapps/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/sys-auth-log/sys-auth-log-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class SysAuthLogServiceBase extends EntityService {
* @memberof SysAuthLogServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/sysauthlogs/${context.sysauthlog}/select`,isloading);
return res;
return Http.getInstance().get(`/sysauthlogs/${context.sysauthlog}/select`,isloading);
}
/**
......@@ -101,8 +100,7 @@ export default class SysAuthLogServiceBase extends EntityService {
* @memberof SysAuthLogServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/sysauthlogs/${context.sysauthlog}`,isloading);
return res;
return Http.getInstance().delete(`/sysauthlogs/${context.sysauthlog}`,isloading);
}
/**
......@@ -144,8 +142,7 @@ export default class SysAuthLogServiceBase extends EntityService {
* @memberof SysAuthLogServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/sysauthlogs/${context.sysauthlog}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/sysauthlogs/${context.sysauthlog}/checkkey`,data,isloading);
}
/**
......@@ -175,7 +172,6 @@ export default class SysAuthLogServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysauthlogs/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/sysauthlogs/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/sys-permission/sys-permission-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class SysPermissionServiceBase extends EntityService {
* @memberof SysPermissionServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}/select`,isloading);
return res;
return Http.getInstance().get(`/syspermissions/${context.syspermission}/select`,isloading);
}
/**
......@@ -133,8 +132,7 @@ export default class SysPermissionServiceBase extends EntityService {
* @memberof SysPermissionServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/syspermissions/${context.syspermission}`,isloading);
return res;
return Http.getInstance().delete(`/syspermissions/${context.syspermission}`,isloading);
}
/**
......@@ -178,8 +176,7 @@ export default class SysPermissionServiceBase extends EntityService {
* @memberof SysPermissionServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/syspermissions/${context.syspermission}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/syspermissions/${context.syspermission}/checkkey`,data,isloading);
}
/**
......@@ -225,7 +222,6 @@ export default class SysPermissionServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/syspermissions/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/syspermissions/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/sys-role-permission/sys-role-permission-service-base.ts
浏览文件 @ e6c0df08
......@@ -49,13 +49,12 @@ export default class SysRolePermissionServiceBase extends EntityService {
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysrole && context.sysrolepermission){
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
return Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
}
if(context.syspermission && context.sysrolepermission){
let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
return Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
}
let res:any = await Http.getInstance().get(`/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
return res;
return Http.getInstance().get(`/sysrolepermissions/${context.sysrolepermission}/select`,isloading);
}
/**
......@@ -79,6 +78,7 @@ export default class SysRolePermissionServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysrolepermissions`,data,isloading);
return res;
}
if(context.syspermission && true){
let masterData:any = {};
......@@ -91,6 +91,7 @@ export default class SysRolePermissionServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/syspermissions/${context.syspermission}/sysrolepermissions`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -119,11 +120,13 @@ export default class SysRolePermissionServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}`,data,isloading);
return res;
}
if(context.syspermission && context.sysrolepermission){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -142,13 +145,12 @@ export default class SysRolePermissionServiceBase extends EntityService {
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysrole && context.sysrolepermission){
let res:any = await Http.getInstance().delete(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}`,isloading);
return Http.getInstance().delete(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}`,isloading);
}
if(context.syspermission && context.sysrolepermission){
let res:any = await Http.getInstance().delete(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}`,isloading);
return Http.getInstance().delete(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}`,isloading);
}
let res:any = await Http.getInstance().delete(`/sysrolepermissions/${context.sysrolepermission}`,isloading);
return res;
return Http.getInstance().delete(`/sysrolepermissions/${context.sysrolepermission}`,isloading);
}
/**
......@@ -163,9 +165,11 @@ export default class SysRolePermissionServiceBase extends EntityService {
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysrole && context.sysrolepermission){
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}`,isloading);
return res;
}
if(context.syspermission && context.sysrolepermission){
let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}`,isloading);
return res;
}
let res:any = await Http.getInstance().get(`/sysrolepermissions/${context.sysrolepermission}`,isloading);
return res;
......@@ -184,10 +188,12 @@ export default class SysRolePermissionServiceBase extends EntityService {
if(context.sysrole && true){
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/getdraft`,isloading);
res.data.sysrolepermission = data.sysrolepermission;
return res;
}
if(context.syspermission && true){
let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/getdraft`,isloading);
res.data.sysrolepermission = data.sysrolepermission;
return res;
}
let res:any = await Http.getInstance().get(`/sysrolepermissions/getdraft`,isloading);
res.data.sysrolepermission = data.sysrolepermission;
......@@ -208,15 +214,16 @@ export default class SysRolePermissionServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}/checkkey`,data,isloading);
return res;
}
if(context.syspermission && context.sysrolepermission){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}/checkkey`,data,isloading);
}
let res:any = await Http.getInstance().post(`/sysrolepermissions/${context.sysrolepermission}/checkkey`,data,isloading);
return res;
}
return Http.getInstance().post(`/sysrolepermissions/${context.sysrolepermission}/checkkey`,data,isloading);
}
/**
* Save接口方法
......@@ -232,11 +239,13 @@ export default class SysRolePermissionServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysrolepermissions/${context.sysrolepermission}/save`,data,isloading);
return res;
}
if(context.syspermission && context.sysrolepermission){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/syspermissions/${context.syspermission}/sysrolepermissions/${context.sysrolepermission}/save`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -256,14 +265,13 @@ export default class SysRolePermissionServiceBase extends EntityService {
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysrole && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/fetchdefault`,tempData,isloading);
return Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/fetchdefault`,tempData,isloading);
}
if(context.syspermission && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/fetchdefault`,tempData,isloading);
return Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/fetchdefault`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysrolepermissions/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/sysrolepermissions/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/sys-role/sys-role-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class SysRoleServiceBase extends EntityService {
* @memberof SysRoleServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/select`,isloading);
return res;
return Http.getInstance().get(`/sysroles/${context.sysrole}/select`,isloading);
}
/**
......@@ -165,8 +164,7 @@ export default class SysRoleServiceBase extends EntityService {
* @memberof SysRoleServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/sysroles/${context.sysrole}`,isloading);
return res;
return Http.getInstance().delete(`/sysroles/${context.sysrole}`,isloading);
}
/**
......@@ -212,8 +210,7 @@ export default class SysRoleServiceBase extends EntityService {
* @memberof SysRoleServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/sysroles/${context.sysrole}/checkkey`,data,isloading);
}
/**
......@@ -275,7 +272,6 @@ export default class SysRoleServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysroles/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/sysroles/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/sys-user-role/sys-user-role-service-base.ts
浏览文件 @ e6c0df08
......@@ -49,13 +49,12 @@ export default class SysUserRoleServiceBase extends EntityService {
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysuser && context.sysuserrole){
let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/select`,isloading);
return Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/select`,isloading);
}
if(context.sysrole && context.sysuserrole){
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/select`,isloading);
return Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/select`,isloading);
}
let res:any = await Http.getInstance().get(`/sysuserroles/${context.sysuserrole}/select`,isloading);
return res;
return Http.getInstance().get(`/sysuserroles/${context.sysuserrole}/select`,isloading);
}
/**
......@@ -79,6 +78,7 @@ export default class SysUserRoleServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles`,data,isloading);
return res;
}
if(context.sysrole && true){
let masterData:any = {};
......@@ -91,6 +91,7 @@ export default class SysUserRoleServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -119,11 +120,13 @@ export default class SysUserRoleServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,data,isloading);
return res;
}
if(context.sysrole && context.sysuserrole){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -142,13 +145,12 @@ export default class SysUserRoleServiceBase extends EntityService {
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysuser && context.sysuserrole){
let res:any = await Http.getInstance().delete(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
return Http.getInstance().delete(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
}
if(context.sysrole && context.sysuserrole){
let res:any = await Http.getInstance().delete(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
return Http.getInstance().delete(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
}
let res:any = await Http.getInstance().delete(`/sysuserroles/${context.sysuserrole}`,isloading);
return res;
return Http.getInstance().delete(`/sysuserroles/${context.sysuserrole}`,isloading);
}
/**
......@@ -163,9 +165,11 @@ export default class SysUserRoleServiceBase extends EntityService {
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysuser && context.sysuserrole){
let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}`,isloading);
return res;
}
if(context.sysrole && context.sysuserrole){
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}`,isloading);
return res;
}
let res:any = await Http.getInstance().get(`/sysuserroles/${context.sysuserrole}`,isloading);
return res;
......@@ -184,10 +188,12 @@ export default class SysUserRoleServiceBase extends EntityService {
if(context.sysuser && true){
let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/getdraft`,isloading);
res.data.sysuserrole = data.sysuserrole;
return res;
}
if(context.sysrole && true){
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/getdraft`,isloading);
res.data.sysuserrole = data.sysuserrole;
return res;
}
let res:any = await Http.getInstance().get(`/sysuserroles/getdraft`,isloading);
res.data.sysuserrole = data.sysuserrole;
......@@ -208,15 +214,16 @@ export default class SysUserRoleServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
return res;
}
if(context.sysrole && context.sysuserrole){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
}
let res:any = await Http.getInstance().post(`/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
return res;
}
return Http.getInstance().post(`/sysuserroles/${context.sysuserrole}/checkkey`,data,isloading);
}
/**
* Save接口方法
......@@ -232,11 +239,13 @@ export default class SysUserRoleServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/sysuserroles/${context.sysuserrole}/save`,data,isloading);
return res;
}
if(context.sysrole && context.sysuserrole){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/sysroles/${context.sysrole}/sysuserroles/${context.sysuserrole}/save`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -256,14 +265,13 @@ export default class SysUserRoleServiceBase extends EntityService {
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysuser && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/fetchdefault`,tempData,isloading);
return Http.getInstance().get(`/sysusers/${context.sysuser}/sysuserroles/fetchdefault`,tempData,isloading);
}
if(context.sysrole && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/fetchdefault`,tempData,isloading);
return Http.getInstance().get(`/sysroles/${context.sysrole}/sysuserroles/fetchdefault`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysuserroles/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/sysuserroles/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/sys-user/sys-user-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class SysUserServiceBase extends EntityService {
* @memberof SysUserServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/sysusers/${context.sysuser}/select`,isloading);
return res;
return Http.getInstance().get(`/sysusers/${context.sysuser}/select`,isloading);
}
/**
......@@ -133,8 +132,7 @@ export default class SysUserServiceBase extends EntityService {
* @memberof SysUserServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/sysusers/${context.sysuser}`,isloading);
return res;
return Http.getInstance().delete(`/sysusers/${context.sysuser}`,isloading);
}
/**
......@@ -178,8 +176,7 @@ export default class SysUserServiceBase extends EntityService {
* @memberof SysUserServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/sysusers/${context.sysuser}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/sysusers/${context.sysuser}/checkkey`,data,isloading);
}
/**
......@@ -225,7 +222,6 @@ export default class SysUserServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/sysusers/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/sysusers/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/wfgroup/wfgroup-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class WFGroupServiceBase extends EntityService {
* @memberof WFGroupServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/wfgroups/${context.wfgroup}/select`,isloading);
return res;
return Http.getInstance().get(`/wfgroups/${context.wfgroup}/select`,isloading);
}
/**
......@@ -133,8 +132,7 @@ export default class WFGroupServiceBase extends EntityService {
* @memberof WFGroupServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/wfgroups/${context.wfgroup}`,isloading);
return res;
return Http.getInstance().delete(`/wfgroups/${context.wfgroup}`,isloading);
}
/**
......@@ -178,8 +176,7 @@ export default class WFGroupServiceBase extends EntityService {
* @memberof WFGroupServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/wfgroups/${context.wfgroup}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/wfgroups/${context.wfgroup}/checkkey`,data,isloading);
}
/**
......@@ -225,7 +222,6 @@ export default class WFGroupServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/wfgroups/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/wfgroups/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/wfmember/wfmember-service-base.ts
浏览文件 @ e6c0df08
......@@ -49,13 +49,12 @@ export default class WFMemberServiceBase extends EntityService {
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.wfuser && context.wfmember){
let res:any = await Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/select`,isloading);
return Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/select`,isloading);
}
if(context.wfgroup && context.wfmember){
let res:any = await Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/select`,isloading);
return Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/select`,isloading);
}
let res:any = await Http.getInstance().get(`/wfmembers/${context.wfmember}/select`,isloading);
return res;
return Http.getInstance().get(`/wfmembers/${context.wfmember}/select`,isloading);
}
/**
......@@ -79,6 +78,7 @@ export default class WFMemberServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers`,data,isloading);
return res;
}
if(context.wfgroup && true){
let masterData:any = {};
......@@ -91,6 +91,7 @@ export default class WFMemberServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -119,11 +120,13 @@ export default class WFMemberServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,data,isloading);
return res;
}
if(context.wfgroup && context.wfmember){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -142,13 +145,12 @@ export default class WFMemberServiceBase extends EntityService {
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.wfuser && context.wfmember){
let res:any = await Http.getInstance().delete(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,isloading);
return Http.getInstance().delete(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,isloading);
}
if(context.wfgroup && context.wfmember){
let res:any = await Http.getInstance().delete(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,isloading);
return Http.getInstance().delete(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,isloading);
}
let res:any = await Http.getInstance().delete(`/wfmembers/${context.wfmember}`,isloading);
return res;
return Http.getInstance().delete(`/wfmembers/${context.wfmember}`,isloading);
}
/**
......@@ -163,9 +165,11 @@ export default class WFMemberServiceBase extends EntityService {
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.wfuser && context.wfmember){
let res:any = await Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}`,isloading);
return res;
}
if(context.wfgroup && context.wfmember){
let res:any = await Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}`,isloading);
return res;
}
let res:any = await Http.getInstance().get(`/wfmembers/${context.wfmember}`,isloading);
return res;
......@@ -184,10 +188,12 @@ export default class WFMemberServiceBase extends EntityService {
if(context.wfuser && true){
let res:any = await Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/getdraft`,isloading);
res.data.wfmember = data.wfmember;
return res;
}
if(context.wfgroup && true){
let res:any = await Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/getdraft`,isloading);
res.data.wfmember = data.wfmember;
return res;
}
let res:any = await Http.getInstance().get(`/wfmembers/getdraft`,isloading);
res.data.wfmember = data.wfmember;
......@@ -208,15 +214,16 @@ export default class WFMemberServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/checkkey`,data,isloading);
return res;
}
if(context.wfgroup && context.wfmember){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/checkkey`,data,isloading);
}
let res:any = await Http.getInstance().post(`/wfmembers/${context.wfmember}/checkkey`,data,isloading);
return res;
}
return Http.getInstance().post(`/wfmembers/${context.wfmember}/checkkey`,data,isloading);
}
/**
* Save接口方法
......@@ -232,11 +239,13 @@ export default class WFMemberServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/wfusers/${context.wfuser}/wfmembers/${context.wfmember}/save`,data,isloading);
return res;
}
if(context.wfgroup && context.wfmember){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/wfgroups/${context.wfgroup}/wfmembers/${context.wfmember}/save`,data,isloading);
return res;
}
let masterData:any = {};
Object.assign(data,masterData);
......@@ -256,14 +265,13 @@ export default class WFMemberServiceBase extends EntityService {
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.wfuser && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/fetchdefault`,tempData,isloading);
return Http.getInstance().get(`/wfusers/${context.wfuser}/wfmembers/fetchdefault`,tempData,isloading);
}
if(context.wfgroup && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/fetchdefault`,tempData,isloading);
return Http.getInstance().get(`/wfgroups/${context.wfgroup}/wfmembers/fetchdefault`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/wfmembers/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/wfmembers/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/wfprocess-definition/wfprocess-definition-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
* @memberof WFProcessDefinitionServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/wfprocessdefinitions/${context.wfprocessdefinition}/select`,isloading);
return res;
return Http.getInstance().get(`/wfprocessdefinitions/${context.wfprocessdefinition}/select`,isloading);
}
/**
......@@ -101,8 +100,7 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
* @memberof WFProcessDefinitionServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/wfprocessdefinitions/${context.wfprocessdefinition}`,isloading);
return res;
return Http.getInstance().delete(`/wfprocessdefinitions/${context.wfprocessdefinition}`,isloading);
}
/**
......@@ -144,8 +142,7 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
* @memberof WFProcessDefinitionServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/wfprocessdefinitions/${context.wfprocessdefinition}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/wfprocessdefinitions/${context.wfprocessdefinition}/checkkey`,data,isloading);
}
/**
......@@ -175,7 +172,6 @@ export default class WFProcessDefinitionServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/wfprocessdefinitions/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/wfprocessdefinitions/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/wfremodel/wfremodel-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class WFREModelServiceBase extends EntityService {
* @memberof WFREModelServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/wfremodels/${context.wfremodel}/select`,isloading);
return res;
return Http.getInstance().get(`/wfremodels/${context.wfremodel}/select`,isloading);
}
/**
......@@ -101,8 +100,7 @@ export default class WFREModelServiceBase extends EntityService {
* @memberof WFREModelServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/wfremodels/${context.wfremodel}`,isloading);
return res;
return Http.getInstance().delete(`/wfremodels/${context.wfremodel}`,isloading);
}
/**
......@@ -144,8 +142,7 @@ export default class WFREModelServiceBase extends EntityService {
* @memberof WFREModelServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/wfremodels/${context.wfremodel}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/wfremodels/${context.wfremodel}/checkkey`,data,isloading);
}
/**
......@@ -175,7 +172,6 @@ export default class WFREModelServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/wfremodels/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/wfremodels/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_Web/src/service/wfuser/wfuser-service-base.ts
浏览文件 @ e6c0df08
......@@ -48,8 +48,7 @@ export default class WFUserServiceBase extends EntityService {
* @memberof WFUserServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/wfusers/${context.wfuser}/select`,isloading);
return res;
return Http.getInstance().get(`/wfusers/${context.wfuser}/select`,isloading);
}
/**
......@@ -133,8 +132,7 @@ export default class WFUserServiceBase extends EntityService {
* @memberof WFUserServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().delete(`/wfusers/${context.wfuser}`,isloading);
return res;
return Http.getInstance().delete(`/wfusers/${context.wfuser}`,isloading);
}
/**
......@@ -178,8 +176,7 @@ export default class WFUserServiceBase extends EntityService {
* @memberof WFUserServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().post(`/wfusers/${context.wfuser}/checkkey`,data,isloading);
return res;
return Http.getInstance().post(`/wfusers/${context.wfuser}/checkkey`,data,isloading);
}
/**
......@@ -225,7 +222,6 @@ export default class WFUserServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = await Http.getInstance().get(`/wfusers/fetchdefault`,tempData,isloading);
return res;
return Http.getInstance().get(`/wfusers/fetchdefault`,tempData,isloading);
}
}
\ No newline at end of file
ibzrt-core/src/main/java/cn/ibizlab/core/extensions.service/IBZEmployeeServiceEx.java
浏览文件 @ e6c0df08
package cn.ibizlab.core.extensions.service;
import cn.ibizlab.core.ou.service.impl.IBZEmployeeServiceImpl;
import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.core.ou.domain.IBZEmployee;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.context.annotation.Primary;
import java.util.*;
/**
* 实体[人员] 自定义服务对象
* 扩展目录已变更，请到[cn.ibizlab.core.extensions.service.xxServiceExt]中来进行扩展
* 若您之前有在当前目录下扩展过其它的service对象，请将扩展的代码移到新的扩展类中
*/
@Slf4j
@Primary
@Service("IBZEmployeeServiceEx")
public class IBZEmployeeServiceEx extends IBZEmployeeServiceImpl {
@Override
protected Class currentModelClass() {
return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
}
@Deprecated
public class IBZEmployeeServiceEx{
/**
* 自定义行为[InitPwd]用户扩展
* @param et
* @return
*/
@Override
@Transactional
public IBZEmployee initPwd(IBZEmployee et) {
return super.initPwd(et);
}
}
ibzrt-core/src/main/java/cn/ibizlab/core/extensions.service/JobsInfoServiceEx.java
浏览文件 @ e6c0df08
package cn.ibizlab.core.extensions.service;
import cn.ibizlab.core.task.service.impl.JobsInfoServiceImpl;
import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.core.task.domain.JobsInfo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.context.annotation.Primary;
import java.util.*;
/**
* 实体[任务信息] 自定义服务对象
* 扩展目录已变更，请到[cn.ibizlab.core.extensions.service.xxServiceExt]中来进行扩展
* 若您之前有在当前目录下扩展过其它的service对象，请将扩展的代码移到新的扩展类中
*/
@Slf4j
@Primary
@Service("JobsInfoServiceEx")
public class JobsInfoServiceEx extends JobsInfoServiceImpl {
@Deprecated
public class JobsInfoServiceEx{
/**
* 自定义行为[Execute]用户扩展
* @param et
* @return
*/
@Override
@Transactional
public JobsInfo execute(JobsInfo et) {
return super.execute(et);
}
}
ibzrt-core/src/main/java/cn/ibizlab/core/extensions/service/IBZEmployeeExService.java 0 → 100644
浏览文件 @ e6c0df08
package cn.ibizlab.core.extensions.service;
import cn.ibizlab.core.ou.service.impl.IBZEmployeeServiceImpl;
import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.core.ou.domain.IBZEmployee;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.context.annotation.Primary;
import java.util.*;
/**
* 实体[人员] 自定义服务对象
*/
@Slf4j
@Primary
@Service("IBZEmployeeExService")
public class IBZEmployeeExService extends IBZEmployeeServiceImpl {
@Override
protected Class currentModelClass() {
return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
}
/**
* 自定义行为[InitPwd]用户扩展
* @param et
* @return
*/
@Override
@Transactional
public IBZEmployee initPwd(IBZEmployee et) {
return super.initPwd(et);
}
}
ibzrt-core/src/main/java/cn/ibizlab/core/extensions/service/JobsInfoExService.java 0 → 100644
浏览文件 @ e6c0df08
package cn.ibizlab.core.extensions.service;
import cn.ibizlab.core.task.service.impl.JobsInfoServiceImpl;
import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.core.task.domain.JobsInfo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.context.annotation.Primary;
import java.util.*;
/**
* 实体[任务信息] 自定义服务对象
*/
@Slf4j
@Primary
@Service("JobsInfoExService")
public class JobsInfoExService extends JobsInfoServiceImpl {
/**
* 自定义行为[Execute]用户扩展
* @param et
* @return
*/
@Override
@Transactional
public JobsInfo execute(JobsInfo et) {
return super.execute(et);
}
}
ibzrt-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ e6c0df08
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<!--输出实体[IBZEMP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzemp-3-1">
<createTable tableName="IBZEMP">
<column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
</column>
<column name="USERNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PERSONNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="USERCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="LOGINNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PASSWORD" remarks="" type="VARCHAR(100)">
</column>
<column name="DOMAINS" remarks="" type="VARCHAR(100)">
</column>
<column name="MDEPTID" remarks="" type="VARCHAR(100)">
</column>
<column name="MDEPTCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="MDEPTNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="BCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="POSTID" remarks="" type="VARCHAR(100)">
</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)">
</column>
<column name="ORGNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="NICKNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="SEX" remarks="" type="VARCHAR(20)">
</column>
<column name="CERTCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="PHONE" remarks="" type="VARCHAR(100)">
</column>
<column name="BIRTHDAY" remarks="" type="DATETIME">
</column>
<column name="EMAIL" remarks="" type="VARCHAR(100)">
</column>
<column name="AVATAR" remarks="" type="VARCHAR(100)">
</column>
<column name="ADDR" remarks="" type="VARCHAR(255)">
</column>
<column name="USERICON" remarks="" type="VARCHAR(255)">
</column>
<column name="IPADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="THEME" remarks="" type="VARCHAR(100)">
</column>
<column name="LANG" remarks="" type="VARCHAR(100)">
</column>
<column name="FONTSIZE" remarks="" type="VARCHAR(10)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(255)">
</column>
<column name="RESERVER" remarks="" type="VARCHAR(255)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[IBZEMP]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-3-2">
<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-3-3">
<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-3-4">
<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>
</databaseChangeLog>
!!!!模版产生代码错误:----
Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
FTL stack trace ("~" means nesting-related):
- Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24]
----
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或