Skip to content

I
iBiz企业中心
提交 1f3bf56f 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 发布系统代码，account contact外键调整

上级 4575c7e0
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1209 行增加 和 436 行删除
app_iBizBusinessCentral/src/interface/entity/account.ts
浏览文件 @ 1f3bf56f
......@@ -78,14 +78,6 @@ export interface Account {
*/
address1_stateorprovince?: any;
/**
* 主要联系人
*
* @returns {*}
* @memberof Account
*/
primarycontactidyominame?: any;
/**
* 开启的收入
*
......@@ -182,14 +174,6 @@ export interface Account {
*/
accountratingcode?: any;
/**
* SLAName
*
* @returns {*}
* @memberof Account
*/
slaname?: any;
/**
* 不允许使用批量电子邮件
*
......@@ -198,14 +182,6 @@ export interface Account {
*/
donotbulkemail?: any;
/**
* 上级单位
*
* @returns {*}
* @memberof Account
*/
parentaccountidyominame?: any;
/**
* 时效 30
*
......@@ -358,14 +334,6 @@ export interface Account {
*/
address1_telephone2?: any;
/**
* 原始潜在顾客
*
* @returns {*}
* @memberof Account
*/
originatingleadidyominame?: any;
/**
* 地址 1: 街道 1
*
......@@ -1190,6 +1158,14 @@ export interface Account {
*/
address2_postofficebox?: any;
/**
* SLAName
*
* @returns {*}
* @memberof Account
*/
slaname?: any;
/**
* 原始潜在顾客
*
......@@ -1261,4 +1237,68 @@ export interface Account {
* @memberof Account
*/
preferredserviceid?: any;
/**
* 原始潜在顾客
*
* @returns {*}
* @memberof Account
*/
originatingleadname?: any;
/**
* 价目表
*
* @returns {*}
* @memberof Account
*/
defaultpricelevelname?: any;
/**
* 区域
*
* @returns {*}
* @memberof Account
*/
territoryname?: any;
/**
* 上级客户
*
* @returns {*}
* @memberof Account
*/
parentaccountname?: any;
/**
* 首选设施/设备
*
* @returns {*}
* @memberof Account
*/
preferredequipmentname?: any;
/**
* 首选服务
*
* @returns {*}
* @memberof Account
*/
preferredservicename?: any;
/**
* 主要联系人
*
* @returns {*}
* @memberof Account
*/
primarycontactname?: any;
/**
* 货币
*
* @returns {*}
* @memberof Account
*/
transactioncurrencyname?: any;
}
\ No newline at end of file
app_iBizBusinessCentral/src/interface/entity/contact.ts
浏览文件 @ 1f3bf56f
......@@ -798,14 +798,6 @@ export interface Contact {
*/
mastercontactidyominame?: any;
/**
* SLAName
*
* @returns {*}
* @memberof Contact
*/
slaname?: any;
/**
* 自动创建
*
......@@ -1158,14 +1150,6 @@ export interface Contact {
*/
address3_postofficebox?: any;
/**
* OriginatingLeadIdYomiName
*
* @returns {*}
* @memberof Contact
*/
originatingleadidyominame?: any;
/**
* 地址 2: 市/县
*
......@@ -1526,6 +1510,14 @@ export interface Contact {
*/
emailaddress2?: any;
/**
* SLAName
*
* @returns {*}
* @memberof Contact
*/
slaname?: any;
/**
* 价目表
*
......@@ -1573,4 +1565,44 @@ export interface Contact {
* @memberof Contact
*/
preferredserviceid?: any;
/**
* 价目表
*
* @returns {*}
* @memberof Contact
*/
defaultpricelevelname?: any;
/**
* 原始潜在顾客
*
* @returns {*}
* @memberof Contact
*/
originatingleadname?: any;
/**
* 货币
*
* @returns {*}
* @memberof Contact
*/
transactioncurrencyname?: any;
/**
* 首选服务
*
* @returns {*}
* @memberof Contact
*/
preferredservicename?: any;
/**
* 首选设施/设备
*
* @returns {*}
* @memberof Contact
*/
preferredequipmentname?: any;
}
\ No newline at end of file
app_iBizBusinessCentral/src/locale/lanres/entities/account/account_en_US.ts
浏览文件 @ 1f3bf56f
......@@ -10,7 +10,6 @@ export default {
emailaddress1: '电子邮件',
overriddencreatedon: '创建记录的时间',
address1_stateorprovince: '地址 1: 省/市/自治区',
primarycontactidyominame: '主要联系人',
openrevenue: '开启的收入',
address1_upszone: '地址 1: UPS 区域',
followemail: '跟踪电子邮件活动',
......@@ -23,9 +22,7 @@ export default {
entityimage_timestamp: '实体图片时间戳',
revenue_base: '年收入(基础货币)',
accountratingcode: '客户等级',
slaname: 'SLAName',
donotbulkemail: '不允许使用批量电子邮件',
parentaccountidyominame: '上级单位',
aging30: '时效 30',
donotbulkpostalmail: '不允许使用批量邮件',
creditlimit_base: '信用额度(基础货币)',
......@@ -45,7 +42,6 @@ export default {
utcconversiontimezonecode: 'UTC 转换时区代码',
accountnumber: '客户编号',
address1_telephone2: '地址 1: 电话 2',
originatingleadidyominame: '原始潜在顾客',
address1_line1: '地址 1: 街道 1',
donotphone: '不允许电话联络',
address1_telephone3: '地址 1: 电话 3',
......@@ -149,6 +145,7 @@ export default {
creditonhold: '信用冻结',
address1_addressid: '地址 1: ID',
address2_postofficebox: '地址 2: 邮政信箱',
slaname: 'SLAName',
originatingleadid: '原始潜在顾客',
transactioncurrencyid: '货币',
defaultpricelevelid: '价目表',
......@@ -158,6 +155,14 @@ export default {
primarycontactid: '主要联系人',
slaid: 'SLA',
preferredserviceid: '首选服务',
originatingleadname: '原始潜在顾客',
defaultpricelevelname: '价目表',
territoryname: '区域',
parentaccountname: '上级客户',
preferredequipmentname: '首选设施/设备',
preferredservicename: '首选服务',
primarycontactname: '主要联系人',
transactioncurrencyname: '货币',
},
views: {
gridview: {
......@@ -196,8 +201,10 @@ export default {
main_grid: {
columns: {
accountname: "客户名称",
updateman: "更新人",
updatedate: "更新时间",
telephone1: "主要电话",
address1_city: "地址 1: 市/县",
primarycontactname: "主要联系人",
emailaddress1: "电子邮件",
},
uiactions: {
},
......
app_iBizBusinessCentral/src/locale/lanres/entities/account/account_zh_CN.ts
浏览文件 @ 1f3bf56f
......@@ -9,7 +9,6 @@ export default {
emailaddress1: '电子邮件',
overriddencreatedon: '创建记录的时间',
address1_stateorprovince: '地址 1: 省/市/自治区',
primarycontactidyominame: '主要联系人',
openrevenue: '开启的收入',
address1_upszone: '地址 1: UPS 区域',
followemail: '跟踪电子邮件活动',
......@@ -22,9 +21,7 @@ export default {
entityimage_timestamp: '实体图片时间戳',
revenue_base: '年收入(基础货币)',
accountratingcode: '客户等级',
slaname: 'SLAName',
donotbulkemail: '不允许使用批量电子邮件',
parentaccountidyominame: '上级单位',
aging30: '时效 30',
donotbulkpostalmail: '不允许使用批量邮件',
creditlimit_base: '信用额度(基础货币)',
......@@ -44,7 +41,6 @@ export default {
utcconversiontimezonecode: 'UTC 转换时区代码',
accountnumber: '客户编号',
address1_telephone2: '地址 1: 电话 2',
originatingleadidyominame: '原始潜在顾客',
address1_line1: '地址 1: 街道 1',
donotphone: '不允许电话联络',
address1_telephone3: '地址 1: 电话 3',
......@@ -148,6 +144,7 @@ export default {
creditonhold: '信用冻结',
address1_addressid: '地址 1: ID',
address2_postofficebox: '地址 2: 邮政信箱',
slaname: 'SLAName',
originatingleadid: '原始潜在顾客',
transactioncurrencyid: '货币',
defaultpricelevelid: '价目表',
......@@ -157,6 +154,14 @@ export default {
primarycontactid: '主要联系人',
slaid: 'SLA',
preferredserviceid: '首选服务',
originatingleadname: '原始潜在顾客',
defaultpricelevelname: '价目表',
territoryname: '区域',
parentaccountname: '上级客户',
preferredequipmentname: '首选设施/设备',
preferredservicename: '首选服务',
primarycontactname: '主要联系人',
transactioncurrencyname: '货币',
},
views: {
gridview: {
......@@ -195,8 +200,10 @@ export default {
main_grid: {
columns: {
accountname: '客户名称',
updateman: '更新人',
updatedate: '更新时间',
telephone1: '主要电话',
address1_city: '地址 1: 市/县',
primarycontactname: '主要联系人',
emailaddress1: '电子邮件',
},
uiactions: {
},
......
app_iBizBusinessCentral/src/locale/lanres/entities/contact/contact_en_US.ts
浏览文件 @ 1f3bf56f
......@@ -100,7 +100,6 @@ export default {
address3_upszone: '地址 3: UPS 区域',
address1_name: '地址 1: 名称',
mastercontactidyominame: 'MasterContactIdYomiName',
slaname: 'SLAName',
autocreate: '自动创建',
backofficecustomer: 'Back Office 客户',
address2_longitude: '地址 2: 经度',
......@@ -145,7 +144,6 @@ export default {
aging60: '时效 60',
yomifirstname: 'Yomi 名',
address3_postofficebox: '地址 3: 邮政信箱',
originatingleadidyominame: 'OriginatingLeadIdYomiName',
address2_city: '地址 2: 市/县',
processid: '流程',
annualincome_base: '年收入(基础货币)',
......@@ -191,12 +189,18 @@ export default {
stageid: '流程阶段',
address1_country: '地址 1: 国家/地区',
emailaddress2: '电子邮件地址 2',
slaname: 'SLAName',
defaultpricelevelid: '价目表',
preferredequipmentid: '首选设施/设备',
transactioncurrencyid: '货币',
slaid: 'SLA',
originatingleadid: '原始潜在顾客',
preferredserviceid: '首选服务',
defaultpricelevelname: '价目表',
originatingleadname: '原始潜在顾客',
transactioncurrencyname: '货币',
preferredservicename: '首选服务',
preferredequipmentname: '首选设施/设备',
},
views: {
gridview: {
......
app_iBizBusinessCentral/src/locale/lanres/entities/contact/contact_zh_CN.ts
浏览文件 @ 1f3bf56f
......@@ -99,7 +99,6 @@ export default {
address3_upszone: '地址 3: UPS 区域',
address1_name: '地址 1: 名称',
mastercontactidyominame: 'MasterContactIdYomiName',
slaname: 'SLAName',
autocreate: '自动创建',
backofficecustomer: 'Back Office 客户',
address2_longitude: '地址 2: 经度',
......@@ -144,7 +143,6 @@ export default {
aging60: '时效 60',
yomifirstname: 'Yomi 名',
address3_postofficebox: '地址 3: 邮政信箱',
originatingleadidyominame: 'OriginatingLeadIdYomiName',
address2_city: '地址 2: 市/县',
processid: '流程',
annualincome_base: '年收入(基础货币)',
......@@ -190,12 +188,18 @@ export default {
stageid: '流程阶段',
address1_country: '地址 1: 国家/地区',
emailaddress2: '电子邮件地址 2',
slaname: 'SLAName',
defaultpricelevelid: '价目表',
preferredequipmentid: '首选设施/设备',
transactioncurrencyid: '货币',
slaid: 'SLA',
originatingleadid: '原始潜在顾客',
preferredserviceid: '首选服务',
defaultpricelevelname: '价目表',
originatingleadname: '原始潜在顾客',
transactioncurrencyname: '货币',
preferredservicename: '首选服务',
preferredequipmentname: '首选设施/设备',
},
views: {
gridview: {
......
app_iBizBusinessCentral/src/widgets/account/main-grid/main-grid-base.vue
浏览文件 @ 1f3bf56f
......@@ -35,29 +35,51 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updateman')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.account.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('telephone1')">
<el-table-column show-overflow-tooltip :prop="'telephone1'" :label="$t('entities.account.main_grid.columns.telephone1')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.account.main_grid.columns.updateman')}}
{{$t('entities.account.main_grid.columns.telephone1')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
</template>
<span>{{row.telephone1}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updatedate')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.account.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('address1_city')">
<el-table-column show-overflow-tooltip :prop="'address1_city'" :label="$t('entities.account.main_grid.columns.address1_city')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.account.main_grid.columns.updatedate')}}
{{$t('entities.account.main_grid.columns.address1_city')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.updatedate"></app-format-data>
<span>{{row.address1_city}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('primarycontactname')">
<el-table-column show-overflow-tooltip :prop="'primarycontactname'" :label="$t('entities.account.main_grid.columns.primarycontactname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.account.main_grid.columns.primarycontactname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.primarycontactname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('emailaddress1')">
<el-table-column show-overflow-tooltip :prop="'emailaddress1'" :label="$t('entities.account.main_grid.columns.emailaddress1')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.account.main_grid.columns.emailaddress1')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.emailaddress1}}</span>
</template>
</el-table-column>
</template>
......@@ -546,16 +568,30 @@ export default class MainBase extends Vue implements ControlInterface {
util: 'PX'
},
{
name: 'updateman',
label: '更新人',
langtag: 'entities.account.main_grid.columns.updateman',
name: 'telephone1',
label: '主要电话',
langtag: 'entities.account.main_grid.columns.telephone1',
show: true,
util: 'PX'
},
{
name: 'address1_city',
label: '地址 1: 市/县',
langtag: 'entities.account.main_grid.columns.address1_city',
show: true,
util: 'PX'
},
{
name: 'primarycontactname',
label: '主要联系人',
langtag: 'entities.account.main_grid.columns.primarycontactname',
show: true,
util: 'PX'
},
{
name: 'updatedate',
label: '更新时间',
langtag: 'entities.account.main_grid.columns.updatedate',
name: 'emailaddress1',
label: '电子邮件',
langtag: 'entities.account.main_grid.columns.emailaddress1',
show: true,
util: 'PX'
},
......@@ -946,14 +982,6 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [
{
name: 'updateman',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
];
let _this = this;
for (const codelist of codelistColumns) {
......
app_iBizBusinessCentral/src/widgets/account/main-grid/main-grid-model.ts
浏览文件 @ 1f3bf56f
......@@ -27,13 +27,13 @@ export default class MainModel {
}else{
return [
{
name: 'accountname',
prop: 'accountname',
name: 'telephone1',
prop: 'telephone1',
dataType: 'TEXT',
},
{
name: 'updateman',
prop: 'updateman',
name: 'accountname',
prop: 'accountname',
dataType: 'TEXT',
},
{
......@@ -67,13 +67,13 @@ export default class MainModel {
dataType: 'GUID',
},
{
name: 'preferredequipmentid',
prop: 'preferredequipmentid',
name: 'territoryid',
prop: 'territoryid',
dataType: 'PICKUP',
},
{
name: 'territoryid',
prop: 'territoryid',
name: 'preferredequipmentid',
prop: 'preferredequipmentid',
dataType: 'PICKUP',
},
{
......@@ -86,6 +86,11 @@ export default class MainModel {
prop: 'defaultpricelevelid',
dataType: 'PICKUP',
},
{
name: 'emailaddress1',
prop: 'emailaddress1',
dataType: 'TEXT',
},
{
name: 'originatingleadid',
prop: 'originatingleadid',
......@@ -97,9 +102,14 @@ export default class MainModel {
dataType: 'PICKUP',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
name: 'primarycontactname',
prop: 'primarycontactname',
dataType: 'PICKUPTEXT',
},
{
name: 'address1_city',
prop: 'address1_city',
dataType: 'TEXT',
},
{
name: 'account',
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/domain/Account.java
浏览文件 @ 1f3bf56f
......@@ -109,13 +109,6 @@ public class Account extends EntityMP implements Serializable {
@JSONField(name = "address1_stateorprovince")
@JsonProperty("address1_stateorprovince")
private String address1Stateorprovince;
/**
* 主要联系人
*/
@TableField(value = "primarycontactidyominame")
@JSONField(name = "primarycontactidyominame")
@JsonProperty("primarycontactidyominame")
private String primarycontactidyominame;
/**
* 开启的收入
*/
......@@ -206,13 +199,6 @@ public class Account extends EntityMP implements Serializable {
@JSONField(name = "accountratingcode")
@JsonProperty("accountratingcode")
private String accountratingcode;
/**
* SLAName
*/
@TableField(value = "slaname")
@JSONField(name = "slaname")
@JsonProperty("slaname")
private String slaname;
/**
* 不允许使用批量电子邮件
*/
......@@ -221,13 +207,6 @@ public class Account extends EntityMP implements Serializable {
@JSONField(name = "donotbulkemail")
@JsonProperty("donotbulkemail")
private Integer donotbulkemail;
/**
* 上级单位
*/
@TableField(value = "parentaccountidyominame")
@JSONField(name = "parentaccountidyominame")
@JsonProperty("parentaccountidyominame")
private String parentaccountidyominame;
/**
* 时效 30
*/
......@@ -368,13 +347,6 @@ public class Account extends EntityMP implements Serializable {
@JSONField(name = "address1_telephone2")
@JsonProperty("address1_telephone2")
private String address1Telephone2;
/**
* 原始潜在顾客
*/
@TableField(value = "originatingleadidyominame")
@JSONField(name = "originatingleadidyominame")
@JsonProperty("originatingleadidyominame")
private String originatingleadidyominame;
/**
* 地址 1: 街道 1
*/
......@@ -1161,6 +1133,13 @@ public class Account extends EntityMP implements Serializable {
@JSONField(name = "address2_postofficebox")
@JsonProperty("address2_postofficebox")
private String address2Postofficebox;
/**
* SLAName
*/
@TableField(value = "slaname")
@JSONField(name = "slaname")
@JsonProperty("slaname")
private String slaname;
/**
* 原始潜在顾客
*/
......@@ -1224,6 +1203,62 @@ public class Account extends EntityMP implements Serializable {
@JSONField(name = "preferredserviceid")
@JsonProperty("preferredserviceid")
private String preferredserviceid;
/**
* 原始潜在顾客
*/
@TableField(value = "originatingleadname")
@JSONField(name = "originatingleadname")
@JsonProperty("originatingleadname")
private String originatingleadname;
/**
* 价目表
*/
@TableField(value = "defaultpricelevelname")
@JSONField(name = "defaultpricelevelname")
@JsonProperty("defaultpricelevelname")
private String defaultpricelevelname;
/**
* 区域
*/
@TableField(value = "territoryname")
@JSONField(name = "territoryname")
@JsonProperty("territoryname")
private String territoryname;
/**
* 上级客户
*/
@TableField(value = "parentaccountname")
@JSONField(name = "parentaccountname")
@JsonProperty("parentaccountname")
private String parentaccountname;
/**
* 首选设施/设备
*/
@TableField(value = "preferredequipmentname")
@JSONField(name = "preferredequipmentname")
@JsonProperty("preferredequipmentname")
private String preferredequipmentname;
/**
* 首选服务
*/
@TableField(value = "preferredservicename")
@JSONField(name = "preferredservicename")
@JsonProperty("preferredservicename")
private String preferredservicename;
/**
* 主要联系人
*/
@TableField(value = "primarycontactname")
@JSONField(name = "primarycontactname")
@JsonProperty("primarycontactname")
private String primarycontactname;
/**
* 货币
*/
@TableField(value = "transactioncurrencyname")
@JSONField(name = "transactioncurrencyname")
@JsonProperty("transactioncurrencyname")
private String transactioncurrencyname;
/**
*
......@@ -1391,14 +1426,6 @@ public class Account extends EntityMP implements Serializable {
this.modify("address1_stateorprovince",address1Stateorprovince);
}
/**
* 设置 [主要联系人]
*/
public void setPrimarycontactidyominame(String primarycontactidyominame){
this.primarycontactidyominame = primarycontactidyominame ;
this.modify("primarycontactidyominame",primarycontactidyominame);
}
/**
* 设置 [开启的收入]
*/
......@@ -1495,14 +1522,6 @@ public class Account extends EntityMP implements Serializable {
this.modify("accountratingcode",accountratingcode);
}
/**
* 设置 [SLAName]
*/
public void setSlaname(String slaname){
this.slaname = slaname ;
this.modify("slaname",slaname);
}
/**
* 设置 [不允许使用批量电子邮件]
*/
......@@ -1511,14 +1530,6 @@ public class Account extends EntityMP implements Serializable {
this.modify("donotbulkemail",donotbulkemail);
}
/**
* 设置 [上级单位]
*/
public void setParentaccountidyominame(String parentaccountidyominame){
this.parentaccountidyominame = parentaccountidyominame ;
this.modify("parentaccountidyominame",parentaccountidyominame);
}
/**
* 设置 [时效 30]
*/
......@@ -1671,14 +1682,6 @@ public class Account extends EntityMP implements Serializable {
this.modify("address1_telephone2",address1Telephone2);
}
/**
* 设置 [原始潜在顾客]
*/
public void setOriginatingleadidyominame(String originatingleadidyominame){
this.originatingleadidyominame = originatingleadidyominame ;
this.modify("originatingleadidyominame",originatingleadidyominame);
}
/**
* 设置 [地址 1: 街道 1]
*/
......@@ -2493,6 +2496,14 @@ public class Account extends EntityMP implements Serializable {
this.modify("address2_postofficebox",address2Postofficebox);
}
/**
* 设置 [SLAName]
*/
public void setSlaname(String slaname){
this.slaname = slaname ;
this.modify("slaname",slaname);
}
/**
* 设置 [原始潜在顾客]
*/
......@@ -2565,6 +2576,70 @@ public class Account extends EntityMP implements Serializable {
this.modify("preferredserviceid",preferredserviceid);
}
/**
* 设置 [原始潜在顾客]
*/
public void setOriginatingleadname(String originatingleadname){
this.originatingleadname = originatingleadname ;
this.modify("originatingleadname",originatingleadname);
}
/**
* 设置 [价目表]
*/
public void setDefaultpricelevelname(String defaultpricelevelname){
this.defaultpricelevelname = defaultpricelevelname ;
this.modify("defaultpricelevelname",defaultpricelevelname);
}
/**
* 设置 [区域]
*/
public void setTerritoryname(String territoryname){
this.territoryname = territoryname ;
this.modify("territoryname",territoryname);
}
/**
* 设置 [上级客户]
*/
public void setParentaccountname(String parentaccountname){
this.parentaccountname = parentaccountname ;
this.modify("parentaccountname",parentaccountname);
}
/**
* 设置 [首选设施/设备]
*/
public void setPreferredequipmentname(String preferredequipmentname){
this.preferredequipmentname = preferredequipmentname ;
this.modify("preferredequipmentname",preferredequipmentname);
}
/**
* 设置 [首选服务]
*/
public void setPreferredservicename(String preferredservicename){
this.preferredservicename = preferredservicename ;
this.modify("preferredservicename",preferredservicename);
}
/**
* 设置 [主要联系人]
*/
public void setPrimarycontactname(String primarycontactname){
this.primarycontactname = primarycontactname ;
this.modify("primarycontactname",primarycontactname);
}
/**
* 设置 [货币]
*/
public void setTransactioncurrencyname(String transactioncurrencyname){
this.transactioncurrencyname = transactioncurrencyname ;
this.modify("transactioncurrencyname",transactioncurrencyname);
}
}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/domain/Contact.java
浏览文件 @ 1f3bf56f
......@@ -787,13 +787,6 @@ public class Contact extends EntityMP implements Serializable {
@JSONField(name = "mastercontactidyominame")
@JsonProperty("mastercontactidyominame")
private String mastercontactidyominame;
/**
* SLAName
*/
@TableField(value = "slaname")
@JSONField(name = "slaname")
@JsonProperty("slaname")
private String slaname;
/**
* 自动创建
*/
......@@ -1120,13 +1113,6 @@ public class Contact extends EntityMP implements Serializable {
@JSONField(name = "address3_postofficebox")
@JsonProperty("address3_postofficebox")
private String address3Postofficebox;
/**
* OriginatingLeadIdYomiName
*/
@TableField(value = "originatingleadidyominame")
@JSONField(name = "originatingleadidyominame")
@JsonProperty("originatingleadidyominame")
private String originatingleadidyominame;
/**
* 地址 2: 市/县
*/
......@@ -1475,6 +1461,13 @@ public class Contact extends EntityMP implements Serializable {
@JSONField(name = "emailaddress2")
@JsonProperty("emailaddress2")
private String emailaddress2;
/**
* SLAName
*/
@TableField(value = "slaname")
@JSONField(name = "slaname")
@JsonProperty("slaname")
private String slaname;
/**
* 价目表
*/
......@@ -1517,6 +1510,41 @@ public class Contact extends EntityMP implements Serializable {
@JSONField(name = "preferredserviceid")
@JsonProperty("preferredserviceid")
private String preferredserviceid;
/**
* 价目表
*/
@TableField(value = "defaultpricelevelname")
@JSONField(name = "defaultpricelevelname")
@JsonProperty("defaultpricelevelname")
private String defaultpricelevelname;
/**
* 原始潜在顾客
*/
@TableField(value = "originatingleadname")
@JSONField(name = "originatingleadname")
@JsonProperty("originatingleadname")
private String originatingleadname;
/**
* 货币
*/
@TableField(value = "transactioncurrencyname")
@JSONField(name = "transactioncurrencyname")
@JsonProperty("transactioncurrencyname")
private String transactioncurrencyname;
/**
* 首选服务
*/
@TableField(value = "preferredservicename")
@JSONField(name = "preferredservicename")
@JsonProperty("preferredservicename")
private String preferredservicename;
/**
* 首选设施/设备
*/
@TableField(value = "preferredequipmentname")
@JSONField(name = "preferredequipmentname")
@JsonProperty("preferredequipmentname")
private String preferredequipmentname;
/**
*
......@@ -2356,14 +2384,6 @@ public class Contact extends EntityMP implements Serializable {
this.modify("mastercontactidyominame",mastercontactidyominame);
}
/**
* 设置 [SLAName]
*/
public void setSlaname(String slaname){
this.slaname = slaname ;
this.modify("slaname",slaname);
}
/**
* 设置 [自动创建]
*/
......@@ -2728,14 +2748,6 @@ public class Contact extends EntityMP implements Serializable {
this.modify("address3_postofficebox",address3Postofficebox);
}
/**
* 设置 [OriginatingLeadIdYomiName]
*/
public void setOriginatingleadidyominame(String originatingleadidyominame){
this.originatingleadidyominame = originatingleadidyominame ;
this.modify("originatingleadidyominame",originatingleadidyominame);
}
/**
* 设置 [地址 2: 市/县]
*/
......@@ -3098,6 +3110,14 @@ public class Contact extends EntityMP implements Serializable {
this.modify("emailaddress2",emailaddress2);
}
/**
* 设置 [SLAName]
*/
public void setSlaname(String slaname){
this.slaname = slaname ;
this.modify("slaname",slaname);
}
/**
* 设置 [价目表]
*/
......@@ -3146,6 +3166,46 @@ public class Contact extends EntityMP implements Serializable {
this.modify("preferredserviceid",preferredserviceid);
}
/**
* 设置 [价目表]
*/
public void setDefaultpricelevelname(String defaultpricelevelname){
this.defaultpricelevelname = defaultpricelevelname ;
this.modify("defaultpricelevelname",defaultpricelevelname);
}
/**
* 设置 [原始潜在顾客]
*/
public void setOriginatingleadname(String originatingleadname){
this.originatingleadname = originatingleadname ;
this.modify("originatingleadname",originatingleadname);
}
/**
* 设置 [货币]
*/
public void setTransactioncurrencyname(String transactioncurrencyname){
this.transactioncurrencyname = transactioncurrencyname ;
this.modify("transactioncurrencyname",transactioncurrencyname);
}
/**
* 设置 [首选服务]
*/
public void setPreferredservicename(String preferredservicename){
this.preferredservicename = preferredservicename ;
this.modify("preferredservicename",preferredservicename);
}
/**
* 设置 [首选设施/设备]
*/
public void setPreferredequipmentname(String preferredequipmentname){
this.preferredequipmentname = preferredequipmentname ;
this.modify("preferredequipmentname",preferredequipmentname);
}
}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/filter/AccountSearchContext.java
浏览文件 @ 1f3bf56f
......@@ -251,6 +251,104 @@ public class AccountSearchContext extends QueryWrapperContext<Account> {
this.getSearchCond().eq("preferredserviceid", n_preferredserviceid_eq);
}
}
private String n_originatingleadname_eq;//[原始潜在顾客]
public void setN_originatingleadname_eq(String n_originatingleadname_eq) {
this.n_originatingleadname_eq = n_originatingleadname_eq;
if(!ObjectUtils.isEmpty(this.n_originatingleadname_eq)){
this.getSearchCond().eq("originatingleadname", n_originatingleadname_eq);
}
}
private String n_originatingleadname_like;//[原始潜在顾客]
public void setN_originatingleadname_like(String n_originatingleadname_like) {
this.n_originatingleadname_like = n_originatingleadname_like;
if(!ObjectUtils.isEmpty(this.n_originatingleadname_like)){
this.getSearchCond().like("originatingleadname", n_originatingleadname_like);
}
}
private String n_defaultpricelevelname_eq;//[价目表]
public void setN_defaultpricelevelname_eq(String n_defaultpricelevelname_eq) {
this.n_defaultpricelevelname_eq = n_defaultpricelevelname_eq;
if(!ObjectUtils.isEmpty(this.n_defaultpricelevelname_eq)){
this.getSearchCond().eq("defaultpricelevelname", n_defaultpricelevelname_eq);
}
}
private String n_defaultpricelevelname_like;//[价目表]
public void setN_defaultpricelevelname_like(String n_defaultpricelevelname_like) {
this.n_defaultpricelevelname_like = n_defaultpricelevelname_like;
if(!ObjectUtils.isEmpty(this.n_defaultpricelevelname_like)){
this.getSearchCond().like("defaultpricelevelname", n_defaultpricelevelname_like);
}
}
private String n_territoryname_eq;//[区域]
public void setN_territoryname_eq(String n_territoryname_eq) {
this.n_territoryname_eq = n_territoryname_eq;
if(!ObjectUtils.isEmpty(this.n_territoryname_eq)){
this.getSearchCond().eq("territoryname", n_territoryname_eq);
}
}
private String n_territoryname_like;//[区域]
public void setN_territoryname_like(String n_territoryname_like) {
this.n_territoryname_like = n_territoryname_like;
if(!ObjectUtils.isEmpty(this.n_territoryname_like)){
this.getSearchCond().like("territoryname", n_territoryname_like);
}
}
private String n_parentaccountname_eq;//[上级客户]
public void setN_parentaccountname_eq(String n_parentaccountname_eq) {
this.n_parentaccountname_eq = n_parentaccountname_eq;
if(!ObjectUtils.isEmpty(this.n_parentaccountname_eq)){
this.getSearchCond().eq("parentaccountname", n_parentaccountname_eq);
}
}
private String n_parentaccountname_like;//[上级客户]
public void setN_parentaccountname_like(String n_parentaccountname_like) {
this.n_parentaccountname_like = n_parentaccountname_like;
if(!ObjectUtils.isEmpty(this.n_parentaccountname_like)){
this.getSearchCond().like("parentaccountname", n_parentaccountname_like);
}
}
private String n_preferredequipmentname_eq;//[首选设施/设备]
public void setN_preferredequipmentname_eq(String n_preferredequipmentname_eq) {
this.n_preferredequipmentname_eq = n_preferredequipmentname_eq;
if(!ObjectUtils.isEmpty(this.n_preferredequipmentname_eq)){
this.getSearchCond().eq("preferredequipmentname", n_preferredequipmentname_eq);
}
}
private String n_preferredequipmentname_like;//[首选设施/设备]
public void setN_preferredequipmentname_like(String n_preferredequipmentname_like) {
this.n_preferredequipmentname_like = n_preferredequipmentname_like;
if(!ObjectUtils.isEmpty(this.n_preferredequipmentname_like)){
this.getSearchCond().like("preferredequipmentname", n_preferredequipmentname_like);
}
}
private String n_preferredservicename_eq;//[首选服务]
public void setN_preferredservicename_eq(String n_preferredservicename_eq) {
this.n_preferredservicename_eq = n_preferredservicename_eq;
if(!ObjectUtils.isEmpty(this.n_preferredservicename_eq)){
this.getSearchCond().eq("preferredservicename", n_preferredservicename_eq);
}
}
private String n_preferredservicename_like;//[首选服务]
public void setN_preferredservicename_like(String n_preferredservicename_like) {
this.n_preferredservicename_like = n_preferredservicename_like;
if(!ObjectUtils.isEmpty(this.n_preferredservicename_like)){
this.getSearchCond().like("preferredservicename", n_preferredservicename_like);
}
}
private String n_primarycontactname_eq;//[主要联系人]
public void setN_primarycontactname_eq(String n_primarycontactname_eq) {
this.n_primarycontactname_eq = n_primarycontactname_eq;
if(!ObjectUtils.isEmpty(this.n_primarycontactname_eq)){
this.getSearchCond().eq("primarycontactname", n_primarycontactname_eq);
}
}
private String n_primarycontactname_like;//[主要联系人]
public void setN_primarycontactname_like(String n_primarycontactname_like) {
this.n_primarycontactname_like = n_primarycontactname_like;
if(!ObjectUtils.isEmpty(this.n_primarycontactname_like)){
this.getSearchCond().like("primarycontactname", n_primarycontactname_like);
}
}
/**
* 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/filter/ContactSearchContext.java
浏览文件 @ 1f3bf56f
......@@ -251,6 +251,76 @@ public class ContactSearchContext extends QueryWrapperContext<Contact> {
this.getSearchCond().eq("preferredserviceid", n_preferredserviceid_eq);
}
}
private String n_defaultpricelevelname_eq;//[价目表]
public void setN_defaultpricelevelname_eq(String n_defaultpricelevelname_eq) {
this.n_defaultpricelevelname_eq = n_defaultpricelevelname_eq;
if(!ObjectUtils.isEmpty(this.n_defaultpricelevelname_eq)){
this.getSearchCond().eq("defaultpricelevelname", n_defaultpricelevelname_eq);
}
}
private String n_defaultpricelevelname_like;//[价目表]
public void setN_defaultpricelevelname_like(String n_defaultpricelevelname_like) {
this.n_defaultpricelevelname_like = n_defaultpricelevelname_like;
if(!ObjectUtils.isEmpty(this.n_defaultpricelevelname_like)){
this.getSearchCond().like("defaultpricelevelname", n_defaultpricelevelname_like);
}
}
private String n_originatingleadname_eq;//[原始潜在顾客]
public void setN_originatingleadname_eq(String n_originatingleadname_eq) {
this.n_originatingleadname_eq = n_originatingleadname_eq;
if(!ObjectUtils.isEmpty(this.n_originatingleadname_eq)){
this.getSearchCond().eq("originatingleadname", n_originatingleadname_eq);
}
}
private String n_originatingleadname_like;//[原始潜在顾客]
public void setN_originatingleadname_like(String n_originatingleadname_like) {
this.n_originatingleadname_like = n_originatingleadname_like;
if(!ObjectUtils.isEmpty(this.n_originatingleadname_like)){
this.getSearchCond().like("originatingleadname", n_originatingleadname_like);
}
}
private String n_transactioncurrencyname_eq;//[货币]
public void setN_transactioncurrencyname_eq(String n_transactioncurrencyname_eq) {
this.n_transactioncurrencyname_eq = n_transactioncurrencyname_eq;
if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_eq)){
this.getSearchCond().eq("transactioncurrencyname", n_transactioncurrencyname_eq);
}
}
private String n_transactioncurrencyname_like;//[货币]
public void setN_transactioncurrencyname_like(String n_transactioncurrencyname_like) {
this.n_transactioncurrencyname_like = n_transactioncurrencyname_like;
if(!ObjectUtils.isEmpty(this.n_transactioncurrencyname_like)){
this.getSearchCond().like("transactioncurrencyname", n_transactioncurrencyname_like);
}
}
private String n_preferredservicename_eq;//[首选服务]
public void setN_preferredservicename_eq(String n_preferredservicename_eq) {
this.n_preferredservicename_eq = n_preferredservicename_eq;
if(!ObjectUtils.isEmpty(this.n_preferredservicename_eq)){
this.getSearchCond().eq("preferredservicename", n_preferredservicename_eq);
}
}
private String n_preferredservicename_like;//[首选服务]
public void setN_preferredservicename_like(String n_preferredservicename_like) {
this.n_preferredservicename_like = n_preferredservicename_like;
if(!ObjectUtils.isEmpty(this.n_preferredservicename_like)){
this.getSearchCond().like("preferredservicename", n_preferredservicename_like);
}
}
private String n_preferredequipmentname_eq;//[首选设施/设备]
public void setN_preferredequipmentname_eq(String n_preferredequipmentname_eq) {
this.n_preferredequipmentname_eq = n_preferredequipmentname_eq;
if(!ObjectUtils.isEmpty(this.n_preferredequipmentname_eq)){
this.getSearchCond().eq("preferredequipmentname", n_preferredequipmentname_eq);
}
}
private String n_preferredequipmentname_like;//[首选设施/设备]
public void setN_preferredequipmentname_like(String n_preferredequipmentname_like) {
this.n_preferredequipmentname_like = n_preferredequipmentname_like;
if(!ObjectUtils.isEmpty(this.n_preferredequipmentname_like)){
this.getSearchCond().like("preferredequipmentname", n_preferredequipmentname_like);
}
}
/**
* 启用快速搜索
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/AccountServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -85,6 +85,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
@Override
@Transactional
public boolean create(Account et) {
fillParentData(et);
if(!this.retBool(this.baseMapper.insert(et)))
return false;
CachedBeanCopier.copy(get(et.getAccountid()),et);
......@@ -93,12 +94,14 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
@Override
public void createBatch(List<Account> list) {
list.forEach(item->fillParentData(item));
this.saveBatch(list,batchSize);
}
@Override
@Transactional
public boolean update(Account et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("accountid",et.getAccountid())))
return false;
CachedBeanCopier.copy(get(et.getAccountid()),et);
......@@ -107,6 +110,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
@Override
public void updateBatch(List<Account> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
}
......@@ -144,12 +148,14 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
@Override
public boolean saveBatch(Collection<Account> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
return true;
}
@Override
public void saveBatch(List<Account> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
}
......@@ -157,7 +163,6 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
public boolean checkKey(Account et) {
return (!ObjectUtils.isEmpty(et.getAccountid()))&&(!Objects.isNull(this.getById(et.getAccountid())));
}
@Override
@Transactional
public Account get(String key) {
......@@ -173,6 +178,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
@Override
public Account getDraft(Account et) {
fillParentData(et);
return et;
}
......@@ -279,6 +285,102 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
/**
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(Account et){
//实体关系[DER1N_ACCOUNT__ACCOUNT__PARENTACCOUNTID]
if(!ObjectUtils.isEmpty(et.getParentaccountid())){
cn.ibizlab.businesscentral.core.base.domain.Account parentaccount=et.getParentaccount();
if(ObjectUtils.isEmpty(parentaccount)){
cn.ibizlab.businesscentral.core.base.domain.Account majorEntity=accountService.get(et.getParentaccountid());
et.setParentaccount(majorEntity);
parentaccount=majorEntity;
}
et.setParentaccountname(parentaccount.getAccountname());
}
//实体关系[DER1N_ACCOUNT__CONTACT__PRIMARYCONTACTID]
if(!ObjectUtils.isEmpty(et.getPrimarycontactid())){
cn.ibizlab.businesscentral.core.base.domain.Contact primarycontact=et.getPrimarycontact();
if(ObjectUtils.isEmpty(primarycontact)){
cn.ibizlab.businesscentral.core.base.domain.Contact majorEntity=contactService.get(et.getPrimarycontactid());
et.setPrimarycontact(majorEntity);
primarycontact=majorEntity;
}
et.setPrimarycontactname(primarycontact.getFullname());
}
//实体关系[DER1N_ACCOUNT__EQUIPMENT__PREFERREDEQUIPMENTID]
if(!ObjectUtils.isEmpty(et.getPreferredequipmentid())){
cn.ibizlab.businesscentral.core.service.domain.Equipment preferredequipment=et.getPreferredequipment();
if(ObjectUtils.isEmpty(preferredequipment)){
cn.ibizlab.businesscentral.core.service.domain.Equipment majorEntity=equipmentService.get(et.getPreferredequipmentid());
et.setPreferredequipment(majorEntity);
preferredequipment=majorEntity;
}
et.setPreferredequipmentname(preferredequipment.getEquipmentname());
}
//实体关系[DER1N_ACCOUNT__LEAD__ORIGINATINGLEADID]
if(!ObjectUtils.isEmpty(et.getOriginatingleadid())){
cn.ibizlab.businesscentral.core.sales.domain.Lead originatinglead=et.getOriginatinglead();
if(ObjectUtils.isEmpty(originatinglead)){
cn.ibizlab.businesscentral.core.sales.domain.Lead majorEntity=leadService.get(et.getOriginatingleadid());
et.setOriginatinglead(majorEntity);
originatinglead=majorEntity;
}
et.setOriginatingleadname(originatinglead.getFullname());
}
//实体关系[DER1N_ACCOUNT__PRICELEVEL__DEFAULTPRICELEVELID]
if(!ObjectUtils.isEmpty(et.getDefaultpricelevelid())){
cn.ibizlab.businesscentral.core.product.domain.PriceLevel defaultpricelevel=et.getDefaultpricelevel();
if(ObjectUtils.isEmpty(defaultpricelevel)){
cn.ibizlab.businesscentral.core.product.domain.PriceLevel majorEntity=pricelevelService.get(et.getDefaultpricelevelid());
et.setDefaultpricelevel(majorEntity);
defaultpricelevel=majorEntity;
}
et.setDefaultpricelevelname(defaultpricelevel.getPricelevelname());
}
//实体关系[DER1N_ACCOUNT__SERVICE__PREFERREDSERVICEID]
if(!ObjectUtils.isEmpty(et.getPreferredserviceid())){
cn.ibizlab.businesscentral.core.service.domain.IBizService preferredservice=et.getPreferredservice();
if(ObjectUtils.isEmpty(preferredservice)){
cn.ibizlab.businesscentral.core.service.domain.IBizService majorEntity=ibizserviceService.get(et.getPreferredserviceid());
et.setPreferredservice(majorEntity);
preferredservice=majorEntity;
}
et.setPreferredservicename(preferredservice.getServicename());
}
//实体关系[DER1N_ACCOUNT__SLA__SLAID]
if(!ObjectUtils.isEmpty(et.getSlaid())){
cn.ibizlab.businesscentral.core.base.domain.Sla sla=et.getSla();
if(ObjectUtils.isEmpty(sla)){
cn.ibizlab.businesscentral.core.base.domain.Sla majorEntity=slaService.get(et.getSlaid());
et.setSla(majorEntity);
sla=majorEntity;
}
et.setSlaname(sla.getSlaname());
}
//实体关系[DER1N_ACCOUNT__TERRITORY__TERRITORYID]
if(!ObjectUtils.isEmpty(et.getTerritoryid())){
cn.ibizlab.businesscentral.core.base.domain.Territory territory=et.getTerritory();
if(ObjectUtils.isEmpty(territory)){
cn.ibizlab.businesscentral.core.base.domain.Territory majorEntity=territoryService.get(et.getTerritoryid());
et.setTerritory(majorEntity);
territory=majorEntity;
}
et.setTerritoryname(territory.getTerritoryname());
}
//实体关系[DER1N_ACCOUNT__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
if(ObjectUtils.isEmpty(transactioncurrency)){
cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
et.setTransactioncurrency(majorEntity);
transactioncurrency=majorEntity;
}
et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
}
}
@Override
......@@ -328,3 +430,4 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/ActivityMimeatTachmentServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -109,7 +109,6 @@ public class ActivityMimeatTachmentServiceImpl extends ServiceImpl<ActivityMimea
public boolean checkKey(ActivityMimeatTachment et) {
return (!ObjectUtils.isEmpty(et.getActivitymimeattachmentid()))&&(!Objects.isNull(this.getById(et.getActivitymimeattachmentid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -203,3 +202,4 @@ public class ActivityMimeatTachmentServiceImpl extends ServiceImpl<ActivityMimea
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/ActivityPartyServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -113,7 +113,6 @@ public class ActivityPartyServiceImpl extends ServiceImpl<ActivityPartyMapper, A
public boolean checkKey(ActivityParty et) {
return (!ObjectUtils.isEmpty(et.getActivitypartyid()))&&(!Objects.isNull(this.getById(et.getActivitypartyid())));
}
@Override
@Transactional
public boolean update(ActivityParty et) {
......@@ -229,3 +228,4 @@ public class ActivityPartyServiceImpl extends ServiceImpl<ActivityPartyMapper, A
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/ActivityPointerServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -107,7 +107,6 @@ public class ActivityPointerServiceImpl extends ServiceImpl<ActivityPointerMappe
public boolean checkKey(ActivityPointer et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -248,3 +247,4 @@ public class ActivityPointerServiceImpl extends ServiceImpl<ActivityPointerMappe
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/AnnotationServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -91,7 +91,6 @@ public class AnnotationServiceImpl extends ServiceImpl<AnnotationMapper, Annotat
public boolean checkKey(Annotation et) {
return (!ObjectUtils.isEmpty(et.getAnnotationid()))&&(!Objects.isNull(this.getById(et.getAnnotationid())));
}
@Override
public Annotation getDraft(Annotation et) {
return et;
......@@ -203,3 +202,4 @@ public class AnnotationServiceImpl extends ServiceImpl<AnnotationMapper, Annotat
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/AppointmentServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -104,7 +104,6 @@ public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appoi
public boolean checkKey(Appointment et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
@Transactional
public boolean save(Appointment et) {
......@@ -242,3 +241,4 @@ public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appoi
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/AuditServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -142,7 +142,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
}
/**
* 查询集合 DEFAULT
*/
......@@ -203,3 +202,4 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/BusinessUnitNewsArticleServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -126,7 +126,6 @@ public class BusinessUnitNewsArticleServiceImpl extends ServiceImpl<BusinessUnit
public boolean checkKey(BusinessUnitNewsArticle et) {
return (!ObjectUtils.isEmpty(et.getBusinessunitnewsarticleid()))&&(!Objects.isNull(this.getById(et.getBusinessunitnewsarticleid())));
}
@Override
@Transactional
public boolean create(BusinessUnitNewsArticle et) {
......@@ -203,3 +202,4 @@ public class BusinessUnitNewsArticleServiceImpl extends ServiceImpl<BusinessUnit
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/BusinessUnitServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -130,7 +130,6 @@ public class BusinessUnitServiceImpl extends ServiceImpl<BusinessUnitMapper, Bus
public boolean checkKey(BusinessUnit et) {
return (!ObjectUtils.isEmpty(et.getBusinessunitid()))&&(!Objects.isNull(this.getById(et.getBusinessunitid())));
}
@Override
@Transactional
public boolean create(BusinessUnit et) {
......@@ -268,3 +267,4 @@ public class BusinessUnitServiceImpl extends ServiceImpl<BusinessUnitMapper, Bus
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/CalendarServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -65,7 +65,6 @@ public class CalendarServiceImpl extends ServiceImpl<CalendarMapper, Calendar> i
public boolean checkKey(Calendar et) {
return (!ObjectUtils.isEmpty(et.getCalendarid()))&&(!Objects.isNull(this.getById(et.getCalendarid())));
}
@Override
@Transactional
public boolean save(Calendar et) {
......@@ -237,3 +236,4 @@ public class CalendarServiceImpl extends ServiceImpl<CalendarMapper, Calendar> i
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/CategoryServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -70,7 +70,6 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
public boolean checkKey(Category et) {
return (!ObjectUtils.isEmpty(et.getCategoryid()))&&(!Objects.isNull(this.getById(et.getCategoryid())));
}
@Override
@Transactional
public boolean save(Category et) {
......@@ -228,3 +227,4 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/ContactServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -84,7 +84,6 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
public boolean checkKey(Contact et) {
return (!ObjectUtils.isEmpty(et.getContactid()))&&(!Objects.isNull(this.getById(et.getContactid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -132,18 +131,21 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
@Override
public boolean saveBatch(Collection<Contact> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
return true;
}
@Override
public void saveBatch(List<Contact> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
}
@Override
@Transactional
public boolean update(Contact et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("contactid",et.getContactid())))
return false;
CachedBeanCopier.copy(get(et.getContactid()),et);
......@@ -152,17 +154,20 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
@Override
public void updateBatch(List<Contact> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
}
@Override
public Contact getDraft(Contact et) {
fillParentData(et);
return et;
}
@Override
@Transactional
public boolean create(Contact et) {
fillParentData(et);
if(!this.retBool(this.baseMapper.insert(et)))
return false;
CachedBeanCopier.copy(get(et.getContactid()),et);
......@@ -171,6 +176,7 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
@Override
public void createBatch(List<Contact> list) {
list.forEach(item->fillParentData(item));
this.saveBatch(list,batchSize);
}
......@@ -247,6 +253,72 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
/**
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(Contact et){
//实体关系[DER1N_CONTACT__EQUIPMENT__PREFERREDEQUIPMENTID]
if(!ObjectUtils.isEmpty(et.getPreferredequipmentid())){
cn.ibizlab.businesscentral.core.service.domain.Equipment preferredequipment=et.getPreferredequipment();
if(ObjectUtils.isEmpty(preferredequipment)){
cn.ibizlab.businesscentral.core.service.domain.Equipment majorEntity=equipmentService.get(et.getPreferredequipmentid());
et.setPreferredequipment(majorEntity);
preferredequipment=majorEntity;
}
et.setPreferredequipmentname(preferredequipment.getEquipmentname());
}
//实体关系[DER1N_CONTACT__LEAD__ORIGINATINGLEADID]
if(!ObjectUtils.isEmpty(et.getOriginatingleadid())){
cn.ibizlab.businesscentral.core.sales.domain.Lead originatinglead=et.getOriginatinglead();
if(ObjectUtils.isEmpty(originatinglead)){
cn.ibizlab.businesscentral.core.sales.domain.Lead majorEntity=leadService.get(et.getOriginatingleadid());
et.setOriginatinglead(majorEntity);
originatinglead=majorEntity;
}
et.setOriginatingleadname(originatinglead.getFullname());
}
//实体关系[DER1N_CONTACT__PRICELEVEL__DEFAULTPRICELEVELID]
if(!ObjectUtils.isEmpty(et.getDefaultpricelevelid())){
cn.ibizlab.businesscentral.core.product.domain.PriceLevel defaultpricelevel=et.getDefaultpricelevel();
if(ObjectUtils.isEmpty(defaultpricelevel)){
cn.ibizlab.businesscentral.core.product.domain.PriceLevel majorEntity=pricelevelService.get(et.getDefaultpricelevelid());
et.setDefaultpricelevel(majorEntity);
defaultpricelevel=majorEntity;
}
et.setDefaultpricelevelname(defaultpricelevel.getPricelevelname());
}
//实体关系[DER1N_CONTACT__SERVICE__PREFERREDSERVICEID]
if(!ObjectUtils.isEmpty(et.getPreferredserviceid())){
cn.ibizlab.businesscentral.core.service.domain.IBizService preferredservice=et.getPreferredservice();
if(ObjectUtils.isEmpty(preferredservice)){
cn.ibizlab.businesscentral.core.service.domain.IBizService majorEntity=ibizserviceService.get(et.getPreferredserviceid());
et.setPreferredservice(majorEntity);
preferredservice=majorEntity;
}
et.setPreferredservicename(preferredservice.getServicename());
}
//实体关系[DER1N_CONTACT__SLA__SLAID]
if(!ObjectUtils.isEmpty(et.getSlaid())){
cn.ibizlab.businesscentral.core.base.domain.Sla sla=et.getSla();
if(ObjectUtils.isEmpty(sla)){
cn.ibizlab.businesscentral.core.base.domain.Sla majorEntity=slaService.get(et.getSlaid());
et.setSla(majorEntity);
sla=majorEntity;
}
et.setSlaname(sla.getSlaname());
}
//实体关系[DER1N_CONTACT__TRANSACTIONCURRENCY__TRANSACTIONCURRENCYID]
if(!ObjectUtils.isEmpty(et.getTransactioncurrencyid())){
cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency transactioncurrency=et.getTransactioncurrency();
if(ObjectUtils.isEmpty(transactioncurrency)){
cn.ibizlab.businesscentral.core.base.domain.TransactionCurrency majorEntity=transactioncurrencyService.get(et.getTransactioncurrencyid());
et.setTransactioncurrency(majorEntity);
transactioncurrency=majorEntity;
}
et.setTransactioncurrencyname(transactioncurrency.getCurrencyname());
}
}
@Override
......@@ -296,3 +368,4 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/CustomerAddressServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -150,7 +150,6 @@ public class CustomerAddressServiceImpl extends ServiceImpl<CustomerAddressMappe
return (!ObjectUtils.isEmpty(et.getCustomeraddressid()))&&(!Objects.isNull(this.getById(et.getCustomeraddressid())));
}
@Override
public List<CustomerAddress> selectByTransactioncurrencyid(String transactioncurrencyid) {
return baseMapper.selectByTransactioncurrencyid(transactioncurrencyid);
......@@ -222,3 +221,4 @@ public class CustomerAddressServiceImpl extends ServiceImpl<CustomerAddressMappe
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/EmailServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -155,7 +155,6 @@ public class EmailServiceImpl extends ServiceImpl<EmailMapper, Email> implements
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
public List<Email> selectByParentactivityid(String activityid) {
return baseMapper.selectByParentactivityid(activityid);
......@@ -267,3 +266,4 @@ public class EmailServiceImpl extends ServiceImpl<EmailMapper, Email> implements
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/FaxServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -60,7 +60,6 @@ public class FaxServiceImpl extends ServiceImpl<FaxMapper, Fax> implements IFaxS
public boolean checkKey(Fax et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
@Transactional
public boolean create(Fax et) {
......@@ -242,3 +241,4 @@ public class FaxServiceImpl extends ServiceImpl<FaxMapper, Fax> implements IFaxS
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/FeedbackServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -115,7 +115,6 @@ public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, Feedback> i
public boolean checkKey(Feedback et) {
return (!ObjectUtils.isEmpty(et.getFeedbackid()))&&(!Objects.isNull(this.getById(et.getFeedbackid())));
}
@Override
@Transactional
public boolean save(Feedback et) {
......@@ -239,3 +238,4 @@ public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, Feedback> i
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/KnowledgeArticleServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -115,7 +115,6 @@ public class KnowledgeArticleServiceImpl extends ServiceImpl<KnowledgeArticleMap
public boolean checkKey(KnowledgeArticle et) {
return (!ObjectUtils.isEmpty(et.getKnowledgearticleid()))&&(!Objects.isNull(this.getById(et.getKnowledgearticleid())));
}
@Override
@Transactional
public boolean create(KnowledgeArticle et) {
......@@ -283,3 +282,4 @@ public class KnowledgeArticleServiceImpl extends ServiceImpl<KnowledgeArticleMap
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/KnowledgeArticleViewsServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -104,7 +104,6 @@ public class KnowledgeArticleViewsServiceImpl extends ServiceImpl<KnowledgeArtic
public boolean checkKey(KnowledgeArticleViews et) {
return (!ObjectUtils.isEmpty(et.getKnowledgearticleviewsid()))&&(!Objects.isNull(this.getById(et.getKnowledgearticleviewsid())));
}
@Override
@Transactional
public boolean create(KnowledgeArticleViews et) {
......@@ -216,3 +215,4 @@ public class KnowledgeArticleViewsServiceImpl extends ServiceImpl<KnowledgeArtic
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/KnowledgeBaseRecordServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -80,7 +80,6 @@ public class KnowledgeBaseRecordServiceImpl extends ServiceImpl<KnowledgeBaseRec
public boolean checkKey(KnowledgeBaseRecord et) {
return (!ObjectUtils.isEmpty(et.getKnowledgebaserecordid()))&&(!Objects.isNull(this.getById(et.getKnowledgebaserecordid())));
}
@Override
@Transactional
public boolean create(KnowledgeBaseRecord et) {
......@@ -216,3 +215,4 @@ public class KnowledgeBaseRecordServiceImpl extends ServiceImpl<KnowledgeBaseRec
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/LanguageLocaleServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -145,7 +145,6 @@ public class LanguageLocaleServiceImpl extends ServiceImpl<LanguageLocaleMapper,
}
/**
* 查询集合 DEFAULT
*/
......@@ -206,3 +205,4 @@ public class LanguageLocaleServiceImpl extends ServiceImpl<LanguageLocaleMapper,
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/LetterServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -150,7 +150,6 @@ public class LetterServiceImpl extends ServiceImpl<LetterMapper, Letter> impleme
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
public List<Letter> selectByServiceid(String serviceid) {
return baseMapper.selectByServiceid(serviceid);
......@@ -242,3 +241,4 @@ public class LetterServiceImpl extends ServiceImpl<LetterMapper, Letter> impleme
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/MetricServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -79,7 +79,6 @@ public class MetricServiceImpl extends ServiceImpl<MetricMapper, Metric> impleme
public boolean checkKey(Metric et) {
return (!ObjectUtils.isEmpty(et.getMetricid()))&&(!Objects.isNull(this.getById(et.getMetricid())));
}
@Override
@Transactional
public boolean update(Metric et) {
......@@ -206,3 +205,4 @@ public class MetricServiceImpl extends ServiceImpl<MetricMapper, Metric> impleme
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/OrganizationServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -135,7 +135,6 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
public boolean checkKey(Organization et) {
return (!ObjectUtils.isEmpty(et.getOrganizationid()))&&(!Objects.isNull(this.getById(et.getOrganizationid())));
}
@Override
@Transactional
public boolean update(Organization et) {
......@@ -232,3 +231,4 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/PersonalDocumentTemplateServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -90,7 +90,6 @@ public class PersonalDocumentTemplateServiceImpl extends ServiceImpl<PersonalDoc
public boolean checkKey(PersonalDocumentTemplate et) {
return (!ObjectUtils.isEmpty(et.getPersonaldocumenttemplateid()))&&(!Objects.isNull(this.getById(et.getPersonaldocumenttemplateid())));
}
@Override
@Transactional
public boolean save(PersonalDocumentTemplate et) {
......@@ -203,3 +202,4 @@ public class PersonalDocumentTemplateServiceImpl extends ServiceImpl<PersonalDoc
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/PhoneCallServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -87,7 +87,6 @@ public class PhoneCallServiceImpl extends ServiceImpl<PhoneCallMapper, PhoneCall
public boolean checkKey(PhoneCall et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
@Transactional
public boolean update(PhoneCall et) {
......@@ -242,3 +241,4 @@ public class PhoneCallServiceImpl extends ServiceImpl<PhoneCallMapper, PhoneCall
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/PositionServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -114,7 +114,6 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
public boolean checkKey(Position et) {
return (!ObjectUtils.isEmpty(et.getPositionid()))&&(!Objects.isNull(this.getById(et.getPositionid())));
}
@Override
@Transactional
public boolean save(Position et) {
......@@ -228,3 +227,4 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/PostServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -56,7 +56,6 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
public boolean checkKey(Post et) {
return (!ObjectUtils.isEmpty(et.getPostid()))&&(!Objects.isNull(this.getById(et.getPostid())));
}
@Override
@Transactional
public boolean save(Post et) {
......@@ -203,3 +202,4 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/SiteMapServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -90,7 +90,6 @@ public class SiteMapServiceImpl extends ServiceImpl<SiteMapMapper, SiteMap> impl
public boolean checkKey(SiteMap et) {
return (!ObjectUtils.isEmpty(et.getSitemapid()))&&(!Objects.isNull(this.getById(et.getSitemapid())));
}
@Override
public SiteMap getDraft(SiteMap et) {
return et;
......@@ -203,3 +202,4 @@ public class SiteMapServiceImpl extends ServiceImpl<SiteMapMapper, SiteMap> impl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/SiteServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -60,7 +60,6 @@ public class SiteServiceImpl extends ServiceImpl<SiteMapper, Site> implements IS
public boolean checkKey(Site et) {
return (!ObjectUtils.isEmpty(et.getSiteid()))&&(!Objects.isNull(this.getById(et.getSiteid())));
}
@Override
public Site getDraft(Site et) {
return et;
......@@ -212,3 +211,4 @@ public class SiteServiceImpl extends ServiceImpl<SiteMapper, Site> implements IS
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/SlaItemServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -85,7 +85,6 @@ public class SlaItemServiceImpl extends ServiceImpl<SlaItemMapper, SlaItem> impl
public boolean checkKey(SlaItem et) {
return (!ObjectUtils.isEmpty(et.getSlaitemid()))&&(!Objects.isNull(this.getById(et.getSlaitemid())));
}
@Override
public SlaItem getDraft(SlaItem et) {
return et;
......@@ -216,3 +215,4 @@ public class SlaItemServiceImpl extends ServiceImpl<SlaItemMapper, SlaItem> impl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/SlaKpiInstanceServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -82,7 +82,6 @@ public class SlaKpiInstanceServiceImpl extends ServiceImpl<SlaKpiInstanceMapper,
public boolean checkKey(SlaKpiInstance et) {
return (!ObjectUtils.isEmpty(et.getSlakpiinstanceid()))&&(!Objects.isNull(this.getById(et.getSlakpiinstanceid())));
}
@Override
@Transactional
public SlaKpiInstance get(String key) {
......@@ -245,3 +244,4 @@ public class SlaKpiInstanceServiceImpl extends ServiceImpl<SlaKpiInstanceMapper,
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/SlaServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -188,7 +188,6 @@ public class SlaServiceImpl extends ServiceImpl<SlaMapper, Sla> implements ISlaS
public boolean checkKey(Sla et) {
return (!ObjectUtils.isEmpty(et.getSlaid()))&&(!Objects.isNull(this.getById(et.getSlaid())));
}
@Override
@Transactional
public Sla get(String key) {
......@@ -320,3 +319,4 @@ public class SlaServiceImpl extends ServiceImpl<SlaMapper, Sla> implements ISlaS
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/SubjectServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -110,7 +110,6 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
public boolean checkKey(Subject et) {
return (!ObjectUtils.isEmpty(et.getSubjectid()))&&(!Objects.isNull(this.getById(et.getSubjectid())));
}
@Override
@Transactional
public boolean update(Subject et) {
......@@ -227,3 +226,4 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TaskServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -60,7 +60,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
public boolean checkKey(Task et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
public Task getDraft(Task et) {
return et;
......@@ -242,3 +241,4 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TeamServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -93,7 +93,6 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
public boolean checkKey(Team et) {
return (!ObjectUtils.isEmpty(et.getTeamid()))&&(!Objects.isNull(this.getById(et.getTeamid())));
}
@Override
@Transactional
public boolean save(Team et) {
......@@ -258,3 +257,4 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TeamTemplateServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -68,7 +68,6 @@ public class TeamTemplateServiceImpl extends ServiceImpl<TeamTemplateMapper, Tea
public boolean checkKey(TeamTemplate et) {
return (!ObjectUtils.isEmpty(et.getTeamtemplateid()))&&(!Objects.isNull(this.getById(et.getTeamtemplateid())));
}
@Override
@Transactional
public boolean create(TeamTemplate et) {
......@@ -206,3 +205,4 @@ public class TeamTemplateServiceImpl extends ServiceImpl<TeamTemplateMapper, Tea
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TemplateServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -133,7 +133,6 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
public boolean checkKey(Template et) {
return (!ObjectUtils.isEmpty(et.getTemplateid()))&&(!Objects.isNull(this.getById(et.getTemplateid())));
}
@Override
@Transactional
public Template get(String key) {
......@@ -209,3 +208,4 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TerritoryServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -127,7 +127,6 @@ public class TerritoryServiceImpl extends ServiceImpl<TerritoryMapper, Territory
public boolean checkKey(Territory et) {
return (!ObjectUtils.isEmpty(et.getTerritoryid()))&&(!Objects.isNull(this.getById(et.getTerritoryid())));
}
@Override
public Territory getDraft(Territory et) {
return et;
......@@ -219,3 +218,4 @@ public class TerritoryServiceImpl extends ServiceImpl<TerritoryMapper, Territory
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TimezoneDefinitionServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -103,7 +103,6 @@ public class TimezoneDefinitionServiceImpl extends ServiceImpl<TimezoneDefinitio
public boolean checkKey(TimezoneDefinition et) {
return (!ObjectUtils.isEmpty(et.getTimezonedefinitionid()))&&(!Objects.isNull(this.getById(et.getTimezonedefinitionid())));
}
@Override
@Transactional
public boolean save(TimezoneDefinition et) {
......@@ -209,3 +208,4 @@ public class TimezoneDefinitionServiceImpl extends ServiceImpl<TimezoneDefinitio
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TimezoneLocalizedNameServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -144,7 +144,6 @@ public class TimezoneLocalizedNameServiceImpl extends ServiceImpl<TimezoneLocali
return (!ObjectUtils.isEmpty(et.getTimezonelocalizednameid()))&&(!Objects.isNull(this.getById(et.getTimezonelocalizednameid())));
}
@Override
public List<TimezoneLocalizedName> selectByTimezonedefinitionid(String timezonedefinitionid) {
return baseMapper.selectByTimezonedefinitionid(timezonedefinitionid);
......@@ -216,3 +215,4 @@ public class TimezoneLocalizedNameServiceImpl extends ServiceImpl<TimezoneLocali
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TimezoneRuleServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -54,7 +54,6 @@ public class TimezoneRuleServiceImpl extends ServiceImpl<TimezoneRuleMapper, Tim
public boolean checkKey(TimezoneRule et) {
return (!ObjectUtils.isEmpty(et.getTimezoneruleid()))&&(!Objects.isNull(this.getById(et.getTimezoneruleid())));
}
@Override
@Transactional
public boolean update(TimezoneRule et) {
......@@ -216,3 +215,4 @@ public class TimezoneRuleServiceImpl extends ServiceImpl<TimezoneRuleMapper, Tim
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/TransactionCurrencyServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -364,7 +364,6 @@ public class TransactionCurrencyServiceImpl extends ServiceImpl<TransactionCurre
}
/**
* 查询集合 DEFAULT
*/
......@@ -425,3 +424,4 @@ public class TransactionCurrencyServiceImpl extends ServiceImpl<TransactionCurre
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/UomScheduleServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -154,7 +154,6 @@ public class UomScheduleServiceImpl extends ServiceImpl<UomScheduleMapper, UomSc
}
/**
* 查询集合 DEFAULT
*/
......@@ -215,3 +214,4 @@ public class UomScheduleServiceImpl extends ServiceImpl<UomScheduleMapper, UomSc
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/UomServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -143,7 +143,6 @@ public class UomServiceImpl extends ServiceImpl<UomMapper, Uom> implements IUomS
public boolean checkKey(Uom et) {
return (!ObjectUtils.isEmpty(et.getUomid()))&&(!Objects.isNull(this.getById(et.getUomid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -252,3 +251,4 @@ public class UomServiceImpl extends ServiceImpl<UomMapper, Uom> implements IUomS
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/AnnualFiscalCalendarServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -111,7 +111,6 @@ public class AnnualFiscalCalendarServiceImpl extends ServiceImpl<AnnualFiscalCal
public boolean checkKey(AnnualFiscalCalendar et) {
return (!ObjectUtils.isEmpty(et.getUserfiscalcalendarid()))&&(!Objects.isNull(this.getById(et.getUserfiscalcalendarid())));
}
@Override
public AnnualFiscalCalendar getDraft(AnnualFiscalCalendar et) {
return et;
......@@ -216,3 +215,4 @@ public class AnnualFiscalCalendarServiceImpl extends ServiceImpl<AnnualFiscalCal
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/FixedMonthlyFiscalCalendarServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -54,7 +54,6 @@ public class FixedMonthlyFiscalCalendarServiceImpl extends ServiceImpl<FixedMont
public boolean checkKey(FixedMonthlyFiscalCalendar et) {
return (!ObjectUtils.isEmpty(et.getUserfiscalcalendarid()))&&(!Objects.isNull(this.getById(et.getUserfiscalcalendarid())));
}
@Override
@Transactional
public boolean create(FixedMonthlyFiscalCalendar et) {
......@@ -216,3 +215,4 @@ public class FixedMonthlyFiscalCalendarServiceImpl extends ServiceImpl<FixedMont
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/InvoiceDetailServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -68,7 +68,6 @@ public class InvoiceDetailServiceImpl extends ServiceImpl<InvoiceDetailMapper, I
public boolean checkKey(InvoiceDetail et) {
return (!ObjectUtils.isEmpty(et.getInvoicedetailid()))&&(!Objects.isNull(this.getById(et.getInvoicedetailid())));
}
@Override
@Transactional
public InvoiceDetail get(String key) {
......@@ -280,3 +279,4 @@ public class InvoiceDetailServiceImpl extends ServiceImpl<InvoiceDetailMapper, I
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/InvoiceServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -114,7 +114,6 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
public boolean checkKey(Invoice et) {
return (!ObjectUtils.isEmpty(et.getInvoiceid()))&&(!Objects.isNull(this.getById(et.getInvoiceid())));
}
@Override
@Transactional
public boolean save(Invoice et) {
......@@ -271,3 +270,4 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/MonthlyFiscalCalendarServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -98,7 +98,6 @@ public class MonthlyFiscalCalendarServiceImpl extends ServiceImpl<MonthlyFiscalC
public boolean checkKey(MonthlyFiscalCalendar et) {
return (!ObjectUtils.isEmpty(et.getUserfiscalcalendarid()))&&(!Objects.isNull(this.getById(et.getUserfiscalcalendarid())));
}
@Override
@Transactional
public boolean save(MonthlyFiscalCalendar et) {
......@@ -216,3 +215,4 @@ public class MonthlyFiscalCalendarServiceImpl extends ServiceImpl<MonthlyFiscalC
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/QuarterlyFiscalCalendarServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -144,7 +144,6 @@ public class QuarterlyFiscalCalendarServiceImpl extends ServiceImpl<QuarterlyFis
return (!ObjectUtils.isEmpty(et.getUserfiscalcalendarid()))&&(!Objects.isNull(this.getById(et.getUserfiscalcalendarid())));
}
@Override
public List<QuarterlyFiscalCalendar> selectByTransactioncurrencyid(String transactioncurrencyid) {
return baseMapper.selectByTransactioncurrencyid(transactioncurrencyid);
......@@ -216,3 +215,4 @@ public class QuarterlyFiscalCalendarServiceImpl extends ServiceImpl<QuarterlyFis
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/finance/service/impl/SemiannualFiscalCalendarServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -66,7 +66,6 @@ public class SemiannualFiscalCalendarServiceImpl extends ServiceImpl<SemiannualF
public boolean checkKey(SemiannualFiscalCalendar et) {
return (!ObjectUtils.isEmpty(et.getUserfiscalcalendarid()))&&(!Objects.isNull(this.getById(et.getUserfiscalcalendarid())));
}
@Override
public SemiannualFiscalCalendar getDraft(SemiannualFiscalCalendar et) {
return et;
......@@ -216,3 +215,4 @@ public class SemiannualFiscalCalendarServiceImpl extends ServiceImpl<SemiannualF
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/impl/CampaignActivityServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -111,7 +111,6 @@ public class CampaignActivityServiceImpl extends ServiceImpl<CampaignActivityMap
public boolean checkKey(CampaignActivity et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
public CampaignActivity getDraft(CampaignActivity et) {
return et;
......@@ -216,3 +215,4 @@ public class CampaignActivityServiceImpl extends ServiceImpl<CampaignActivityMap
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/impl/CampaignResponseServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -150,7 +150,6 @@ public class CampaignResponseServiceImpl extends ServiceImpl<CampaignResponseMap
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
public List<CampaignResponse> selectBySlaid(String slaid) {
return baseMapper.selectBySlaid(slaid);
......@@ -232,3 +231,4 @@ public class CampaignResponseServiceImpl extends ServiceImpl<CampaignResponseMap
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/impl/CampaignServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -146,7 +146,6 @@ public class CampaignServiceImpl extends ServiceImpl<CampaignMapper, Campaign> i
public boolean checkKey(Campaign et) {
return (!ObjectUtils.isEmpty(et.getCampaignid()))&&(!Objects.isNull(this.getById(et.getCampaignid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -241,3 +240,4 @@ public class CampaignServiceImpl extends ServiceImpl<CampaignMapper, Campaign> i
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/impl/IBizListServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -97,7 +97,6 @@ public class IBizListServiceImpl extends ServiceImpl<IBizListMapper, IBizList> i
public boolean checkKey(IBizList et) {
return (!ObjectUtils.isEmpty(et.getListid()))&&(!Objects.isNull(this.getById(et.getListid())));
}
@Override
@Transactional
public boolean update(IBizList et) {
......@@ -216,3 +215,4 @@ public class IBizListServiceImpl extends ServiceImpl<IBizListMapper, IBizList> i
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/PriceLevelServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -171,7 +171,6 @@ public class PriceLevelServiceImpl extends ServiceImpl<PriceLevelMapper, PriceLe
return (!ObjectUtils.isEmpty(et.getPricelevelid()))&&(!Objects.isNull(this.getById(et.getPricelevelid())));
}
@Override
public List<PriceLevel> selectByTransactioncurrencyid(String transactioncurrencyid) {
return baseMapper.selectByTransactioncurrencyid(transactioncurrencyid);
......@@ -243,3 +242,4 @@ public class PriceLevelServiceImpl extends ServiceImpl<PriceLevelMapper, PriceLe
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/ProductAssociationServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -117,7 +117,6 @@ public class ProductAssociationServiceImpl extends ServiceImpl<ProductAssociatio
public boolean checkKey(ProductAssociation et) {
return (!ObjectUtils.isEmpty(et.getProductassociationid()))&&(!Objects.isNull(this.getById(et.getProductassociationid())));
}
@Override
@Transactional
public ProductAssociation get(String key) {
......@@ -252,3 +251,4 @@ public class ProductAssociationServiceImpl extends ServiceImpl<ProductAssociatio
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/ProductPricePevelServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -159,7 +159,6 @@ public class ProductPricePevelServiceImpl extends ServiceImpl<ProductPricePevelM
return (!ObjectUtils.isEmpty(et.getProductpricelevelid()))&&(!Objects.isNull(this.getById(et.getProductpricelevelid())));
}
@Override
public List<ProductPricePevel> selectByDiscounttypeid(String discounttypeid) {
return baseMapper.selectByDiscounttypeid(discounttypeid);
......@@ -281,3 +280,4 @@ public class ProductPricePevelServiceImpl extends ServiceImpl<ProductPricePevelM
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/ProductServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -95,7 +95,6 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
public boolean checkKey(Product et) {
return (!ObjectUtils.isEmpty(et.getProductid()))&&(!Objects.isNull(this.getById(et.getProductid())));
}
@Override
@Transactional
public boolean save(Product et) {
......@@ -307,3 +306,4 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/ProductSubStituteServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -71,7 +71,6 @@ public class ProductSubStituteServiceImpl extends ServiceImpl<ProductSubStituteM
public boolean checkKey(ProductSubStitute et) {
return (!ObjectUtils.isEmpty(et.getProductsubstituteid()))&&(!Objects.isNull(this.getById(et.getProductsubstituteid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -239,3 +238,4 @@ public class ProductSubStituteServiceImpl extends ServiceImpl<ProductSubStituteM
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/BulkDeleteFailureServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -109,7 +109,6 @@ public class BulkDeleteFailureServiceImpl extends ServiceImpl<BulkDeleteFailureM
public boolean checkKey(BulkDeleteFailure et) {
return (!ObjectUtils.isEmpty(et.getBulkdeletefailureid()))&&(!Objects.isNull(this.getById(et.getBulkdeletefailureid())));
}
@Override
@Transactional
public boolean save(BulkDeleteFailure et) {
......@@ -203,3 +202,4 @@ public class BulkDeleteFailureServiceImpl extends ServiceImpl<BulkDeleteFailureM
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/BulkDeleteOperationServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -51,7 +51,6 @@ public class BulkDeleteOperationServiceImpl extends ServiceImpl<BulkDeleteOperat
public boolean checkKey(BulkDeleteOperation et) {
return (!ObjectUtils.isEmpty(et.getBulkdeleteoperationid()))&&(!Objects.isNull(this.getById(et.getBulkdeleteoperationid())));
}
@Override
@Transactional
public boolean update(BulkDeleteOperation et) {
......@@ -203,3 +202,4 @@ public class BulkDeleteOperationServiceImpl extends ServiceImpl<BulkDeleteOperat
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/BulkOperationLogServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -138,7 +138,6 @@ public class BulkOperationLogServiceImpl extends ServiceImpl<BulkOperationLogMap
public boolean checkKey(BulkOperationLog et) {
return (!ObjectUtils.isEmpty(et.getBulkoperationlogid()))&&(!Objects.isNull(this.getById(et.getBulkoperationlogid())));
}
@Override
public BulkOperationLog getDraft(BulkOperationLog et) {
return et;
......@@ -216,3 +215,4 @@ public class BulkOperationLogServiceImpl extends ServiceImpl<BulkOperationLogMap
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/BulkOperationServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -110,7 +110,6 @@ public class BulkOperationServiceImpl extends ServiceImpl<BulkOperationMapper, B
public boolean checkKey(BulkOperation et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
@Transactional
public boolean save(BulkOperation et) {
......@@ -229,3 +228,4 @@ public class BulkOperationServiceImpl extends ServiceImpl<BulkOperationMapper, B
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/CallbackRegistrationServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -104,7 +104,6 @@ public class CallbackRegistrationServiceImpl extends ServiceImpl<CallbackRegistr
public boolean checkKey(CallbackRegistration et) {
return (!ObjectUtils.isEmpty(et.getCallbackregistrationid()))&&(!Objects.isNull(this.getById(et.getCallbackregistrationid())));
}
@Override
public CallbackRegistration getDraft(CallbackRegistration et) {
return et;
......@@ -203,3 +202,4 @@ public class CallbackRegistrationServiceImpl extends ServiceImpl<CallbackRegistr
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/ConnectionRoleServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -145,7 +145,6 @@ public class ConnectionRoleServiceImpl extends ServiceImpl<ConnectionRoleMapper,
}
/**
* 查询集合 DEFAULT
*/
......@@ -206,3 +205,4 @@ public class ConnectionRoleServiceImpl extends ServiceImpl<ConnectionRoleMapper,
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/ConnectionServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -121,7 +121,6 @@ public class ConnectionServiceImpl extends ServiceImpl<ConnectionMapper, Connect
public boolean checkKey(Connection et) {
return (!ObjectUtils.isEmpty(et.getConnectionid()))&&(!Objects.isNull(this.getById(et.getConnectionid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -239,3 +238,4 @@ public class ConnectionServiceImpl extends ServiceImpl<ConnectionMapper, Connect
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/ExpiredprocessServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -147,7 +147,6 @@ public class ExpiredprocessServiceImpl extends ServiceImpl<ExpiredprocessMapper,
return (!ObjectUtils.isEmpty(et.getBusinessprocessflowinstanceid()))&&(!Objects.isNull(this.getById(et.getBusinessprocessflowinstanceid())));
}
@Override
public List<Expiredprocess> selectByKnowledgearticleid(String knowledgearticleid) {
return baseMapper.selectByKnowledgearticleid(knowledgearticleid);
......@@ -229,3 +228,4 @@ public class ExpiredprocessServiceImpl extends ServiceImpl<ExpiredprocessMapper,
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/QueueItemServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -57,7 +57,6 @@ public class QueueItemServiceImpl extends ServiceImpl<QueueItemMapper, QueueItem
public boolean checkKey(QueueItem et) {
return (!ObjectUtils.isEmpty(et.getQueueitemid()))&&(!Objects.isNull(this.getById(et.getQueueitemid())));
}
@Override
@Transactional
public boolean save(QueueItem et) {
......@@ -229,3 +228,4 @@ public class QueueItemServiceImpl extends ServiceImpl<QueueItemMapper, QueueItem
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/runtime/service/impl/QueueServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -153,7 +153,6 @@ public class QueueServiceImpl extends ServiceImpl<QueueMapper, Queue> implements
return (!ObjectUtils.isEmpty(et.getQueueid()))&&(!Objects.isNull(this.getById(et.getQueueid())));
}
@Override
public List<Queue> selectByBusinessunitid(String businessunitid) {
return baseMapper.selectByBusinessunitid(businessunitid);
......@@ -235,3 +234,4 @@ public class QueueServiceImpl extends ServiceImpl<QueueMapper, Queue> implements
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/CompetitorServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -141,7 +141,6 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
public boolean checkKey(Competitor et) {
return (!ObjectUtils.isEmpty(et.getCompetitorid()))&&(!Objects.isNull(this.getById(et.getCompetitorid())));
}
@Override
public Competitor getDraft(Competitor et) {
return et;
......@@ -219,3 +218,4 @@ public class CompetitorServiceImpl extends ServiceImpl<CompetitorMapper, Competi
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/DiscountServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -67,7 +67,6 @@ public class DiscountServiceImpl extends ServiceImpl<DiscountMapper, Discount> i
public boolean checkKey(Discount et) {
return (!ObjectUtils.isEmpty(et.getDiscountid()))&&(!Objects.isNull(this.getById(et.getDiscountid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -216,3 +215,4 @@ public class DiscountServiceImpl extends ServiceImpl<DiscountMapper, Discount> i
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/DiscountTypeServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -74,7 +74,6 @@ public class DiscountTypeServiceImpl extends ServiceImpl<DiscountTypeMapper, Dis
public boolean checkKey(DiscountType et) {
return (!ObjectUtils.isEmpty(et.getDiscounttypeid()))&&(!Objects.isNull(this.getById(et.getDiscounttypeid())));
}
@Override
public DiscountType getDraft(DiscountType et) {
return et;
......@@ -222,3 +221,4 @@ public class DiscountTypeServiceImpl extends ServiceImpl<DiscountTypeMapper, Dis
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/GoalRollupQueryServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -130,7 +130,6 @@ public class GoalRollupQueryServiceImpl extends ServiceImpl<GoalRollupQueryMappe
public boolean checkKey(GoalRollupQuery et) {
return (!ObjectUtils.isEmpty(et.getGoalrollupqueryid()))&&(!Objects.isNull(this.getById(et.getGoalrollupqueryid())));
}
@Override
@Transactional
public GoalRollupQuery get(String key) {
......@@ -206,3 +205,4 @@ public class GoalRollupQueryServiceImpl extends ServiceImpl<GoalRollupQueryMappe
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/GoalServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -143,7 +143,6 @@ public class GoalServiceImpl extends ServiceImpl<GoalMapper, Goal> implements IG
public boolean checkKey(Goal et) {
return (!ObjectUtils.isEmpty(et.getGoalid()))&&(!Objects.isNull(this.getById(et.getGoalid())));
}
@Override
public Goal getDraft(Goal et) {
return et;
......@@ -331,3 +330,4 @@ public class GoalServiceImpl extends ServiceImpl<GoalMapper, Goal> implements IG
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/LeadAddressServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -132,7 +132,6 @@ public class LeadAddressServiceImpl extends ServiceImpl<LeadAddressMapper, LeadA
public boolean checkKey(LeadAddress et) {
return (!ObjectUtils.isEmpty(et.getLeadaddressid()))&&(!Objects.isNull(this.getById(et.getLeadaddressid())));
}
@Override
@Transactional
public boolean update(LeadAddress et) {
......@@ -229,3 +228,4 @@ public class LeadAddressServiceImpl extends ServiceImpl<LeadAddressMapper, LeadA
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/LeadServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -97,7 +97,6 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
public boolean checkKey(Lead et) {
return (!ObjectUtils.isEmpty(et.getLeadid()))&&(!Objects.isNull(this.getById(et.getLeadid())));
}
@Override
@Transactional
public Lead get(String key) {
......@@ -310,3 +309,4 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/OpportunityCloseServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -109,7 +109,6 @@ public class OpportunityCloseServiceImpl extends ServiceImpl<OpportunityCloseMap
public boolean checkKey(OpportunityClose et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
public OpportunityClose getDraft(OpportunityClose et) {
return et;
......@@ -268,3 +267,4 @@ public class OpportunityCloseServiceImpl extends ServiceImpl<OpportunityCloseMap
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/OpportunityProductServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -101,7 +101,6 @@ public class OpportunityProductServiceImpl extends ServiceImpl<OpportunityProduc
public boolean checkKey(OpportunityProduct et) {
return (!ObjectUtils.isEmpty(et.getOpportunityproductid()))&&(!Objects.isNull(this.getById(et.getOpportunityproductid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -267,3 +266,4 @@ public class OpportunityProductServiceImpl extends ServiceImpl<OpportunityProduc
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/OpportunityServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -145,7 +145,6 @@ public class OpportunityServiceImpl extends ServiceImpl<OpportunityMapper, Oppor
public boolean checkKey(Opportunity et) {
return (!ObjectUtils.isEmpty(et.getOpportunityid()))&&(!Objects.isNull(this.getById(et.getOpportunityid())));
}
@Override
@Transactional
public boolean save(Opportunity et) {
......@@ -309,3 +308,4 @@ public class OpportunityServiceImpl extends ServiceImpl<OpportunityMapper, Oppor
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/OrderCloseServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -95,7 +95,6 @@ public class OrderCloseServiceImpl extends ServiceImpl<OrderCloseMapper, OrderCl
public boolean checkKey(OrderClose et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
@Transactional
public boolean remove(String key) {
......@@ -255,3 +254,4 @@ public class OrderCloseServiceImpl extends ServiceImpl<OrderCloseMapper, OrderCl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/QuoteCloseServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -139,7 +139,6 @@ public class QuoteCloseServiceImpl extends ServiceImpl<QuoteCloseMapper, QuoteCl
public boolean checkKey(QuoteClose et) {
return (!ObjectUtils.isEmpty(et.getActivityid()))&&(!Objects.isNull(this.getById(et.getActivityid())));
}
@Override
@Transactional
public QuoteClose get(String key) {
......@@ -255,3 +254,4 @@ public class QuoteCloseServiceImpl extends ServiceImpl<QuoteCloseMapper, QuoteCl
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/QuoteDetailServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -130,7 +130,6 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
public boolean checkKey(QuoteDetail et) {
return (!ObjectUtils.isEmpty(et.getQuotedetailid()))&&(!Objects.isNull(this.getById(et.getQuotedetailid())));
}
@Override
@Transactional
public QuoteDetail get(String key) {
......@@ -270,3 +269,4 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/QuoteServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -159,7 +159,6 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
public boolean checkKey(Quote et) {
return (!ObjectUtils.isEmpty(et.getQuoteid()))&&(!Objects.isNull(this.getById(et.getQuoteid())));
}
@Override
public Quote getDraft(Quote et) {
return et;
......@@ -277,3 +276,4 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/SalesLiteratureItemServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -129,7 +129,6 @@ public class SalesLiteratureItemServiceImpl extends ServiceImpl<SalesLiteratureI
public boolean checkKey(SalesLiteratureItem et) {
return (!ObjectUtils.isEmpty(et.getSalesliteratureitemid()))&&(!Objects.isNull(this.getById(et.getSalesliteratureitemid())));
}
@Override
@Transactional
public boolean create(SalesLiteratureItem et) {
......@@ -216,3 +215,4 @@ public class SalesLiteratureItemServiceImpl extends ServiceImpl<SalesLiteratureI
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/SalesLiteratureServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -130,7 +130,6 @@ public class SalesLiteratureServiceImpl extends ServiceImpl<SalesLiteratureMappe
public boolean checkKey(SalesLiterature et) {
return (!ObjectUtils.isEmpty(et.getSalesliteratureid()))&&(!Objects.isNull(this.getById(et.getSalesliteratureid())));
}
@Override
@Transactional
public boolean update(SalesLiterature et) {
......@@ -232,3 +231,4 @@ public class SalesLiteratureServiceImpl extends ServiceImpl<SalesLiteratureMappe
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/SalesOrderDetailServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -85,7 +85,6 @@ public class SalesOrderDetailServiceImpl extends ServiceImpl<SalesOrderDetailMap
public boolean checkKey(SalesOrderDetail et) {
return (!ObjectUtils.isEmpty(et.getSalesorderdetailid()))&&(!Objects.isNull(this.getById(et.getSalesorderdetailid())));
}
@Override
@Transactional
public SalesOrderDetail get(String key) {
......@@ -283,3 +282,4 @@ public class SalesOrderDetailServiceImpl extends ServiceImpl<SalesOrderDetailMap
}
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/service/impl/SalesOrderServiceImpl.java
浏览文件 @ 1f3bf56f
......@@ -78,7 +78,6 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
public boolean checkKey(SalesOrder et) {
return (!ObjectUtils.isEmpty(et.getSalesorderid()))&&(!Objects.isNull(this.getById(et.getSalesorderid())));
}
@Override
public SalesOrder getDraft(SalesOrder et) {
return et;
......@@ -290,3 +289,4 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或