Skip to content

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

xignzi006 发布系统代码

上级 69fc3cdb
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 768 行增加 和 558 行删除
app_BusinessCentral/src/interface/entity/campaign-campaign.ts
浏览文件 @ 9e7cfbc5
...@@ -52,7 +52,7 @@ export interface CampaignCampaign { ...@@ -52,7 +52,7 @@ export interface CampaignCampaign {
* @returns {*} * @returns {*}
* @memberof CampaignCampaign * @memberof CampaignCampaign
*/ */
campaignid?: any; entityid?: any;
/** /**
* 活动名称 * 活动名称
...@@ -60,7 +60,7 @@ export interface CampaignCampaign { ...@@ -60,7 +60,7 @@ export interface CampaignCampaign {
* @returns {*} * @returns {*}
* @memberof CampaignCampaign * @memberof CampaignCampaign
*/ */
campaignname?: any; entityname?: any;
/** /**
* 市场活动 * 市场活动
...@@ -68,7 +68,7 @@ export interface CampaignCampaign { ...@@ -68,7 +68,7 @@ export interface CampaignCampaign {
* @returns {*} * @returns {*}
* @memberof CampaignCampaign * @memberof CampaignCampaign
*/ */
campaign2id?: any; entity2id?: any;
/** /**
* 活动2名称 * 活动2名称
...@@ -76,7 +76,7 @@ export interface CampaignCampaign { ...@@ -76,7 +76,7 @@ export interface CampaignCampaign {
* @returns {*} * @returns {*}
* @memberof CampaignCampaign * @memberof CampaignCampaign
*/ */
campaign2name?: any; entity2name?: any;
/** /**
* 关系标识 * 关系标识
......
app_BusinessCentral/src/interface/entity/list-account.ts
浏览文件 @ 9e7cfbc5
...@@ -68,7 +68,7 @@ export interface ListAccount { ...@@ -68,7 +68,7 @@ export interface ListAccount {
* @returns {*} * @returns {*}
* @memberof ListAccount * @memberof ListAccount
*/ */
listid?: any; entityid?: any;
/** /**
* 客户 * 客户
...@@ -76,21 +76,21 @@ export interface ListAccount { ...@@ -76,21 +76,21 @@ export interface ListAccount {
* @returns {*} * @returns {*}
* @memberof ListAccount * @memberof ListAccount
*/ */
accountid?: any; entity2id?: any;
/** /**
* 名称 * 营销列表
* *
* @returns {*} * @returns {*}
* @memberof ListAccount * @memberof ListAccount
*/ */
listname?: any; entityname?: any;
/** /**
* 客户名称 * 客户
* *
* @returns {*} * @returns {*}
* @memberof ListAccount * @memberof ListAccount
*/ */
accountname?: any; entity2name?: any;
} }
\ No newline at end of file
app_BusinessCentral/src/interface/entity/list-contact.ts
浏览文件 @ 9e7cfbc5
...@@ -68,15 +68,15 @@ export interface ListContact { ...@@ -68,15 +68,15 @@ export interface ListContact {
* @returns {*} * @returns {*}
* @memberof ListContact * @memberof ListContact
*/ */
listid?: any; entityid?: any;
/** /**
* 名称 * 营销列表
* *
* @returns {*} * @returns {*}
* @memberof ListContact * @memberof ListContact
*/ */
listname?: any; entityname?: any;
/** /**
* 联系人 * 联系人
...@@ -84,13 +84,13 @@ export interface ListContact { ...@@ -84,13 +84,13 @@ export interface ListContact {
* @returns {*} * @returns {*}
* @memberof ListContact * @memberof ListContact
*/ */
contactid?: any; entity2id?: any;
/** /**
* 全名 * 联系人
* *
* @returns {*} * @returns {*}
* @memberof ListContact * @memberof ListContact
*/ */
fullname?: any; entity2name?: any;
} }
\ No newline at end of file
app_BusinessCentral/src/interface/entity/list-lead.ts
浏览文件 @ 9e7cfbc5
...@@ -68,15 +68,15 @@ export interface ListLead { ...@@ -68,15 +68,15 @@ export interface ListLead {
* @returns {*} * @returns {*}
* @memberof ListLead * @memberof ListLead
*/ */
listid?: any; entityid?: any;
/** /**
* 名称 * 营销列表
* *
* @returns {*} * @returns {*}
* @memberof ListLead * @memberof ListLead
*/ */
listname?: any; entityname?: any;
/** /**
* 潜在顾客 * 潜在顾客
...@@ -84,13 +84,13 @@ export interface ListLead { ...@@ -84,13 +84,13 @@ export interface ListLead {
* @returns {*} * @returns {*}
* @memberof ListLead * @memberof ListLead
*/ */
leadid?: any; entity2id?: any;
/** /**
* 姓名 * 潜在顾客
* *
* @returns {*} * @returns {*}
* @memberof ListLead * @memberof ListLead
*/ */
fullname?: any; entity2name?: any;
} }
\ No newline at end of file
app_BusinessCentral/src/locale/lanres/entities/campaign-campaign/campaign-campaign_en_US.ts
浏览文件 @ 9e7cfbc5
...@@ -6,10 +6,10 @@ export default { ...@@ -6,10 +6,10 @@ export default {
updatedate: '更新时间', updatedate: '更新时间',
updateman: '更新人', updateman: '更新人',
relationshipstype: '关系类型', relationshipstype: '关系类型',
campaignid: '市场活动', entityid: '市场活动',
campaignname: '活动名称', entityname: '活动名称',
campaign2id: '市场活动', entity2id: '市场活动',
campaign2name: '活动2名称', entity2name: '活动2名称',
relationshipsid: '关系标识', relationshipsid: '关系标识',
relationshipsname: '关系名称', relationshipsname: '关系名称',
}, },
......
app_BusinessCentral/src/locale/lanres/entities/campaign-campaign/campaign-campaign_zh_CN.ts
浏览文件 @ 9e7cfbc5
...@@ -5,10 +5,10 @@ export default { ...@@ -5,10 +5,10 @@ export default {
updatedate: '更新时间', updatedate: '更新时间',
updateman: '更新人', updateman: '更新人',
relationshipstype: '关系类型', relationshipstype: '关系类型',
campaignid: '市场活动', entityid: '市场活动',
campaignname: '活动名称', entityname: '活动名称',
campaign2id: '市场活动', entity2id: '市场活动',
campaign2name: '活动2名称', entity2name: '活动2名称',
relationshipsid: '关系标识', relationshipsid: '关系标识',
relationshipsname: '关系名称', relationshipsname: '关系名称',
}, },
......
app_BusinessCentral/src/locale/lanres/entities/list-account/list-account_en_US.ts
浏览文件 @ 9e7cfbc5
...@@ -8,10 +8,10 @@ export default { ...@@ -8,10 +8,10 @@ export default {
relationshipstype: '关系类型', relationshipstype: '关系类型',
updatedate: '更新时间', updatedate: '更新时间',
updateman: '更新人', updateman: '更新人',
listid: '列表', entityid: '列表',
accountid: '客户', entity2id: '客户',
listname: '名称', entityname: '营销列表',
accountname: '客户名称', entity2name: '客户',
}, },
views: { views: {
editview: { editview: {
......
app_BusinessCentral/src/locale/lanres/entities/list-account/list-account_zh_CN.ts
浏览文件 @ 9e7cfbc5
...@@ -7,10 +7,10 @@ export default { ...@@ -7,10 +7,10 @@ export default {
relationshipstype: '关系类型', relationshipstype: '关系类型',
updatedate: '更新时间', updatedate: '更新时间',
updateman: '更新人', updateman: '更新人',
listid: '列表', entityid: '列表',
accountid: '客户', entity2id: '客户',
listname: '名称', entityname: '营销列表',
accountname: '客户名称', entity2name: '客户',
}, },
views: { views: {
editview: { editview: {
......
app_BusinessCentral/src/locale/lanres/entities/list-contact/list-contact_en_US.ts
浏览文件 @ 9e7cfbc5
...@@ -8,10 +8,10 @@ export default { ...@@ -8,10 +8,10 @@ export default {
updatedate: '更新时间', updatedate: '更新时间',
updateman: '更新人', updateman: '更新人',
relationshipsid: '关系标识', relationshipsid: '关系标识',
listid: '列表', entityid: '列表',
listname: '名称', entityname: '营销列表',
contactid: '联系人', entity2id: '联系人',
fullname: '全名', entity2name: '联系人',
}, },
views: { views: {
gridview: { gridview: {
......
app_BusinessCentral/src/locale/lanres/entities/list-contact/list-contact_zh_CN.ts
浏览文件 @ 9e7cfbc5
...@@ -7,10 +7,10 @@ export default { ...@@ -7,10 +7,10 @@ export default {
updatedate: '更新时间', updatedate: '更新时间',
updateman: '更新人', updateman: '更新人',
relationshipsid: '关系标识', relationshipsid: '关系标识',
listid: '列表', entityid: '列表',
listname: '名称', entityname: '营销列表',
contactid: '联系人', entity2id: '联系人',
fullname: '全名', entity2name: '联系人',
}, },
views: { views: {
gridview: { gridview: {
......
app_BusinessCentral/src/locale/lanres/entities/list-lead/list-lead_en_US.ts
浏览文件 @ 9e7cfbc5
...@@ -8,10 +8,10 @@ export default { ...@@ -8,10 +8,10 @@ export default {
relationshipstype: '关系类型', relationshipstype: '关系类型',
updatedate: '更新时间', updatedate: '更新时间',
updateman: '更新人', updateman: '更新人',
listid: '列表', entityid: '列表',
listname: '名称', entityname: '营销列表',
leadid: '潜在顾客', entity2id: '潜在顾客',
fullname: '姓名', entity2name: '潜在顾客',
}, },
views: { views: {
editview: { editview: {
......
app_BusinessCentral/src/locale/lanres/entities/list-lead/list-lead_zh_CN.ts
浏览文件 @ 9e7cfbc5
...@@ -7,10 +7,10 @@ export default { ...@@ -7,10 +7,10 @@ export default {
relationshipstype: '关系类型', relationshipstype: '关系类型',
updatedate: '更新时间', updatedate: '更新时间',
updateman: '更新人', updateman: '更新人',
listid: '列表', entityid: '列表',
listname: '名称', entityname: '营销列表',
leadid: '潜在顾客', entity2id: '潜在顾客',
fullname: '姓名', entity2name: '潜在顾客',
}, },
views: { views: {
editview: { editview: {
......
app_BusinessCentral/src/widgets/list-account/main-grid/main-grid-model.ts
浏览文件 @ 9e7cfbc5
...@@ -27,8 +27,13 @@ export default class MainModel { ...@@ -27,8 +27,13 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'listid', name: 'entity2id',
prop: 'listid', prop: 'entity2id',
dataType: 'PICKUP',
},
{
name: 'entityid',
prop: 'entityid',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
...@@ -36,11 +41,6 @@ export default class MainModel { ...@@ -36,11 +41,6 @@ export default class MainModel {
prop: 'relationshipsname', prop: 'relationshipsname',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'accountid',
prop: 'accountid',
dataType: 'PICKUP',
},
{ {
name: 'srfdataaccaction', name: 'srfdataaccaction',
prop: 'relationshipsid', prop: 'relationshipsid',
......
app_BusinessCentral/src/widgets/list-contact/main-grid/main-grid-model.ts
浏览文件 @ 9e7cfbc5
...@@ -27,13 +27,13 @@ export default class MainModel { ...@@ -27,13 +27,13 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'listid', name: 'entity2id',
prop: 'listid', prop: 'entity2id',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
name: 'contactid', name: 'entityid',
prop: 'contactid', prop: 'entityid',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
......
app_BusinessCentral/src/widgets/list-lead/main-grid/main-grid-model.ts
浏览文件 @ 9e7cfbc5
...@@ -27,8 +27,13 @@ export default class MainModel { ...@@ -27,8 +27,13 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'listid', name: 'entity2id',
prop: 'listid', prop: 'entity2id',
dataType: 'PICKUP',
},
{
name: 'entityid',
prop: 'entityid',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
...@@ -36,11 +41,6 @@ export default class MainModel { ...@@ -36,11 +41,6 @@ export default class MainModel {
prop: 'relationshipsname', prop: 'relationshipsname',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'leadid',
prop: 'leadid',
dataType: 'PICKUP',
},
{ {
name: 'srfdataaccaction', name: 'srfdataaccaction',
prop: 'relationshipsid', prop: 'relationshipsid',
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/domain/CampaignCampaign.java
浏览文件 @ 9e7cfbc5
...@@ -84,31 +84,31 @@ public class CampaignCampaign extends EntityMP implements Serializable { ...@@ -84,31 +84,31 @@ public class CampaignCampaign extends EntityMP implements Serializable {
/** /**
* 市场活动 * 市场活动
*/ */
@TableField(value = "campaignid") @TableField(value = "entityid")
@JSONField(name = "campaignid") @JSONField(name = "entityid")
@JsonProperty("campaignid") @JsonProperty("entityid")
private String campaignid; private String entityid;
/** /**
* 活动名称 * 活动名称
*/ */
@TableField(value = "campaignname") @TableField(value = "entityname")
@JSONField(name = "campaignname") @JSONField(name = "entityname")
@JsonProperty("campaignname") @JsonProperty("entityname")
private String campaignname; private String entityname;
/** /**
* 市场活动 * 市场活动
*/ */
@TableField(value = "campaign2id") @TableField(value = "entity2id")
@JSONField(name = "campaign2id") @JSONField(name = "entity2id")
@JsonProperty("campaign2id") @JsonProperty("entity2id")
private String campaign2id; private String entity2id;
/** /**
* 活动2名称 * 活动2名称
*/ */
@TableField(value = "campaign2name") @TableField(value = "entity2name")
@JSONField(name = "campaign2name") @JSONField(name = "entity2name")
@JsonProperty("campaign2name") @JsonProperty("entity2name")
private String campaign2name; private String entity2name;
/** /**
* 关系标识 * 关系标识
*/ */
...@@ -154,33 +154,33 @@ public class CampaignCampaign extends EntityMP implements Serializable { ...@@ -154,33 +154,33 @@ public class CampaignCampaign extends EntityMP implements Serializable {
/** /**
* 设置 [市场活动] * 设置 [市场活动]
*/ */
public void setCampaignid(String campaignid){ public void setEntityid(String entityid){
this.campaignid = campaignid ; this.entityid = entityid ;
this.modify("campaignid",campaignid); this.modify("entityid",entityid);
} }
/** /**
* 设置 [活动名称] * 设置 [活动名称]
*/ */
public void setCampaignname(String campaignname){ public void setEntityname(String entityname){
this.campaignname = campaignname ; this.entityname = entityname ;
this.modify("campaignname",campaignname); this.modify("entityname",entityname);
} }
/** /**
* 设置 [市场活动] * 设置 [市场活动]
*/ */
public void setCampaign2id(String campaign2id){ public void setEntity2id(String entity2id){
this.campaign2id = campaign2id ; this.entity2id = entity2id ;
this.modify("campaign2id",campaign2id); this.modify("entity2id",entity2id);
} }
/** /**
* 设置 [活动2名称] * 设置 [活动2名称]
*/ */
public void setCampaign2name(String campaign2name){ public void setEntity2name(String entity2name){
this.campaign2name = campaign2name ; this.entity2name = entity2name ;
this.modify("campaign2name",campaign2name); this.modify("entity2name",entity2name);
} }
/** /**
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/domain/ListAccount.java
浏览文件 @ 9e7cfbc5
...@@ -99,31 +99,31 @@ public class ListAccount extends EntityMP implements Serializable { ...@@ -99,31 +99,31 @@ public class ListAccount extends EntityMP implements Serializable {
/** /**
* 列表 * 列表
*/ */
@TableField(value = "listid") @TableField(value = "entityid")
@JSONField(name = "listid") @JSONField(name = "entityid")
@JsonProperty("listid") @JsonProperty("entityid")
private String listid; private String entityid;
/** /**
* 客户 * 客户
*/ */
@TableField(value = "accountid") @TableField(value = "entity2id")
@JSONField(name = "accountid") @JSONField(name = "entity2id")
@JsonProperty("accountid") @JsonProperty("entity2id")
private String accountid; private String entity2id;
/** /**
* 名称 * 营销列表
*/ */
@TableField(value = "listname") @TableField(value = "entityname")
@JSONField(name = "listname") @JSONField(name = "entityname")
@JsonProperty("listname") @JsonProperty("entityname")
private String listname; private String entityname;
/** /**
* 客户名称 * 客户
*/ */
@TableField(value = "accountname") @TableField(value = "entity2name")
@JSONField(name = "accountname") @JSONField(name = "entity2name")
@JsonProperty("accountname") @JsonProperty("entity2name")
private String accountname; private String entity2name;
/** /**
* *
...@@ -162,33 +162,33 @@ public class ListAccount extends EntityMP implements Serializable { ...@@ -162,33 +162,33 @@ public class ListAccount extends EntityMP implements Serializable {
/** /**
* 设置 [列表] * 设置 [列表]
*/ */
public void setListid(String listid){ public void setEntityid(String entityid){
this.listid = listid ; this.entityid = entityid ;
this.modify("listid",listid); this.modify("entityid",entityid);
} }
/** /**
* 设置 [客户] * 设置 [客户]
*/ */
public void setAccountid(String accountid){ public void setEntity2id(String entity2id){
this.accountid = accountid ; this.entity2id = entity2id ;
this.modify("accountid",accountid); this.modify("entity2id",entity2id);
} }
/** /**
* 设置 [名称] * 设置 [营销列表]
*/ */
public void setListname(String listname){ public void setEntityname(String entityname){
this.listname = listname ; this.entityname = entityname ;
this.modify("listname",listname); this.modify("entityname",entityname);
} }
/** /**
* 设置 [客户名称] * 设置 [客户]
*/ */
public void setAccountname(String accountname){ public void setEntity2name(String entity2name){
this.accountname = accountname ; this.entity2name = entity2name ;
this.modify("accountname",accountname); this.modify("entity2name",entity2name);
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/domain/ListContact.java
浏览文件 @ 9e7cfbc5
...@@ -99,31 +99,31 @@ public class ListContact extends EntityMP implements Serializable { ...@@ -99,31 +99,31 @@ public class ListContact extends EntityMP implements Serializable {
/** /**
* 列表 * 列表
*/ */
@TableField(value = "listid") @TableField(value = "entityid")
@JSONField(name = "listid") @JSONField(name = "entityid")
@JsonProperty("listid") @JsonProperty("entityid")
private String listid; private String entityid;
/** /**
* 名称 * 营销列表
*/ */
@TableField(value = "listname") @TableField(value = "entityname")
@JSONField(name = "listname") @JSONField(name = "entityname")
@JsonProperty("listname") @JsonProperty("entityname")
private String listname; private String entityname;
/** /**
* 联系人 * 联系人
*/ */
@TableField(value = "contactid") @TableField(value = "entity2id")
@JSONField(name = "contactid") @JSONField(name = "entity2id")
@JsonProperty("contactid") @JsonProperty("entity2id")
private String contactid; private String entity2id;
/** /**
* 全名 * 联系人
*/ */
@TableField(value = "fullname") @TableField(value = "entity2name")
@JSONField(name = "fullname") @JSONField(name = "entity2name")
@JsonProperty("fullname") @JsonProperty("entity2name")
private String fullname; private String entity2name;
/** /**
* *
...@@ -162,33 +162,33 @@ public class ListContact extends EntityMP implements Serializable { ...@@ -162,33 +162,33 @@ public class ListContact extends EntityMP implements Serializable {
/** /**
* 设置 [列表] * 设置 [列表]
*/ */
public void setListid(String listid){ public void setEntityid(String entityid){
this.listid = listid ; this.entityid = entityid ;
this.modify("listid",listid); this.modify("entityid",entityid);
} }
/** /**
* 设置 [名称] * 设置 [营销列表]
*/ */
public void setListname(String listname){ public void setEntityname(String entityname){
this.listname = listname ; this.entityname = entityname ;
this.modify("listname",listname); this.modify("entityname",entityname);
} }
/** /**
* 设置 [联系人] * 设置 [联系人]
*/ */
public void setContactid(String contactid){ public void setEntity2id(String entity2id){
this.contactid = contactid ; this.entity2id = entity2id ;
this.modify("contactid",contactid); this.modify("entity2id",entity2id);
} }
/** /**
* 设置 [全名] * 设置 [联系人]
*/ */
public void setFullname(String fullname){ public void setEntity2name(String entity2name){
this.fullname = fullname ; this.entity2name = entity2name ;
this.modify("fullname",fullname); this.modify("entity2name",entity2name);
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/domain/ListLead.java
浏览文件 @ 9e7cfbc5
...@@ -99,31 +99,31 @@ public class ListLead extends EntityMP implements Serializable { ...@@ -99,31 +99,31 @@ public class ListLead extends EntityMP implements Serializable {
/** /**
* 列表 * 列表
*/ */
@TableField(value = "listid") @TableField(value = "entityid")
@JSONField(name = "listid") @JSONField(name = "entityid")
@JsonProperty("listid") @JsonProperty("entityid")
private String listid; private String entityid;
/** /**
* 名称 * 营销列表
*/ */
@TableField(value = "listname") @TableField(value = "entityname")
@JSONField(name = "listname") @JSONField(name = "entityname")
@JsonProperty("listname") @JsonProperty("entityname")
private String listname; private String entityname;
/** /**
* 潜在顾客 * 潜在顾客
*/ */
@TableField(value = "leadid") @TableField(value = "entity2id")
@JSONField(name = "leadid") @JSONField(name = "entity2id")
@JsonProperty("leadid") @JsonProperty("entity2id")
private String leadid; private String entity2id;
/** /**
* 姓名 * 潜在顾客
*/ */
@TableField(value = "fullname") @TableField(value = "entity2name")
@JSONField(name = "fullname") @JSONField(name = "entity2name")
@JsonProperty("fullname") @JsonProperty("entity2name")
private String fullname; private String entity2name;
/** /**
* *
...@@ -162,33 +162,33 @@ public class ListLead extends EntityMP implements Serializable { ...@@ -162,33 +162,33 @@ public class ListLead extends EntityMP implements Serializable {
/** /**
* 设置 [列表] * 设置 [列表]
*/ */
public void setListid(String listid){ public void setEntityid(String entityid){
this.listid = listid ; this.entityid = entityid ;
this.modify("listid",listid); this.modify("entityid",entityid);
} }
/** /**
* 设置 [名称] * 设置 [营销列表]
*/ */
public void setListname(String listname){ public void setEntityname(String entityname){
this.listname = listname ; this.entityname = entityname ;
this.modify("listname",listname); this.modify("entityname",entityname);
} }
/** /**
* 设置 [潜在顾客] * 设置 [潜在顾客]
*/ */
public void setLeadid(String leadid){ public void setEntity2id(String entity2id){
this.leadid = leadid ; this.entity2id = entity2id ;
this.modify("leadid",leadid); this.modify("entity2id",entity2id);
} }
/** /**
* 设置 [姓名] * 设置 [潜在顾客]
*/ */
public void setFullname(String fullname){ public void setEntity2name(String entity2name){
this.fullname = fullname ; this.entity2name = entity2name ;
this.modify("fullname",fullname); this.modify("entity2name",entity2name);
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/filter/CampaignCampaignSearchContext.java
浏览文件 @ 9e7cfbc5
...@@ -38,42 +38,84 @@ public class CampaignCampaignSearchContext extends QueryWrapperContext<CampaignC ...@@ -38,42 +38,84 @@ public class CampaignCampaignSearchContext extends QueryWrapperContext<CampaignC
public void setN_campaignid_eq(String n_campaignid_eq) { public void setN_campaignid_eq(String n_campaignid_eq) {
this.n_campaignid_eq = n_campaignid_eq; this.n_campaignid_eq = n_campaignid_eq;
if(!ObjectUtils.isEmpty(this.n_campaignid_eq)){ if(!ObjectUtils.isEmpty(this.n_campaignid_eq)){
this.getSearchCond().eq("campaignid", n_campaignid_eq); this.getSearchCond().eq("entityid", n_campaignid_eq);
}
}
private String n_entityid_eq;//[市场活动]
public void setN_entityid_eq(String n_entityid_eq) {
this.n_entityid_eq = n_entityid_eq;
if(!ObjectUtils.isEmpty(this.n_entityid_eq)){
this.getSearchCond().eq("entityid", n_entityid_eq);
} }
} }
private String n_campaignname_eq;//[活动名称] private String n_campaignname_eq;//[活动名称]
public void setN_campaignname_eq(String n_campaignname_eq) { public void setN_campaignname_eq(String n_campaignname_eq) {
this.n_campaignname_eq = n_campaignname_eq; this.n_campaignname_eq = n_campaignname_eq;
if(!ObjectUtils.isEmpty(this.n_campaignname_eq)){ if(!ObjectUtils.isEmpty(this.n_campaignname_eq)){
this.getSearchCond().eq("campaignname", n_campaignname_eq); this.getSearchCond().eq("entityname", n_campaignname_eq);
} }
} }
private String n_campaignname_like;//[活动名称] private String n_campaignname_like;//[活动名称]
public void setN_campaignname_like(String n_campaignname_like) { public void setN_campaignname_like(String n_campaignname_like) {
this.n_campaignname_like = n_campaignname_like; this.n_campaignname_like = n_campaignname_like;
if(!ObjectUtils.isEmpty(this.n_campaignname_like)){ if(!ObjectUtils.isEmpty(this.n_campaignname_like)){
this.getSearchCond().like("campaignname", n_campaignname_like); this.getSearchCond().like("entityname", n_campaignname_like);
}
}
private String n_entityname_eq;//[活动名称]
public void setN_entityname_eq(String n_entityname_eq) {
this.n_entityname_eq = n_entityname_eq;
if(!ObjectUtils.isEmpty(this.n_entityname_eq)){
this.getSearchCond().eq("entityname", n_entityname_eq);
}
}
private String n_entityname_like;//[活动名称]
public void setN_entityname_like(String n_entityname_like) {
this.n_entityname_like = n_entityname_like;
if(!ObjectUtils.isEmpty(this.n_entityname_like)){
this.getSearchCond().like("entityname", n_entityname_like);
} }
} }
private String n_campaign2id_eq;//[市场活动] private String n_campaign2id_eq;//[市场活动]
public void setN_campaign2id_eq(String n_campaign2id_eq) { public void setN_campaign2id_eq(String n_campaign2id_eq) {
this.n_campaign2id_eq = n_campaign2id_eq; this.n_campaign2id_eq = n_campaign2id_eq;
if(!ObjectUtils.isEmpty(this.n_campaign2id_eq)){ if(!ObjectUtils.isEmpty(this.n_campaign2id_eq)){
this.getSearchCond().eq("campaign2id", n_campaign2id_eq); this.getSearchCond().eq("entity2id", n_campaign2id_eq);
}
}
private String n_entity2id_eq;//[市场活动]
public void setN_entity2id_eq(String n_entity2id_eq) {
this.n_entity2id_eq = n_entity2id_eq;
if(!ObjectUtils.isEmpty(this.n_entity2id_eq)){
this.getSearchCond().eq("entity2id", n_entity2id_eq);
} }
} }
private String n_campaign2name_eq;//[活动2名称] private String n_campaign2name_eq;//[活动2名称]
public void setN_campaign2name_eq(String n_campaign2name_eq) { public void setN_campaign2name_eq(String n_campaign2name_eq) {
this.n_campaign2name_eq = n_campaign2name_eq; this.n_campaign2name_eq = n_campaign2name_eq;
if(!ObjectUtils.isEmpty(this.n_campaign2name_eq)){ if(!ObjectUtils.isEmpty(this.n_campaign2name_eq)){
this.getSearchCond().eq("campaign2name", n_campaign2name_eq); this.getSearchCond().eq("entity2name", n_campaign2name_eq);
} }
} }
private String n_campaign2name_like;//[活动2名称] private String n_campaign2name_like;//[活动2名称]
public void setN_campaign2name_like(String n_campaign2name_like) { public void setN_campaign2name_like(String n_campaign2name_like) {
this.n_campaign2name_like = n_campaign2name_like; this.n_campaign2name_like = n_campaign2name_like;
if(!ObjectUtils.isEmpty(this.n_campaign2name_like)){ if(!ObjectUtils.isEmpty(this.n_campaign2name_like)){
this.getSearchCond().like("campaign2name", n_campaign2name_like); this.getSearchCond().like("entity2name", n_campaign2name_like);
}
}
private String n_entity2name_eq;//[活动2名称]
public void setN_entity2name_eq(String n_entity2name_eq) {
this.n_entity2name_eq = n_entity2name_eq;
if(!ObjectUtils.isEmpty(this.n_entity2name_eq)){
this.getSearchCond().eq("entity2name", n_entity2name_eq);
}
}
private String n_entity2name_like;//[活动2名称]
public void setN_entity2name_like(String n_entity2name_like) {
this.n_entity2name_like = n_entity2name_like;
if(!ObjectUtils.isEmpty(this.n_entity2name_like)){
this.getSearchCond().like("entity2name", n_entity2name_like);
} }
} }
private String n_relationshipsname_like;//[关系名称] private String n_relationshipsname_like;//[关系名称]
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/filter/CampaignListSearchContext.java
浏览文件 @ 9e7cfbc5
...@@ -40,6 +40,13 @@ public class CampaignListSearchContext extends QueryWrapperContext<CampaignList> ...@@ -40,6 +40,13 @@ public class CampaignListSearchContext extends QueryWrapperContext<CampaignList>
if(!ObjectUtils.isEmpty(this.n_campaignid_eq)){ if(!ObjectUtils.isEmpty(this.n_campaignid_eq)){
this.getSearchCond().eq("entityid", n_campaignid_eq); this.getSearchCond().eq("entityid", n_campaignid_eq);
} }
}
private String n_entityid_eq;//[市场活动]
public void setN_entityid_eq(String n_entityid_eq) {
this.n_entityid_eq = n_entityid_eq;
if(!ObjectUtils.isEmpty(this.n_entityid_eq)){
this.getSearchCond().eq("entityid", n_entityid_eq);
}
} }
private String n_campaignname_eq;//[活动名称] private String n_campaignname_eq;//[活动名称]
public void setN_campaignname_eq(String n_campaignname_eq) { public void setN_campaignname_eq(String n_campaignname_eq) {
...@@ -54,6 +61,27 @@ public class CampaignListSearchContext extends QueryWrapperContext<CampaignList> ...@@ -54,6 +61,27 @@ public class CampaignListSearchContext extends QueryWrapperContext<CampaignList>
if(!ObjectUtils.isEmpty(this.n_campaignname_like)){ if(!ObjectUtils.isEmpty(this.n_campaignname_like)){
this.getSearchCond().like("entityname", n_campaignname_like); this.getSearchCond().like("entityname", n_campaignname_like);
} }
}
private String n_entityname_eq;//[活动名称]
public void setN_entityname_eq(String n_entityname_eq) {
this.n_entityname_eq = n_entityname_eq;
if(!ObjectUtils.isEmpty(this.n_entityname_eq)){
this.getSearchCond().eq("entityname", n_entityname_eq);
}
}
private String n_entityname_like;//[活动名称]
public void setN_entityname_like(String n_entityname_like) {
this.n_entityname_like = n_entityname_like;
if(!ObjectUtils.isEmpty(this.n_entityname_like)){
this.getSearchCond().like("entityname", n_entityname_like);
}
}
private String n_entity2id_eq;//[列表]
public void setN_entity2id_eq(String n_entity2id_eq) {
this.n_entity2id_eq = n_entity2id_eq;
if(!ObjectUtils.isEmpty(this.n_entity2id_eq)){
this.getSearchCond().eq("entity2id", n_entity2id_eq);
}
} }
private String n_listid_eq;//[列表] private String n_listid_eq;//[列表]
public void setN_listid_eq(String n_listid_eq) { public void setN_listid_eq(String n_listid_eq) {
...@@ -61,6 +89,20 @@ public class CampaignListSearchContext extends QueryWrapperContext<CampaignList> ...@@ -61,6 +89,20 @@ public class CampaignListSearchContext extends QueryWrapperContext<CampaignList>
if(!ObjectUtils.isEmpty(this.n_listid_eq)){ if(!ObjectUtils.isEmpty(this.n_listid_eq)){
this.getSearchCond().eq("entity2id", n_listid_eq); this.getSearchCond().eq("entity2id", n_listid_eq);
} }
}
private String n_entity2name_eq;//[名称]
public void setN_entity2name_eq(String n_entity2name_eq) {
this.n_entity2name_eq = n_entity2name_eq;
if(!ObjectUtils.isEmpty(this.n_entity2name_eq)){
this.getSearchCond().eq("entity2name", n_entity2name_eq);
}
}
private String n_entity2name_like;//[名称]
public void setN_entity2name_like(String n_entity2name_like) {
this.n_entity2name_like = n_entity2name_like;
if(!ObjectUtils.isEmpty(this.n_entity2name_like)){
this.getSearchCond().like("entity2name", n_entity2name_like);
}
} }
private String n_listname_eq;//[名称] private String n_listname_eq;//[名称]
public void setN_listname_eq(String n_listname_eq) { public void setN_listname_eq(String n_listname_eq) {
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/filter/ListAccountSearchContext.java
浏览文件 @ 9e7cfbc5
...@@ -40,47 +40,89 @@ public class ListAccountSearchContext extends QueryWrapperContext<ListAccount> { ...@@ -40,47 +40,89 @@ public class ListAccountSearchContext extends QueryWrapperContext<ListAccount> {
if(!ObjectUtils.isEmpty(this.n_relationshipstype_eq)){ if(!ObjectUtils.isEmpty(this.n_relationshipstype_eq)){
this.getSearchCond().eq("relationshipstype", n_relationshipstype_eq); this.getSearchCond().eq("relationshipstype", n_relationshipstype_eq);
} }
}
private String n_entityid_eq;//[列表]
public void setN_entityid_eq(String n_entityid_eq) {
this.n_entityid_eq = n_entityid_eq;
if(!ObjectUtils.isEmpty(this.n_entityid_eq)){
this.getSearchCond().eq("entityid", n_entityid_eq);
}
} }
private String n_listid_eq;//[列表] private String n_listid_eq;//[列表]
public void setN_listid_eq(String n_listid_eq) { public void setN_listid_eq(String n_listid_eq) {
this.n_listid_eq = n_listid_eq; this.n_listid_eq = n_listid_eq;
if(!ObjectUtils.isEmpty(this.n_listid_eq)){ if(!ObjectUtils.isEmpty(this.n_listid_eq)){
this.getSearchCond().eq("listid", n_listid_eq); this.getSearchCond().eq("entityid", n_listid_eq);
} }
} }
private String n_accountid_eq;//[客户] private String n_accountid_eq;//[客户]
public void setN_accountid_eq(String n_accountid_eq) { public void setN_accountid_eq(String n_accountid_eq) {
this.n_accountid_eq = n_accountid_eq; this.n_accountid_eq = n_accountid_eq;
if(!ObjectUtils.isEmpty(this.n_accountid_eq)){ if(!ObjectUtils.isEmpty(this.n_accountid_eq)){
this.getSearchCond().eq("accountid", n_accountid_eq); this.getSearchCond().eq("entity2id", n_accountid_eq);
}
}
private String n_entity2id_eq;//[客户]
public void setN_entity2id_eq(String n_entity2id_eq) {
this.n_entity2id_eq = n_entity2id_eq;
if(!ObjectUtils.isEmpty(this.n_entity2id_eq)){
this.getSearchCond().eq("entity2id", n_entity2id_eq);
}
}
private String n_entityname_eq;//[营销列表]
public void setN_entityname_eq(String n_entityname_eq) {
this.n_entityname_eq = n_entityname_eq;
if(!ObjectUtils.isEmpty(this.n_entityname_eq)){
this.getSearchCond().eq("entityname", n_entityname_eq);
} }
} }
private String n_listname_eq;//[名称] private String n_entityname_like;//[营销列表]
public void setN_entityname_like(String n_entityname_like) {
this.n_entityname_like = n_entityname_like;
if(!ObjectUtils.isEmpty(this.n_entityname_like)){
this.getSearchCond().like("entityname", n_entityname_like);
}
}
private String n_listname_eq;//[营销列表]
public void setN_listname_eq(String n_listname_eq) { public void setN_listname_eq(String n_listname_eq) {
this.n_listname_eq = n_listname_eq; this.n_listname_eq = n_listname_eq;
if(!ObjectUtils.isEmpty(this.n_listname_eq)){ if(!ObjectUtils.isEmpty(this.n_listname_eq)){
this.getSearchCond().eq("listname", n_listname_eq); this.getSearchCond().eq("entityname", n_listname_eq);
} }
} }
private String n_listname_like;//[名称] private String n_listname_like;//[营销列表]
public void setN_listname_like(String n_listname_like) { public void setN_listname_like(String n_listname_like) {
this.n_listname_like = n_listname_like; this.n_listname_like = n_listname_like;
if(!ObjectUtils.isEmpty(this.n_listname_like)){ if(!ObjectUtils.isEmpty(this.n_listname_like)){
this.getSearchCond().like("listname", n_listname_like); this.getSearchCond().like("entityname", n_listname_like);
} }
} }
private String n_accountname_eq;//[客户名称] private String n_accountname_eq;//[客户]
public void setN_accountname_eq(String n_accountname_eq) { public void setN_accountname_eq(String n_accountname_eq) {
this.n_accountname_eq = n_accountname_eq; this.n_accountname_eq = n_accountname_eq;
if(!ObjectUtils.isEmpty(this.n_accountname_eq)){ if(!ObjectUtils.isEmpty(this.n_accountname_eq)){
this.getSearchCond().eq("accountname", n_accountname_eq); this.getSearchCond().eq("entity2name", n_accountname_eq);
} }
} }
private String n_accountname_like;//[客户名称] private String n_accountname_like;//[客户]
public void setN_accountname_like(String n_accountname_like) { public void setN_accountname_like(String n_accountname_like) {
this.n_accountname_like = n_accountname_like; this.n_accountname_like = n_accountname_like;
if(!ObjectUtils.isEmpty(this.n_accountname_like)){ if(!ObjectUtils.isEmpty(this.n_accountname_like)){
this.getSearchCond().like("accountname", n_accountname_like); this.getSearchCond().like("entity2name", n_accountname_like);
}
}
private String n_entity2name_eq;//[客户]
public void setN_entity2name_eq(String n_entity2name_eq) {
this.n_entity2name_eq = n_entity2name_eq;
if(!ObjectUtils.isEmpty(this.n_entity2name_eq)){
this.getSearchCond().eq("entity2name", n_entity2name_eq);
}
}
private String n_entity2name_like;//[客户]
public void setN_entity2name_like(String n_entity2name_like) {
this.n_entity2name_like = n_entity2name_like;
if(!ObjectUtils.isEmpty(this.n_entity2name_like)){
this.getSearchCond().like("entity2name", n_entity2name_like);
} }
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/filter/ListContactSearchContext.java
浏览文件 @ 9e7cfbc5
...@@ -40,47 +40,89 @@ public class ListContactSearchContext extends QueryWrapperContext<ListContact> { ...@@ -40,47 +40,89 @@ public class ListContactSearchContext extends QueryWrapperContext<ListContact> {
if(!ObjectUtils.isEmpty(this.n_relationshipstype_eq)){ if(!ObjectUtils.isEmpty(this.n_relationshipstype_eq)){
this.getSearchCond().eq("relationshipstype", n_relationshipstype_eq); this.getSearchCond().eq("relationshipstype", n_relationshipstype_eq);
} }
}
private String n_entityid_eq;//[列表]
public void setN_entityid_eq(String n_entityid_eq) {
this.n_entityid_eq = n_entityid_eq;
if(!ObjectUtils.isEmpty(this.n_entityid_eq)){
this.getSearchCond().eq("entityid", n_entityid_eq);
}
} }
private String n_listid_eq;//[列表] private String n_listid_eq;//[列表]
public void setN_listid_eq(String n_listid_eq) { public void setN_listid_eq(String n_listid_eq) {
this.n_listid_eq = n_listid_eq; this.n_listid_eq = n_listid_eq;
if(!ObjectUtils.isEmpty(this.n_listid_eq)){ if(!ObjectUtils.isEmpty(this.n_listid_eq)){
this.getSearchCond().eq("listid", n_listid_eq); this.getSearchCond().eq("entityid", n_listid_eq);
}
}
private String n_entityname_eq;//[营销列表]
public void setN_entityname_eq(String n_entityname_eq) {
this.n_entityname_eq = n_entityname_eq;
if(!ObjectUtils.isEmpty(this.n_entityname_eq)){
this.getSearchCond().eq("entityname", n_entityname_eq);
}
}
private String n_entityname_like;//[营销列表]
public void setN_entityname_like(String n_entityname_like) {
this.n_entityname_like = n_entityname_like;
if(!ObjectUtils.isEmpty(this.n_entityname_like)){
this.getSearchCond().like("entityname", n_entityname_like);
} }
} }
private String n_listname_eq;//[名称] private String n_listname_eq;//[营销列表]
public void setN_listname_eq(String n_listname_eq) { public void setN_listname_eq(String n_listname_eq) {
this.n_listname_eq = n_listname_eq; this.n_listname_eq = n_listname_eq;
if(!ObjectUtils.isEmpty(this.n_listname_eq)){ if(!ObjectUtils.isEmpty(this.n_listname_eq)){
this.getSearchCond().eq("listname", n_listname_eq); this.getSearchCond().eq("entityname", n_listname_eq);
} }
} }
private String n_listname_like;//[名称] private String n_listname_like;//[营销列表]
public void setN_listname_like(String n_listname_like) { public void setN_listname_like(String n_listname_like) {
this.n_listname_like = n_listname_like; this.n_listname_like = n_listname_like;
if(!ObjectUtils.isEmpty(this.n_listname_like)){ if(!ObjectUtils.isEmpty(this.n_listname_like)){
this.getSearchCond().like("listname", n_listname_like); this.getSearchCond().like("entityname", n_listname_like);
} }
} }
private String n_contactid_eq;//[联系人] private String n_contactid_eq;//[联系人]
public void setN_contactid_eq(String n_contactid_eq) { public void setN_contactid_eq(String n_contactid_eq) {
this.n_contactid_eq = n_contactid_eq; this.n_contactid_eq = n_contactid_eq;
if(!ObjectUtils.isEmpty(this.n_contactid_eq)){ if(!ObjectUtils.isEmpty(this.n_contactid_eq)){
this.getSearchCond().eq("contactid", n_contactid_eq); this.getSearchCond().eq("entity2id", n_contactid_eq);
}
}
private String n_entity2id_eq;//[联系人]
public void setN_entity2id_eq(String n_entity2id_eq) {
this.n_entity2id_eq = n_entity2id_eq;
if(!ObjectUtils.isEmpty(this.n_entity2id_eq)){
this.getSearchCond().eq("entity2id", n_entity2id_eq);
}
}
private String n_entity2name_eq;//[联系人]
public void setN_entity2name_eq(String n_entity2name_eq) {
this.n_entity2name_eq = n_entity2name_eq;
if(!ObjectUtils.isEmpty(this.n_entity2name_eq)){
this.getSearchCond().eq("entity2name", n_entity2name_eq);
}
}
private String n_entity2name_like;//[联系人]
public void setN_entity2name_like(String n_entity2name_like) {
this.n_entity2name_like = n_entity2name_like;
if(!ObjectUtils.isEmpty(this.n_entity2name_like)){
this.getSearchCond().like("entity2name", n_entity2name_like);
} }
} }
private String n_fullname_eq;//[全名] private String n_fullname_eq;//[联系人]
public void setN_fullname_eq(String n_fullname_eq) { public void setN_fullname_eq(String n_fullname_eq) {
this.n_fullname_eq = n_fullname_eq; this.n_fullname_eq = n_fullname_eq;
if(!ObjectUtils.isEmpty(this.n_fullname_eq)){ if(!ObjectUtils.isEmpty(this.n_fullname_eq)){
this.getSearchCond().eq("fullname", n_fullname_eq); this.getSearchCond().eq("entity2name", n_fullname_eq);
} }
} }
private String n_fullname_like;//[全名] private String n_fullname_like;//[联系人]
public void setN_fullname_like(String n_fullname_like) { public void setN_fullname_like(String n_fullname_like) {
this.n_fullname_like = n_fullname_like; this.n_fullname_like = n_fullname_like;
if(!ObjectUtils.isEmpty(this.n_fullname_like)){ if(!ObjectUtils.isEmpty(this.n_fullname_like)){
this.getSearchCond().like("fullname", n_fullname_like); this.getSearchCond().like("entity2name", n_fullname_like);
} }
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/filter/ListLeadSearchContext.java
浏览文件 @ 9e7cfbc5
...@@ -40,47 +40,89 @@ public class ListLeadSearchContext extends QueryWrapperContext<ListLead> { ...@@ -40,47 +40,89 @@ public class ListLeadSearchContext extends QueryWrapperContext<ListLead> {
if(!ObjectUtils.isEmpty(this.n_relationshipstype_eq)){ if(!ObjectUtils.isEmpty(this.n_relationshipstype_eq)){
this.getSearchCond().eq("relationshipstype", n_relationshipstype_eq); this.getSearchCond().eq("relationshipstype", n_relationshipstype_eq);
} }
}
private String n_entityid_eq;//[列表]
public void setN_entityid_eq(String n_entityid_eq) {
this.n_entityid_eq = n_entityid_eq;
if(!ObjectUtils.isEmpty(this.n_entityid_eq)){
this.getSearchCond().eq("entityid", n_entityid_eq);
}
} }
private String n_listid_eq;//[列表] private String n_listid_eq;//[列表]
public void setN_listid_eq(String n_listid_eq) { public void setN_listid_eq(String n_listid_eq) {
this.n_listid_eq = n_listid_eq; this.n_listid_eq = n_listid_eq;
if(!ObjectUtils.isEmpty(this.n_listid_eq)){ if(!ObjectUtils.isEmpty(this.n_listid_eq)){
this.getSearchCond().eq("listid", n_listid_eq); this.getSearchCond().eq("entityid", n_listid_eq);
}
}
private String n_entityname_eq;//[营销列表]
public void setN_entityname_eq(String n_entityname_eq) {
this.n_entityname_eq = n_entityname_eq;
if(!ObjectUtils.isEmpty(this.n_entityname_eq)){
this.getSearchCond().eq("entityname", n_entityname_eq);
}
}
private String n_entityname_like;//[营销列表]
public void setN_entityname_like(String n_entityname_like) {
this.n_entityname_like = n_entityname_like;
if(!ObjectUtils.isEmpty(this.n_entityname_like)){
this.getSearchCond().like("entityname", n_entityname_like);
} }
} }
private String n_listname_eq;//[名称] private String n_listname_eq;//[营销列表]
public void setN_listname_eq(String n_listname_eq) { public void setN_listname_eq(String n_listname_eq) {
this.n_listname_eq = n_listname_eq; this.n_listname_eq = n_listname_eq;
if(!ObjectUtils.isEmpty(this.n_listname_eq)){ if(!ObjectUtils.isEmpty(this.n_listname_eq)){
this.getSearchCond().eq("listname", n_listname_eq); this.getSearchCond().eq("entityname", n_listname_eq);
} }
} }
private String n_listname_like;//[名称] private String n_listname_like;//[营销列表]
public void setN_listname_like(String n_listname_like) { public void setN_listname_like(String n_listname_like) {
this.n_listname_like = n_listname_like; this.n_listname_like = n_listname_like;
if(!ObjectUtils.isEmpty(this.n_listname_like)){ if(!ObjectUtils.isEmpty(this.n_listname_like)){
this.getSearchCond().like("listname", n_listname_like); this.getSearchCond().like("entityname", n_listname_like);
}
}
private String n_entity2id_eq;//[潜在顾客]
public void setN_entity2id_eq(String n_entity2id_eq) {
this.n_entity2id_eq = n_entity2id_eq;
if(!ObjectUtils.isEmpty(this.n_entity2id_eq)){
this.getSearchCond().eq("entity2id", n_entity2id_eq);
} }
} }
private String n_leadid_eq;//[潜在顾客] private String n_leadid_eq;//[潜在顾客]
public void setN_leadid_eq(String n_leadid_eq) { public void setN_leadid_eq(String n_leadid_eq) {
this.n_leadid_eq = n_leadid_eq; this.n_leadid_eq = n_leadid_eq;
if(!ObjectUtils.isEmpty(this.n_leadid_eq)){ if(!ObjectUtils.isEmpty(this.n_leadid_eq)){
this.getSearchCond().eq("leadid", n_leadid_eq); this.getSearchCond().eq("entity2id", n_leadid_eq);
}
}
private String n_entity2name_eq;//[潜在顾客]
public void setN_entity2name_eq(String n_entity2name_eq) {
this.n_entity2name_eq = n_entity2name_eq;
if(!ObjectUtils.isEmpty(this.n_entity2name_eq)){
this.getSearchCond().eq("entity2name", n_entity2name_eq);
}
}
private String n_entity2name_like;//[潜在顾客]
public void setN_entity2name_like(String n_entity2name_like) {
this.n_entity2name_like = n_entity2name_like;
if(!ObjectUtils.isEmpty(this.n_entity2name_like)){
this.getSearchCond().like("entity2name", n_entity2name_like);
} }
} }
private String n_fullname_eq;//[姓名] private String n_fullname_eq;//[潜在顾客]
public void setN_fullname_eq(String n_fullname_eq) { public void setN_fullname_eq(String n_fullname_eq) {
this.n_fullname_eq = n_fullname_eq; this.n_fullname_eq = n_fullname_eq;
if(!ObjectUtils.isEmpty(this.n_fullname_eq)){ if(!ObjectUtils.isEmpty(this.n_fullname_eq)){
this.getSearchCond().eq("fullname", n_fullname_eq); this.getSearchCond().eq("entity2name", n_fullname_eq);
} }
} }
private String n_fullname_like;//[姓名] private String n_fullname_like;//[潜在顾客]
public void setN_fullname_like(String n_fullname_like) { public void setN_fullname_like(String n_fullname_like) {
this.n_fullname_like = n_fullname_like; this.n_fullname_like = n_fullname_like;
if(!ObjectUtils.isEmpty(this.n_fullname_like)){ if(!ObjectUtils.isEmpty(this.n_fullname_like)){
this.getSearchCond().like("fullname", n_fullname_like); this.getSearchCond().like("entity2name", n_fullname_like);
} }
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/mapper/CampaignCampaignMapper.java
浏览文件 @ 9e7cfbc5
...@@ -62,8 +62,8 @@ public interface CampaignCampaignMapper extends BaseMapper<CampaignCampaign>{ ...@@ -62,8 +62,8 @@ public interface CampaignCampaignMapper extends BaseMapper<CampaignCampaign>{
@Delete("${sql}") @Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param); boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<CampaignCampaign> selectByCampaign2id(@Param("campaignid") Serializable campaignid) ; List<CampaignCampaign> selectByEntity2id(@Param("campaignid") Serializable campaignid) ;
List<CampaignCampaign> selectByCampaignid(@Param("campaignid") Serializable campaignid) ; List<CampaignCampaign> selectByEntityid(@Param("campaignid") Serializable campaignid) ;
} }
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/mapper/ListAccountMapper.java
浏览文件 @ 9e7cfbc5
...@@ -62,8 +62,8 @@ public interface ListAccountMapper extends BaseMapper<ListAccount>{ ...@@ -62,8 +62,8 @@ public interface ListAccountMapper extends BaseMapper<ListAccount>{
@Delete("${sql}") @Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param); boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<ListAccount> selectByAccountid(@Param("accountid") Serializable accountid) ; List<ListAccount> selectByEntity2id(@Param("accountid") Serializable accountid) ;
List<ListAccount> selectByListid(@Param("listid") Serializable listid) ; List<ListAccount> selectByEntityid(@Param("listid") Serializable listid) ;
} }
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/mapper/ListContactMapper.java
浏览文件 @ 9e7cfbc5
...@@ -62,8 +62,8 @@ public interface ListContactMapper extends BaseMapper<ListContact>{ ...@@ -62,8 +62,8 @@ public interface ListContactMapper extends BaseMapper<ListContact>{
@Delete("${sql}") @Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param); boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<ListContact> selectByContactid(@Param("contactid") Serializable contactid) ; List<ListContact> selectByEntity2id(@Param("contactid") Serializable contactid) ;
List<ListContact> selectByListid(@Param("listid") Serializable listid) ; List<ListContact> selectByEntityid(@Param("listid") Serializable listid) ;
} }
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/mapper/ListLeadMapper.java
浏览文件 @ 9e7cfbc5
...@@ -62,8 +62,8 @@ public interface ListLeadMapper extends BaseMapper<ListLead>{ ...@@ -62,8 +62,8 @@ public interface ListLeadMapper extends BaseMapper<ListLead>{
@Delete("${sql}") @Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param); boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<ListLead> selectByLeadid(@Param("leadid") Serializable leadid) ; List<ListLead> selectByEntity2id(@Param("leadid") Serializable leadid) ;
List<ListLead> selectByListid(@Param("listid") Serializable listid) ; List<ListLead> selectByEntityid(@Param("listid") Serializable listid) ;
} }
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/ICampaignCampaignService.java
浏览文件 @ 9e7cfbc5
...@@ -37,10 +37,10 @@ public interface ICampaignCampaignService extends IService<CampaignCampaign>{ ...@@ -37,10 +37,10 @@ public interface ICampaignCampaignService extends IService<CampaignCampaign>{
boolean remove(String key) ; boolean remove(String key) ;
void removeBatch(Collection<String> idList) ; void removeBatch(Collection<String> idList) ;
Page<CampaignCampaign> searchDefault(CampaignCampaignSearchContext context) ; Page<CampaignCampaign> searchDefault(CampaignCampaignSearchContext context) ;
List<CampaignCampaign> selectByCampaign2id(String campaignid) ; List<CampaignCampaign> selectByEntity2id(String campaignid) ;
void removeByCampaign2id(String campaignid) ; void removeByEntity2id(String campaignid) ;
List<CampaignCampaign> selectByCampaignid(String campaignid) ; List<CampaignCampaign> selectByEntityid(String campaignid) ;
void removeByCampaignid(String campaignid) ; void removeByEntityid(String campaignid) ;
/** /**
*自定义查询SQL *自定义查询SQL
* @param sql select * from table where id =#{et.param} * @param sql select * from table where id =#{et.param}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/IListAccountService.java
浏览文件 @ 9e7cfbc5
...@@ -37,10 +37,10 @@ public interface IListAccountService extends IService<ListAccount>{ ...@@ -37,10 +37,10 @@ public interface IListAccountService extends IService<ListAccount>{
boolean create(ListAccount et) ; boolean create(ListAccount et) ;
void createBatch(List<ListAccount> list) ; void createBatch(List<ListAccount> list) ;
Page<ListAccount> searchDefault(ListAccountSearchContext context) ; Page<ListAccount> searchDefault(ListAccountSearchContext context) ;
List<ListAccount> selectByAccountid(String accountid) ; List<ListAccount> selectByEntity2id(String accountid) ;
void removeByAccountid(String accountid) ; void removeByEntity2id(String accountid) ;
List<ListAccount> selectByListid(String listid) ; List<ListAccount> selectByEntityid(String listid) ;
void removeByListid(String listid) ; void removeByEntityid(String listid) ;
/** /**
*自定义查询SQL *自定义查询SQL
* @param sql select * from table where id =#{et.param} * @param sql select * from table where id =#{et.param}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/IListContactService.java
浏览文件 @ 9e7cfbc5
...@@ -37,10 +37,10 @@ public interface IListContactService extends IService<ListContact>{ ...@@ -37,10 +37,10 @@ public interface IListContactService extends IService<ListContact>{
boolean create(ListContact et) ; boolean create(ListContact et) ;
void createBatch(List<ListContact> list) ; void createBatch(List<ListContact> list) ;
Page<ListContact> searchDefault(ListContactSearchContext context) ; Page<ListContact> searchDefault(ListContactSearchContext context) ;
List<ListContact> selectByContactid(String contactid) ; List<ListContact> selectByEntity2id(String contactid) ;
void removeByContactid(String contactid) ; void removeByEntity2id(String contactid) ;
List<ListContact> selectByListid(String listid) ; List<ListContact> selectByEntityid(String listid) ;
void removeByListid(String listid) ; void removeByEntityid(String listid) ;
/** /**
*自定义查询SQL *自定义查询SQL
* @param sql select * from table where id =#{et.param} * @param sql select * from table where id =#{et.param}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/IListLeadService.java
浏览文件 @ 9e7cfbc5
...@@ -37,10 +37,10 @@ public interface IListLeadService extends IService<ListLead>{ ...@@ -37,10 +37,10 @@ public interface IListLeadService extends IService<ListLead>{
ListLead get(String key) ; ListLead get(String key) ;
ListLead getDraft(ListLead et) ; ListLead getDraft(ListLead et) ;
Page<ListLead> searchDefault(ListLeadSearchContext context) ; Page<ListLead> searchDefault(ListLeadSearchContext context) ;
List<ListLead> selectByLeadid(String leadid) ; List<ListLead> selectByEntity2id(String leadid) ;
void removeByLeadid(String leadid) ; void removeByEntity2id(String leadid) ;
List<ListLead> selectByListid(String listid) ; List<ListLead> selectByEntityid(String listid) ;
void removeByListid(String listid) ; void removeByEntityid(String listid) ;
/** /**
*自定义查询SQL *自定义查询SQL
* @param sql select * from table where id =#{et.param} * @param sql select * from table where id =#{et.param}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/impl/CampaignCampaignServiceImpl.java
浏览文件 @ 9e7cfbc5
...@@ -152,23 +152,23 @@ public class CampaignCampaignServiceImpl extends ServiceImpl<CampaignCampaignMap ...@@ -152,23 +152,23 @@ public class CampaignCampaignServiceImpl extends ServiceImpl<CampaignCampaignMap
@Override @Override
public List<CampaignCampaign> selectByCampaign2id(String campaignid) { public List<CampaignCampaign> selectByEntity2id(String campaignid) {
return baseMapper.selectByCampaign2id(campaignid); return baseMapper.selectByEntity2id(campaignid);
} }
@Override @Override
public void removeByCampaign2id(String campaignid) { public void removeByEntity2id(String campaignid) {
this.remove(new QueryWrapper<CampaignCampaign>().eq("campaign2id",campaignid)); this.remove(new QueryWrapper<CampaignCampaign>().eq("entity2id",campaignid));
} }
@Override @Override
public List<CampaignCampaign> selectByCampaignid(String campaignid) { public List<CampaignCampaign> selectByEntityid(String campaignid) {
return baseMapper.selectByCampaignid(campaignid); return baseMapper.selectByEntityid(campaignid);
} }
@Override @Override
public void removeByCampaignid(String campaignid) { public void removeByEntityid(String campaignid) {
this.remove(new QueryWrapper<CampaignCampaign>().eq("campaignid",campaignid)); this.remove(new QueryWrapper<CampaignCampaign>().eq("entityid",campaignid));
} }
...@@ -189,24 +189,24 @@ public class CampaignCampaignServiceImpl extends ServiceImpl<CampaignCampaignMap ...@@ -189,24 +189,24 @@ public class CampaignCampaignServiceImpl extends ServiceImpl<CampaignCampaignMap
*/ */
private void fillParentData(CampaignCampaign et){ private void fillParentData(CampaignCampaign et){
//实体关系[DER1N_CAMPAIGNCAMPAIGN_CAMPAIGN_CAMPAIGN2ID] //实体关系[DER1N_CAMPAIGNCAMPAIGN_CAMPAIGN_CAMPAIGN2ID]
if(!ObjectUtils.isEmpty(et.getCampaign2id())){ if(!ObjectUtils.isEmpty(et.getEntity2id())){
cn.ibizlab.businesscentral.core.marketing.domain.Campaign campaign2=et.getCampaign2(); cn.ibizlab.businesscentral.core.marketing.domain.Campaign campaign2=et.getCampaign2();
if(ObjectUtils.isEmpty(campaign2)){ if(ObjectUtils.isEmpty(campaign2)){
cn.ibizlab.businesscentral.core.marketing.domain.Campaign majorEntity=campaignService.get(et.getCampaign2id()); cn.ibizlab.businesscentral.core.marketing.domain.Campaign majorEntity=campaignService.get(et.getEntity2id());
et.setCampaign2(majorEntity); et.setCampaign2(majorEntity);
campaign2=majorEntity; campaign2=majorEntity;
} }
et.setCampaign2name(campaign2.getCampaignname()); et.setEntity2name(campaign2.getCampaignname());
} }
//实体关系[DER1N_CAMPAIGNCAMPAIGN_CAMPAIGN_CAMPAIGNID] //实体关系[DER1N_CAMPAIGNCAMPAIGN_CAMPAIGN_CAMPAIGNID]
if(!ObjectUtils.isEmpty(et.getCampaignid())){ if(!ObjectUtils.isEmpty(et.getEntityid())){
cn.ibizlab.businesscentral.core.marketing.domain.Campaign campaign=et.getCampaign(); cn.ibizlab.businesscentral.core.marketing.domain.Campaign campaign=et.getCampaign();
if(ObjectUtils.isEmpty(campaign)){ if(ObjectUtils.isEmpty(campaign)){
cn.ibizlab.businesscentral.core.marketing.domain.Campaign majorEntity=campaignService.get(et.getCampaignid()); cn.ibizlab.businesscentral.core.marketing.domain.Campaign majorEntity=campaignService.get(et.getEntityid());
et.setCampaign(majorEntity); et.setCampaign(majorEntity);
campaign=majorEntity; campaign=majorEntity;
} }
et.setCampaignname(campaign.getCampaignname()); et.setEntityname(campaign.getCampaignname());
} }
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/impl/ListAccountServiceImpl.java
浏览文件 @ 9e7cfbc5
...@@ -155,23 +155,23 @@ public class ListAccountServiceImpl extends ServiceImpl<ListAccountMapper, ListA ...@@ -155,23 +155,23 @@ public class ListAccountServiceImpl extends ServiceImpl<ListAccountMapper, ListA
@Override @Override
public List<ListAccount> selectByAccountid(String accountid) { public List<ListAccount> selectByEntity2id(String accountid) {
return baseMapper.selectByAccountid(accountid); return baseMapper.selectByEntity2id(accountid);
} }
@Override @Override
public void removeByAccountid(String accountid) { public void removeByEntity2id(String accountid) {
this.remove(new QueryWrapper<ListAccount>().eq("accountid",accountid)); this.remove(new QueryWrapper<ListAccount>().eq("entity2id",accountid));
} }
@Override @Override
public List<ListAccount> selectByListid(String listid) { public List<ListAccount> selectByEntityid(String listid) {
return baseMapper.selectByListid(listid); return baseMapper.selectByEntityid(listid);
} }
@Override @Override
public void removeByListid(String listid) { public void removeByEntityid(String listid) {
this.remove(new QueryWrapper<ListAccount>().eq("listid",listid)); this.remove(new QueryWrapper<ListAccount>().eq("entityid",listid));
} }
...@@ -192,24 +192,24 @@ public class ListAccountServiceImpl extends ServiceImpl<ListAccountMapper, ListA ...@@ -192,24 +192,24 @@ public class ListAccountServiceImpl extends ServiceImpl<ListAccountMapper, ListA
*/ */
private void fillParentData(ListAccount et){ private void fillParentData(ListAccount et){
//实体关系[DER1N_LISTACCOUNT_ACCOUNT_ACCOUNTID] //实体关系[DER1N_LISTACCOUNT_ACCOUNT_ACCOUNTID]
if(!ObjectUtils.isEmpty(et.getAccountid())){ if(!ObjectUtils.isEmpty(et.getEntity2id())){
cn.ibizlab.businesscentral.core.base.domain.Account account=et.getAccount(); cn.ibizlab.businesscentral.core.base.domain.Account account=et.getAccount();
if(ObjectUtils.isEmpty(account)){ if(ObjectUtils.isEmpty(account)){
cn.ibizlab.businesscentral.core.base.domain.Account majorEntity=accountService.get(et.getAccountid()); cn.ibizlab.businesscentral.core.base.domain.Account majorEntity=accountService.get(et.getEntity2id());
et.setAccount(majorEntity); et.setAccount(majorEntity);
account=majorEntity; account=majorEntity;
} }
et.setAccountname(account.getAccountname()); et.setEntity2name(account.getAccountname());
} }
//实体关系[DER1N_LISTACCOUNT_LIST_LISTID] //实体关系[DER1N_LISTACCOUNT_LIST_LISTID]
if(!ObjectUtils.isEmpty(et.getListid())){ if(!ObjectUtils.isEmpty(et.getEntityid())){
cn.ibizlab.businesscentral.core.marketing.domain.IBizList list=et.getList(); cn.ibizlab.businesscentral.core.marketing.domain.IBizList list=et.getList();
if(ObjectUtils.isEmpty(list)){ if(ObjectUtils.isEmpty(list)){
cn.ibizlab.businesscentral.core.marketing.domain.IBizList majorEntity=ibizlistService.get(et.getListid()); cn.ibizlab.businesscentral.core.marketing.domain.IBizList majorEntity=ibizlistService.get(et.getEntityid());
et.setList(majorEntity); et.setList(majorEntity);
list=majorEntity; list=majorEntity;
} }
et.setListname(list.getListname()); et.setEntityname(list.getListname());
} }
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/impl/ListContactServiceImpl.java
浏览文件 @ 9e7cfbc5
...@@ -155,23 +155,23 @@ public class ListContactServiceImpl extends ServiceImpl<ListContactMapper, ListC ...@@ -155,23 +155,23 @@ public class ListContactServiceImpl extends ServiceImpl<ListContactMapper, ListC
@Override @Override
public List<ListContact> selectByContactid(String contactid) { public List<ListContact> selectByEntity2id(String contactid) {
return baseMapper.selectByContactid(contactid); return baseMapper.selectByEntity2id(contactid);
} }
@Override @Override
public void removeByContactid(String contactid) { public void removeByEntity2id(String contactid) {
this.remove(new QueryWrapper<ListContact>().eq("contactid",contactid)); this.remove(new QueryWrapper<ListContact>().eq("entity2id",contactid));
} }
@Override @Override
public List<ListContact> selectByListid(String listid) { public List<ListContact> selectByEntityid(String listid) {
return baseMapper.selectByListid(listid); return baseMapper.selectByEntityid(listid);
} }
@Override @Override
public void removeByListid(String listid) { public void removeByEntityid(String listid) {
this.remove(new QueryWrapper<ListContact>().eq("listid",listid)); this.remove(new QueryWrapper<ListContact>().eq("entityid",listid));
} }
...@@ -192,24 +192,24 @@ public class ListContactServiceImpl extends ServiceImpl<ListContactMapper, ListC ...@@ -192,24 +192,24 @@ public class ListContactServiceImpl extends ServiceImpl<ListContactMapper, ListC
*/ */
private void fillParentData(ListContact et){ private void fillParentData(ListContact et){
//实体关系[DER1N_LISTCONTACT_CONTACT_CONTACTID] //实体关系[DER1N_LISTCONTACT_CONTACT_CONTACTID]
if(!ObjectUtils.isEmpty(et.getContactid())){ if(!ObjectUtils.isEmpty(et.getEntity2id())){
cn.ibizlab.businesscentral.core.base.domain.Contact contact=et.getContact(); cn.ibizlab.businesscentral.core.base.domain.Contact contact=et.getContact();
if(ObjectUtils.isEmpty(contact)){ if(ObjectUtils.isEmpty(contact)){
cn.ibizlab.businesscentral.core.base.domain.Contact majorEntity=contactService.get(et.getContactid()); cn.ibizlab.businesscentral.core.base.domain.Contact majorEntity=contactService.get(et.getEntity2id());
et.setContact(majorEntity); et.setContact(majorEntity);
contact=majorEntity; contact=majorEntity;
} }
et.setFullname(contact.getFullname()); et.setEntity2name(contact.getFullname());
} }
//实体关系[DER1N_LISTCONTACT_LIST_LISTID] //实体关系[DER1N_LISTCONTACT_LIST_LISTID]
if(!ObjectUtils.isEmpty(et.getListid())){ if(!ObjectUtils.isEmpty(et.getEntityid())){
cn.ibizlab.businesscentral.core.marketing.domain.IBizList list=et.getList(); cn.ibizlab.businesscentral.core.marketing.domain.IBizList list=et.getList();
if(ObjectUtils.isEmpty(list)){ if(ObjectUtils.isEmpty(list)){
cn.ibizlab.businesscentral.core.marketing.domain.IBizList majorEntity=ibizlistService.get(et.getListid()); cn.ibizlab.businesscentral.core.marketing.domain.IBizList majorEntity=ibizlistService.get(et.getEntityid());
et.setList(majorEntity); et.setList(majorEntity);
list=majorEntity; list=majorEntity;
} }
et.setListname(list.getListname()); et.setEntityname(list.getListname());
} }
} }
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/marketing/service/impl/ListLeadServiceImpl.java
浏览文件 @ 9e7cfbc5
...@@ -155,23 +155,23 @@ public class ListLeadServiceImpl extends ServiceImpl<ListLeadMapper, ListLead> i ...@@ -155,23 +155,23 @@ public class ListLeadServiceImpl extends ServiceImpl<ListLeadMapper, ListLead> i
@Override @Override
public List<ListLead> selectByLeadid(String leadid) { public List<ListLead> selectByEntity2id(String leadid) {
return baseMapper.selectByLeadid(leadid); return baseMapper.selectByEntity2id(leadid);
} }
@Override @Override
public void removeByLeadid(String leadid) { public void removeByEntity2id(String leadid) {
this.remove(new QueryWrapper<ListLead>().eq("leadid",leadid)); this.remove(new QueryWrapper<ListLead>().eq("entity2id",leadid));
} }
@Override @Override
public List<ListLead> selectByListid(String listid) { public List<ListLead> selectByEntityid(String listid) {
return baseMapper.selectByListid(listid); return baseMapper.selectByEntityid(listid);
} }
@Override @Override
public void removeByListid(String listid) { public void removeByEntityid(String listid) {
this.remove(new QueryWrapper<ListLead>().eq("listid",listid)); this.remove(new QueryWrapper<ListLead>().eq("entityid",listid));
} }
...@@ -192,24 +192,24 @@ public class ListLeadServiceImpl extends ServiceImpl<ListLeadMapper, ListLead> i ...@@ -192,24 +192,24 @@ public class ListLeadServiceImpl extends ServiceImpl<ListLeadMapper, ListLead> i
*/ */
private void fillParentData(ListLead et){ private void fillParentData(ListLead et){
//实体关系[DER1N_LISTLEAD_LEAD_LEADID] //实体关系[DER1N_LISTLEAD_LEAD_LEADID]
if(!ObjectUtils.isEmpty(et.getLeadid())){ if(!ObjectUtils.isEmpty(et.getEntity2id())){
cn.ibizlab.businesscentral.core.sales.domain.Lead lead=et.getLead(); cn.ibizlab.businesscentral.core.sales.domain.Lead lead=et.getLead();
if(ObjectUtils.isEmpty(lead)){ if(ObjectUtils.isEmpty(lead)){
cn.ibizlab.businesscentral.core.sales.domain.Lead majorEntity=leadService.get(et.getLeadid()); cn.ibizlab.businesscentral.core.sales.domain.Lead majorEntity=leadService.get(et.getEntity2id());
et.setLead(majorEntity); et.setLead(majorEntity);
lead=majorEntity; lead=majorEntity;
} }
et.setFullname(lead.getFullname()); et.setEntity2name(lead.getFullname());
} }
//实体关系[DER1N_LISTLEAD_LIST_LISTID] //实体关系[DER1N_LISTLEAD_LIST_LISTID]
if(!ObjectUtils.isEmpty(et.getListid())){ if(!ObjectUtils.isEmpty(et.getEntityid())){
cn.ibizlab.businesscentral.core.marketing.domain.IBizList list=et.getList(); cn.ibizlab.businesscentral.core.marketing.domain.IBizList list=et.getList();
if(ObjectUtils.isEmpty(list)){ if(ObjectUtils.isEmpty(list)){
cn.ibizlab.businesscentral.core.marketing.domain.IBizList majorEntity=ibizlistService.get(et.getListid()); cn.ibizlab.businesscentral.core.marketing.domain.IBizList majorEntity=ibizlistService.get(et.getEntityid());
et.setList(majorEntity); et.setList(majorEntity);
list=majorEntity; list=majorEntity;
} }
et.setListname(list.getListname()); et.setEntityname(list.getListname());
} }
} }
......
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 9e7cfbc5
...@@ -2818,7 +2818,7 @@ ...@@ -2818,7 +2818,7 @@
<!--输出实体[CAMPAIGNCAMPAIGN]数据结构 --> <!--输出实体[CAMPAIGNCAMPAIGN]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-campaigncampaign-23-38"> <changeSet author="a_LAB01_e85d8801c" id="tab-campaigncampaign-24-38">
<createTable tableName="RELATIONSHIPS"> <createTable tableName="RELATIONSHIPS">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)"> <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
...@@ -2830,13 +2830,13 @@ ...@@ -2830,13 +2830,13 @@
</column> </column>
<column name="RELATIONSHIPSTYPE" remarks="" type="VARCHAR(60)"> <column name="RELATIONSHIPSTYPE" remarks="" type="VARCHAR(60)">
</column> </column>
<column name="CAMPAIGNID" remarks="" type="VARCHAR(60)"> <column name="ENTITYID" remarks="" type="VARCHAR(60)">
</column> </column>
<column name="CAMPAIGNNAME" remarks="" type="VARCHAR(128)"> <column name="ENTITYNAME" remarks="" type="VARCHAR(128)">
</column> </column>
<column name="CAMPAIGN2ID" remarks="" type="VARCHAR(60)"> <column name="ENTITY2ID" remarks="" type="VARCHAR(60)">
</column> </column>
<column name="CAMPAIGN2NAME" remarks="" type="VARCHAR(128)"> <column name="ENTITY2NAME" remarks="" type="VARCHAR(128)">
</column> </column>
<column name="RELATIONSHIPSID" remarks="" type="VARCHAR(60)"> <column name="RELATIONSHIPSID" remarks="" type="VARCHAR(60)">
<constraints primaryKey="true" primaryKeyName="PK_CAMPAIGNCAMPAIGN_RELATIONSH"/> <constraints primaryKey="true" primaryKeyName="PK_CAMPAIGNCAMPAIGN_RELATIONSH"/>
......
businesscentral-core/src/main/resources/mapper/marketing/campaigncampaign/CampaignCampaignMapper.xml
浏览文件 @ 9e7cfbc5
...@@ -11,29 +11,29 @@ ...@@ -11,29 +11,29 @@
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="CampaignCampaignResultMap" type="cn.ibizlab.businesscentral.core.marketing.domain.CampaignCampaign" autoMapping="true"> <resultMap id="CampaignCampaignResultMap" type="cn.ibizlab.businesscentral.core.marketing.domain.CampaignCampaign" autoMapping="true">
<id property="relationshipsid" column="relationshipsid" /><!--主键字段映射--> <id property="relationshipsid" column="relationshipsid" /><!--主键字段映射-->
<result property="campaignid" column="campaignid" /> <result property="entityid" column="entityid" />
<result property="campaign2id" column="campaign2id" /> <result property="entity2id" column="entity2id" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="campaign2" javaType="cn.ibizlab.businesscentral.core.marketing.domain.Campaign" column="campaign2id" select="cn.ibizlab.businesscentral.core.marketing.mapper.CampaignMapper.selectById" fetchType="lazy"></association> <association property="campaign2" javaType="cn.ibizlab.businesscentral.core.marketing.domain.Campaign" column="entity2id" select="cn.ibizlab.businesscentral.core.marketing.mapper.CampaignMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="campaign" javaType="cn.ibizlab.businesscentral.core.marketing.domain.Campaign" column="campaignid" select="cn.ibizlab.businesscentral.core.marketing.mapper.CampaignMapper.selectById" fetchType="lazy"></association> <association property="campaign" javaType="cn.ibizlab.businesscentral.core.marketing.domain.Campaign" column="entityid" select="cn.ibizlab.businesscentral.core.marketing.mapper.CampaignMapper.selectById" fetchType="lazy"></association>
</resultMap> </resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CAMPAIGNCAMPAIGN_CAMPAIGN_CAMPAIGN2ID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CAMPAIGNCAMPAIGN_CAMPAIGN_CAMPAIGN2ID] -->
<select id="selectByCampaign2id" resultMap="CampaignCampaignResultMap"> <select id="selectByEntity2id" resultMap="CampaignCampaignResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where campaign2id=#{campaignid} where entity2id=#{campaignid}
</select> </select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CAMPAIGNCAMPAIGN_CAMPAIGN_CAMPAIGNID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CAMPAIGNCAMPAIGN_CAMPAIGN_CAMPAIGNID] -->
<select id="selectByCampaignid" resultMap="CampaignCampaignResultMap"> <select id="selectByEntityid" resultMap="CampaignCampaignResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where campaignid=#{campaignid} where entityid=#{campaignid}
</select> </select>
<!--数据集合[Default]--> <!--数据集合[Default]-->
......
businesscentral-core/src/main/resources/mapper/marketing/listaccount/ListAccountMapper.xml
浏览文件 @ 9e7cfbc5
...@@ -5,35 +5,35 @@ ...@@ -5,35 +5,35 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="ListAccountResultMap" databaseId="mysql"> <select id="selectById" resultMap="ListAccountResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ENTITY2ID` AS `ACCOUNTID`, t1.`ENTITY2NAME` AS `ACCOUNTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 ) t1 where relationshipsid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 ) t1 where relationshipsid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="ListAccountResultMap" type="cn.ibizlab.businesscentral.core.marketing.domain.ListAccount" autoMapping="true"> <resultMap id="ListAccountResultMap" type="cn.ibizlab.businesscentral.core.marketing.domain.ListAccount" autoMapping="true">
<id property="relationshipsid" column="relationshipsid" /><!--主键字段映射--> <id property="relationshipsid" column="relationshipsid" /><!--主键字段映射-->
<result property="listid" column="listid" /> <result property="entityid" column="entityid" />
<result property="accountid" column="accountid" /> <result property="entity2id" column="entity2id" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="account" javaType="cn.ibizlab.businesscentral.core.base.domain.Account" column="accountid" select="cn.ibizlab.businesscentral.core.base.mapper.AccountMapper.selectById" fetchType="lazy"></association> <association property="account" javaType="cn.ibizlab.businesscentral.core.base.domain.Account" column="entity2id" select="cn.ibizlab.businesscentral.core.base.mapper.AccountMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="list" javaType="cn.ibizlab.businesscentral.core.marketing.domain.IBizList" column="listid" select="cn.ibizlab.businesscentral.core.marketing.mapper.IBizListMapper.selectById" fetchType="lazy"></association> <association property="list" javaType="cn.ibizlab.businesscentral.core.marketing.domain.IBizList" column="entityid" select="cn.ibizlab.businesscentral.core.marketing.mapper.IBizListMapper.selectById" fetchType="lazy"></association>
</resultMap> </resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTACCOUNT_ACCOUNT_ACCOUNTID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTACCOUNT_ACCOUNT_ACCOUNTID] -->
<select id="selectByAccountid" resultMap="ListAccountResultMap"> <select id="selectByEntity2id" resultMap="ListAccountResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where accountid=#{accountid} where entity2id=#{accountid}
</select> </select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTACCOUNT_LIST_LISTID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTACCOUNT_LIST_LISTID] -->
<select id="selectByListid" resultMap="ListAccountResultMap"> <select id="selectByEntityid" resultMap="ListAccountResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where listid=#{listid} where entityid=#{listid}
</select> </select>
<!--数据集合[Default]--> <!--数据集合[Default]-->
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ENTITY2ID` AS `ACCOUNTID`, t1.`ENTITY2NAME` AS `ACCOUNTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ENTITY2ID` AS `ACCOUNTID`, t1.`ENTITY2NAME` AS `ACCOUNTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
businesscentral-core/src/main/resources/mapper/marketing/listcontact/ListContactMapper.xml
浏览文件 @ 9e7cfbc5
...@@ -5,35 +5,35 @@ ...@@ -5,35 +5,35 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="ListContactResultMap" databaseId="mysql"> <select id="selectById" resultMap="ListContactResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ENTITY2ID` AS `CONTACTID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2NAME` AS `FULLNAME`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 ) t1 where relationshipsid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 ) t1 where relationshipsid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="ListContactResultMap" type="cn.ibizlab.businesscentral.core.marketing.domain.ListContact" autoMapping="true"> <resultMap id="ListContactResultMap" type="cn.ibizlab.businesscentral.core.marketing.domain.ListContact" autoMapping="true">
<id property="relationshipsid" column="relationshipsid" /><!--主键字段映射--> <id property="relationshipsid" column="relationshipsid" /><!--主键字段映射-->
<result property="listid" column="listid" /> <result property="entityid" column="entityid" />
<result property="contactid" column="contactid" /> <result property="entity2id" column="entity2id" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="contact" javaType="cn.ibizlab.businesscentral.core.base.domain.Contact" column="contactid" select="cn.ibizlab.businesscentral.core.base.mapper.ContactMapper.selectById" fetchType="lazy"></association> <association property="contact" javaType="cn.ibizlab.businesscentral.core.base.domain.Contact" column="entity2id" select="cn.ibizlab.businesscentral.core.base.mapper.ContactMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="list" javaType="cn.ibizlab.businesscentral.core.marketing.domain.IBizList" column="listid" select="cn.ibizlab.businesscentral.core.marketing.mapper.IBizListMapper.selectById" fetchType="lazy"></association> <association property="list" javaType="cn.ibizlab.businesscentral.core.marketing.domain.IBizList" column="entityid" select="cn.ibizlab.businesscentral.core.marketing.mapper.IBizListMapper.selectById" fetchType="lazy"></association>
</resultMap> </resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTCONTACT_CONTACT_CONTACTID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTCONTACT_CONTACT_CONTACTID] -->
<select id="selectByContactid" resultMap="ListContactResultMap"> <select id="selectByEntity2id" resultMap="ListContactResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where contactid=#{contactid} where entity2id=#{contactid}
</select> </select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTCONTACT_LIST_LISTID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTCONTACT_LIST_LISTID] -->
<select id="selectByListid" resultMap="ListContactResultMap"> <select id="selectByEntityid" resultMap="ListContactResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where listid=#{listid} where entityid=#{listid}
</select> </select>
<!--数据集合[Default]--> <!--数据集合[Default]-->
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ENTITY2ID` AS `CONTACTID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2NAME` AS `FULLNAME`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1
WHERE ( t1.`RELATIONSHIPSTYPE` = 'LISTCONTACT' ) WHERE ( t1.`RELATIONSHIPSTYPE` = 'LISTCONTACT' )
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ENTITY2ID` AS `CONTACTID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2NAME` AS `FULLNAME`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1
WHERE ( t1.`RELATIONSHIPSTYPE` = 'LISTCONTACT' ) WHERE ( t1.`RELATIONSHIPSTYPE` = 'LISTCONTACT' )
]]> ]]>
</sql> </sql>
......
businesscentral-core/src/main/resources/mapper/marketing/listlead/ListLeadMapper.xml
浏览文件 @ 9e7cfbc5
...@@ -5,35 +5,35 @@ ...@@ -5,35 +5,35 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="ListLeadResultMap" databaseId="mysql"> <select id="selectById" resultMap="ListLeadResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2NAME` AS `FULLNAME`, t1.`ENTITY2ID` AS `LEADID`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 ) t1 where relationshipsid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 ) t1 where relationshipsid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="ListLeadResultMap" type="cn.ibizlab.businesscentral.core.marketing.domain.ListLead" autoMapping="true"> <resultMap id="ListLeadResultMap" type="cn.ibizlab.businesscentral.core.marketing.domain.ListLead" autoMapping="true">
<id property="relationshipsid" column="relationshipsid" /><!--主键字段映射--> <id property="relationshipsid" column="relationshipsid" /><!--主键字段映射-->
<result property="listid" column="listid" /> <result property="entityid" column="entityid" />
<result property="leadid" column="leadid" /> <result property="entity2id" column="entity2id" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="lead" javaType="cn.ibizlab.businesscentral.core.sales.domain.Lead" column="leadid" select="cn.ibizlab.businesscentral.core.sales.mapper.LeadMapper.selectById" fetchType="lazy"></association> <association property="lead" javaType="cn.ibizlab.businesscentral.core.sales.domain.Lead" column="entity2id" select="cn.ibizlab.businesscentral.core.sales.mapper.LeadMapper.selectById" fetchType="lazy"></association>
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="list" javaType="cn.ibizlab.businesscentral.core.marketing.domain.IBizList" column="listid" select="cn.ibizlab.businesscentral.core.marketing.mapper.IBizListMapper.selectById" fetchType="lazy"></association> <association property="list" javaType="cn.ibizlab.businesscentral.core.marketing.domain.IBizList" column="entityid" select="cn.ibizlab.businesscentral.core.marketing.mapper.IBizListMapper.selectById" fetchType="lazy"></association>
</resultMap> </resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTLEAD_LEAD_LEADID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTLEAD_LEAD_LEADID] -->
<select id="selectByLeadid" resultMap="ListLeadResultMap"> <select id="selectByEntity2id" resultMap="ListLeadResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where leadid=#{leadid} where entity2id=#{leadid}
</select> </select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTLEAD_LIST_LISTID] --> <!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_LISTLEAD_LIST_LISTID] -->
<select id="selectByListid" resultMap="ListLeadResultMap"> <select id="selectByEntityid" resultMap="ListLeadResultMap">
select t1.* from ( select t1.* from (
<include refid="Default" /> <include refid="Default" />
) t1 ) t1
where listid=#{listid} where entityid=#{listid}
</select> </select>
<!--数据集合[Default]--> <!--数据集合[Default]-->
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2NAME` AS `FULLNAME`, t1.`ENTITY2ID` AS `LEADID`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1
WHERE ( t1.`RELATIONSHIPSTYPE` = 'ENTITY' ) WHERE ( t1.`RELATIONSHIPSTYPE` = 'ENTITY' )
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2NAME` AS `FULLNAME`, t1.`ENTITY2ID` AS `LEADID`, t1.`ENTITYID` AS `LISTID`, t1.`ENTITYNAME` AS `LISTNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITY2ID`, t1.`ENTITY2NAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`RELATIONSHIPSID`, t1.`RELATIONSHIPSNAME`, t1.`RELATIONSHIPSTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `RELATIONSHIPS` t1
WHERE ( t1.`RELATIONSHIPSTYPE` = 'LISTLEAD' ) WHERE ( t1.`RELATIONSHIPSTYPE` = 'LISTLEAD' )
]]> ]]>
</sql> </sql>
......
businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/CampaignCampaignDTO.java
浏览文件 @ 9e7cfbc5
...@@ -66,36 +66,36 @@ public class CampaignCampaignDTO extends DTOBase implements Serializable { ...@@ -66,36 +66,36 @@ public class CampaignCampaignDTO extends DTOBase implements Serializable {
private String relationshipstype; private String relationshipstype;
/** /**
* 属性 [CAMPAIGNID] * 属性 [ENTITYID]
* *
*/ */
@JSONField(name = "campaignid") @JSONField(name = "entityid")
@JsonProperty("campaignid") @JsonProperty("entityid")
private String campaignid; private String entityid;
/** /**
* 属性 [CAMPAIGNNAME] * 属性 [ENTITYNAME]
* *
*/ */
@JSONField(name = "campaignname") @JSONField(name = "entityname")
@JsonProperty("campaignname") @JsonProperty("entityname")
private String campaignname; private String entityname;
/** /**
* 属性 [CAMPAIGN2ID] * 属性 [ENTITY2ID]
* *
*/ */
@JSONField(name = "campaign2id") @JSONField(name = "entity2id")
@JsonProperty("campaign2id") @JsonProperty("entity2id")
private String campaign2id; private String entity2id;
/** /**
* 属性 [CAMPAIGN2NAME] * 属性 [ENTITY2NAME]
* *
*/ */
@JSONField(name = "campaign2name") @JSONField(name = "entity2name")
@JsonProperty("campaign2name") @JsonProperty("entity2name")
private String campaign2name; private String entity2name;
/** /**
* 属性 [RELATIONSHIPSID] * 属性 [RELATIONSHIPSID]
...@@ -123,35 +123,35 @@ public class CampaignCampaignDTO extends DTOBase implements Serializable { ...@@ -123,35 +123,35 @@ public class CampaignCampaignDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [CAMPAIGNID] * 设置 [ENTITYID]
*/ */
public void setCampaignid(String campaignid){ public void setEntityid(String entityid){
this.campaignid = campaignid ; this.entityid = entityid ;
this.modify("campaignid",campaignid); this.modify("entityid",entityid);
} }
/** /**
* 设置 [CAMPAIGNNAME] * 设置 [ENTITYNAME]
*/ */
public void setCampaignname(String campaignname){ public void setEntityname(String entityname){
this.campaignname = campaignname ; this.entityname = entityname ;
this.modify("campaignname",campaignname); this.modify("entityname",entityname);
} }
/** /**
* 设置 [CAMPAIGN2ID] * 设置 [ENTITY2ID]
*/ */
public void setCampaign2id(String campaign2id){ public void setEntity2id(String entity2id){
this.campaign2id = campaign2id ; this.entity2id = entity2id ;
this.modify("campaign2id",campaign2id); this.modify("entity2id",entity2id);
} }
/** /**
* 设置 [CAMPAIGN2NAME] * 设置 [ENTITY2NAME]
*/ */
public void setCampaign2name(String campaign2name){ public void setEntity2name(String entity2name){
this.campaign2name = campaign2name ; this.entity2name = entity2name ;
this.modify("campaign2name",campaign2name); this.modify("entity2name",entity2name);
} }
/** /**
......
businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/ListAccountDTO.java
浏览文件 @ 9e7cfbc5
...@@ -82,36 +82,36 @@ public class ListAccountDTO extends DTOBase implements Serializable { ...@@ -82,36 +82,36 @@ public class ListAccountDTO extends DTOBase implements Serializable {
private String updateman; private String updateman;
/** /**
* 属性 [LISTID] * 属性 [ENTITYID]
* *
*/ */
@JSONField(name = "listid") @JSONField(name = "entityid")
@JsonProperty("listid") @JsonProperty("entityid")
private String listid; private String entityid;
/** /**
* 属性 [ACCOUNTID] * 属性 [ENTITY2ID]
* *
*/ */
@JSONField(name = "accountid") @JSONField(name = "entity2id")
@JsonProperty("accountid") @JsonProperty("entity2id")
private String accountid; private String entity2id;
/** /**
* 属性 [LISTNAME] * 属性 [ENTITYNAME]
* *
*/ */
@JSONField(name = "listname") @JSONField(name = "entityname")
@JsonProperty("listname") @JsonProperty("entityname")
private String listname; private String entityname;
/** /**
* 属性 [ACCOUNTNAME] * 属性 [ENTITY2NAME]
* *
*/ */
@JSONField(name = "accountname") @JSONField(name = "entity2name")
@JsonProperty("accountname") @JsonProperty("entity2name")
private String accountname; private String entity2name;
/** /**
...@@ -131,35 +131,35 @@ public class ListAccountDTO extends DTOBase implements Serializable { ...@@ -131,35 +131,35 @@ public class ListAccountDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [LISTID] * 设置 [ENTITYID]
*/ */
public void setListid(String listid){ public void setEntityid(String entityid){
this.listid = listid ; this.entityid = entityid ;
this.modify("listid",listid); this.modify("entityid",entityid);
} }
/** /**
* 设置 [ACCOUNTID] * 设置 [ENTITY2ID]
*/ */
public void setAccountid(String accountid){ public void setEntity2id(String entity2id){
this.accountid = accountid ; this.entity2id = entity2id ;
this.modify("accountid",accountid); this.modify("entity2id",entity2id);
} }
/** /**
* 设置 [LISTNAME] * 设置 [ENTITYNAME]
*/ */
public void setListname(String listname){ public void setEntityname(String entityname){
this.listname = listname ; this.entityname = entityname ;
this.modify("listname",listname); this.modify("entityname",entityname);
} }
/** /**
* 设置 [ACCOUNTNAME] * 设置 [ENTITY2NAME]
*/ */
public void setAccountname(String accountname){ public void setEntity2name(String entity2name){
this.accountname = accountname ; this.entity2name = entity2name ;
this.modify("accountname",accountname); this.modify("entity2name",entity2name);
} }
......
businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/ListContactDTO.java
浏览文件 @ 9e7cfbc5
...@@ -82,36 +82,36 @@ public class ListContactDTO extends DTOBase implements Serializable { ...@@ -82,36 +82,36 @@ public class ListContactDTO extends DTOBase implements Serializable {
private String relationshipsid; private String relationshipsid;
/** /**
* 属性 [LISTID] * 属性 [ENTITYID]
* *
*/ */
@JSONField(name = "listid") @JSONField(name = "entityid")
@JsonProperty("listid") @JsonProperty("entityid")
private String listid; private String entityid;
/** /**
* 属性 [LISTNAME] * 属性 [ENTITYNAME]
* *
*/ */
@JSONField(name = "listname") @JSONField(name = "entityname")
@JsonProperty("listname") @JsonProperty("entityname")
private String listname; private String entityname;
/** /**
* 属性 [CONTACTID] * 属性 [ENTITY2ID]
* *
*/ */
@JSONField(name = "contactid") @JSONField(name = "entity2id")
@JsonProperty("contactid") @JsonProperty("entity2id")
private String contactid; private String entity2id;
/** /**
* 属性 [FULLNAME] * 属性 [ENTITY2NAME]
* *
*/ */
@JSONField(name = "fullname") @JSONField(name = "entity2name")
@JsonProperty("fullname") @JsonProperty("entity2name")
private String fullname; private String entity2name;
/** /**
...@@ -131,35 +131,35 @@ public class ListContactDTO extends DTOBase implements Serializable { ...@@ -131,35 +131,35 @@ public class ListContactDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [LISTID] * 设置 [ENTITYID]
*/ */
public void setListid(String listid){ public void setEntityid(String entityid){
this.listid = listid ; this.entityid = entityid ;
this.modify("listid",listid); this.modify("entityid",entityid);
} }
/** /**
* 设置 [LISTNAME] * 设置 [ENTITYNAME]
*/ */
public void setListname(String listname){ public void setEntityname(String entityname){
this.listname = listname ; this.entityname = entityname ;
this.modify("listname",listname); this.modify("entityname",entityname);
} }
/** /**
* 设置 [CONTACTID] * 设置 [ENTITY2ID]
*/ */
public void setContactid(String contactid){ public void setEntity2id(String entity2id){
this.contactid = contactid ; this.entity2id = entity2id ;
this.modify("contactid",contactid); this.modify("entity2id",entity2id);
} }
/** /**
* 设置 [FULLNAME] * 设置 [ENTITY2NAME]
*/ */
public void setFullname(String fullname){ public void setEntity2name(String entity2name){
this.fullname = fullname ; this.entity2name = entity2name ;
this.modify("fullname",fullname); this.modify("entity2name",entity2name);
} }
......
businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/ListLeadDTO.java
浏览文件 @ 9e7cfbc5
...@@ -82,36 +82,36 @@ public class ListLeadDTO extends DTOBase implements Serializable { ...@@ -82,36 +82,36 @@ public class ListLeadDTO extends DTOBase implements Serializable {
private String updateman; private String updateman;
/** /**
* 属性 [LISTID] * 属性 [ENTITYID]
* *
*/ */
@JSONField(name = "listid") @JSONField(name = "entityid")
@JsonProperty("listid") @JsonProperty("entityid")
private String listid; private String entityid;
/** /**
* 属性 [LISTNAME] * 属性 [ENTITYNAME]
* *
*/ */
@JSONField(name = "listname") @JSONField(name = "entityname")
@JsonProperty("listname") @JsonProperty("entityname")
private String listname; private String entityname;
/** /**
* 属性 [LEADID] * 属性 [ENTITY2ID]
* *
*/ */
@JSONField(name = "leadid") @JSONField(name = "entity2id")
@JsonProperty("leadid") @JsonProperty("entity2id")
private String leadid; private String entity2id;
/** /**
* 属性 [FULLNAME] * 属性 [ENTITY2NAME]
* *
*/ */
@JSONField(name = "fullname") @JSONField(name = "entity2name")
@JsonProperty("fullname") @JsonProperty("entity2name")
private String fullname; private String entity2name;
/** /**
...@@ -131,35 +131,35 @@ public class ListLeadDTO extends DTOBase implements Serializable { ...@@ -131,35 +131,35 @@ public class ListLeadDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [LISTID] * 设置 [ENTITYID]
*/ */
public void setListid(String listid){ public void setEntityid(String entityid){
this.listid = listid ; this.entityid = entityid ;
this.modify("listid",listid); this.modify("entityid",entityid);
} }
/** /**
* 设置 [LISTNAME] * 设置 [ENTITYNAME]
*/ */
public void setListname(String listname){ public void setEntityname(String entityname){
this.listname = listname ; this.entityname = entityname ;
this.modify("listname",listname); this.modify("entityname",entityname);
} }
/** /**
* 设置 [LEADID] * 设置 [ENTITY2ID]
*/ */
public void setLeadid(String leadid){ public void setEntity2id(String entity2id){
this.leadid = leadid ; this.entity2id = entity2id ;
this.modify("leadid",leadid); this.modify("entity2id",entity2id);
} }
/** /**
* 设置 [FULLNAME] * 设置 [ENTITY2NAME]
*/ */
public void setFullname(String fullname){ public void setEntity2name(String entity2name){
this.fullname = fullname ; this.entity2name = entity2name ;
this.modify("fullname",fullname); this.modify("entity2name",entity2name);
} }
......
businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/rest/CampaignCampaignResource.java
浏览文件 @ 9e7cfbc5
...@@ -162,7 +162,7 @@ public class CampaignCampaignResource { ...@@ -162,7 +162,7 @@ public class CampaignCampaignResource {
@RequestMapping(method = RequestMethod.GET, value = "/campaigns/{campaign_id}/campaigncampaigns/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/campaigns/{campaign_id}/campaigncampaigns/getdraft")
public ResponseEntity<CampaignCampaignDTO> getDraftByCampaign(@PathVariable("campaign_id") String campaign_id) { public ResponseEntity<CampaignCampaignDTO> getDraftByCampaign(@PathVariable("campaign_id") String campaign_id) {
CampaignCampaign domain = new CampaignCampaign(); CampaignCampaign domain = new CampaignCampaign();
domain.setCampaign2id(campaign_id); domain.setEntity2id(campaign_id);
return ResponseEntity.status(HttpStatus.OK).body(campaigncampaignMapping.toDto(campaigncampaignService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(campaigncampaignMapping.toDto(campaigncampaignService.getDraft(domain)));
} }
...@@ -181,7 +181,7 @@ public class CampaignCampaignResource { ...@@ -181,7 +181,7 @@ public class CampaignCampaignResource {
@Transactional @Transactional
public ResponseEntity<CampaignCampaignDTO> updateByCampaign(@PathVariable("campaign_id") String campaign_id, @PathVariable("campaigncampaign_id") String campaigncampaign_id, @RequestBody CampaignCampaignDTO campaigncampaigndto) { public ResponseEntity<CampaignCampaignDTO> updateByCampaign(@PathVariable("campaign_id") String campaign_id, @PathVariable("campaigncampaign_id") String campaigncampaign_id, @RequestBody CampaignCampaignDTO campaigncampaigndto) {
CampaignCampaign domain = campaigncampaignMapping.toDomain(campaigncampaigndto); CampaignCampaign domain = campaigncampaignMapping.toDomain(campaigncampaigndto);
domain.setCampaign2id(campaign_id); domain.setEntity2id(campaign_id);
domain.setRelationshipsid(campaigncampaign_id); domain.setRelationshipsid(campaigncampaign_id);
campaigncampaignService.update(domain); campaigncampaignService.update(domain);
CampaignCampaignDTO dto = campaigncampaignMapping.toDto(domain); CampaignCampaignDTO dto = campaigncampaignMapping.toDto(domain);
...@@ -194,7 +194,7 @@ public class CampaignCampaignResource { ...@@ -194,7 +194,7 @@ public class CampaignCampaignResource {
public ResponseEntity<Boolean> updateBatchByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody List<CampaignCampaignDTO> campaigncampaigndtos) { public ResponseEntity<Boolean> updateBatchByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody List<CampaignCampaignDTO> campaigncampaigndtos) {
List<CampaignCampaign> domainlist=campaigncampaignMapping.toDomain(campaigncampaigndtos); List<CampaignCampaign> domainlist=campaigncampaignMapping.toDomain(campaigncampaigndtos);
for(CampaignCampaign domain:domainlist){ for(CampaignCampaign domain:domainlist){
domain.setCampaign2id(campaign_id); domain.setEntity2id(campaign_id);
} }
campaigncampaignService.updateBatch(domainlist); campaigncampaignService.updateBatch(domainlist);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
...@@ -205,7 +205,7 @@ public class CampaignCampaignResource { ...@@ -205,7 +205,7 @@ public class CampaignCampaignResource {
@RequestMapping(method = RequestMethod.POST, value = "/campaigns/{campaign_id}/campaigncampaigns/save") @RequestMapping(method = RequestMethod.POST, value = "/campaigns/{campaign_id}/campaigncampaigns/save")
public ResponseEntity<Boolean> saveByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody CampaignCampaignDTO campaigncampaigndto) { public ResponseEntity<Boolean> saveByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody CampaignCampaignDTO campaigncampaigndto) {
CampaignCampaign domain = campaigncampaignMapping.toDomain(campaigncampaigndto); CampaignCampaign domain = campaigncampaignMapping.toDomain(campaigncampaigndto);
domain.setCampaign2id(campaign_id); domain.setEntity2id(campaign_id);
return ResponseEntity.status(HttpStatus.OK).body(campaigncampaignService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(campaigncampaignService.save(domain));
} }
...@@ -215,7 +215,7 @@ public class CampaignCampaignResource { ...@@ -215,7 +215,7 @@ public class CampaignCampaignResource {
public ResponseEntity<Boolean> saveBatchByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody List<CampaignCampaignDTO> campaigncampaigndtos) { public ResponseEntity<Boolean> saveBatchByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody List<CampaignCampaignDTO> campaigncampaigndtos) {
List<CampaignCampaign> domainlist=campaigncampaignMapping.toDomain(campaigncampaigndtos); List<CampaignCampaign> domainlist=campaigncampaignMapping.toDomain(campaigncampaigndtos);
for(CampaignCampaign domain:domainlist){ for(CampaignCampaign domain:domainlist){
domain.setCampaign2id(campaign_id); domain.setEntity2id(campaign_id);
} }
campaigncampaignService.saveBatch(domainlist); campaigncampaignService.saveBatch(domainlist);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
...@@ -227,7 +227,7 @@ public class CampaignCampaignResource { ...@@ -227,7 +227,7 @@ public class CampaignCampaignResource {
@Transactional @Transactional
public ResponseEntity<CampaignCampaignDTO> createByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody CampaignCampaignDTO campaigncampaigndto) { public ResponseEntity<CampaignCampaignDTO> createByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody CampaignCampaignDTO campaigncampaigndto) {
CampaignCampaign domain = campaigncampaignMapping.toDomain(campaigncampaigndto); CampaignCampaign domain = campaigncampaignMapping.toDomain(campaigncampaigndto);
domain.setCampaign2id(campaign_id); domain.setEntity2id(campaign_id);
campaigncampaignService.create(domain); campaigncampaignService.create(domain);
CampaignCampaignDTO dto = campaigncampaignMapping.toDto(domain); CampaignCampaignDTO dto = campaigncampaignMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
...@@ -239,7 +239,7 @@ public class CampaignCampaignResource { ...@@ -239,7 +239,7 @@ public class CampaignCampaignResource {
public ResponseEntity<Boolean> createBatchByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody List<CampaignCampaignDTO> campaigncampaigndtos) { public ResponseEntity<Boolean> createBatchByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody List<CampaignCampaignDTO> campaigncampaigndtos) {
List<CampaignCampaign> domainlist=campaigncampaignMapping.toDomain(campaigncampaigndtos); List<CampaignCampaign> domainlist=campaigncampaignMapping.toDomain(campaigncampaigndtos);
for(CampaignCampaign domain:domainlist){ for(CampaignCampaign domain:domainlist){
domain.setCampaign2id(campaign_id); domain.setEntity2id(campaign_id);
} }
campaigncampaignService.createBatch(domainlist); campaigncampaignService.createBatch(domainlist);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
...@@ -271,7 +271,7 @@ public class CampaignCampaignResource { ...@@ -271,7 +271,7 @@ public class CampaignCampaignResource {
@ApiOperation(value = "根据市场活动获取DEFAULT", tags = {"市场活动-市场活动" } ,notes = "根据市场活动获取DEFAULT") @ApiOperation(value = "根据市场活动获取DEFAULT", tags = {"市场活动-市场活动" } ,notes = "根据市场活动获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/campaigns/{campaign_id}/campaigncampaigns/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/campaigns/{campaign_id}/campaigncampaigns/fetchdefault")
public ResponseEntity<List<CampaignCampaignDTO>> fetchCampaignCampaignDefaultByCampaign(@PathVariable("campaign_id") String campaign_id,CampaignCampaignSearchContext context) { public ResponseEntity<List<CampaignCampaignDTO>> fetchCampaignCampaignDefaultByCampaign(@PathVariable("campaign_id") String campaign_id,CampaignCampaignSearchContext context) {
context.setN_campaign2id_eq(campaign_id); context.setN_entity2id_eq(campaign_id);
Page<CampaignCampaign> domains = campaigncampaignService.searchDefault(context) ; Page<CampaignCampaign> domains = campaigncampaignService.searchDefault(context) ;
List<CampaignCampaignDTO> list = campaigncampaignMapping.toDto(domains.getContent()); List<CampaignCampaignDTO> list = campaigncampaignMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
...@@ -285,7 +285,7 @@ public class CampaignCampaignResource { ...@@ -285,7 +285,7 @@ public class CampaignCampaignResource {
@ApiOperation(value = "根据市场活动查询DEFAULT", tags = {"市场活动-市场活动" } ,notes = "根据市场活动查询DEFAULT") @ApiOperation(value = "根据市场活动查询DEFAULT", tags = {"市场活动-市场活动" } ,notes = "根据市场活动查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/campaigns/{campaign_id}/campaigncampaigns/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/campaigns/{campaign_id}/campaigncampaigns/searchdefault")
public ResponseEntity<Page<CampaignCampaignDTO>> searchCampaignCampaignDefaultByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody CampaignCampaignSearchContext context) { public ResponseEntity<Page<CampaignCampaignDTO>> searchCampaignCampaignDefaultByCampaign(@PathVariable("campaign_id") String campaign_id, @RequestBody CampaignCampaignSearchContext context) {
context.setN_campaign2id_eq(campaign_id); context.setN_entity2id_eq(campaign_id);
Page<CampaignCampaign> domains = campaigncampaignService.searchDefault(context) ; Page<CampaignCampaign> domains = campaigncampaignService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(campaigncampaignMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(campaigncampaignMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或