提交 067eb88a 编写于 作者: ibizdev's avatar ibizdev

xignzi006 发布系统代码

上级 f52267b7
*volumes
*target
.settings
*node_modules
......
......@@ -173,6 +173,190 @@ mock.onGet(new RegExp(/^\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).rep
return [status, _items];
});
// Win
mock.onPost(new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/win$/)).reply((config: any) => {
console.groupCollapsed("实体:opportunity 方法: Win");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['accountid','contactid','opportunityid'];
const matchArray:any = new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/win$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Win
mock.onPost(new RegExp(/^\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/win$/)).reply((config: any) => {
console.groupCollapsed("实体:opportunity 方法: Win");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['contactid','opportunityid'];
const matchArray:any = new RegExp(/^\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/win$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Win
mock.onPost(new RegExp(/^\/opportunities\/?([a-zA-Z0-9\-\;]{0,35})\/win$/)).reply((config: any) => {
console.groupCollapsed("实体:opportunity 方法: Win");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['opportunityid'];
const matchArray:any = new RegExp(/^\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/win$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
//let items = mockDatas ? mockDatas : [];
//let _items = items.find((item: any) => Object.is(item.opportunityid, tempValue.opportunityid));
let data = JSON.parse(config.data);
mockDatas.forEach((item)=>{
if(item['opportunityid'] == tempValue['opportunityid'] ){
for(let value in data){
if(item.hasOwnProperty(value)){
item[value] = data[value];
}
}
}
})
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(data);
console.groupEnd();
console.groupEnd();
return [status, data];
});
// Lose
mock.onPost(new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/lose$/)).reply((config: any) => {
console.groupCollapsed("实体:opportunity 方法: Lose");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['accountid','contactid','opportunityid'];
const matchArray:any = new RegExp(/^\/accounts\/([a-zA-Z0-9\-\;]{1,35})\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/lose$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Lose
mock.onPost(new RegExp(/^\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/lose$/)).reply((config: any) => {
console.groupCollapsed("实体:opportunity 方法: Lose");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['contactid','opportunityid'];
const matchArray:any = new RegExp(/^\/contacts\/([a-zA-Z0-9\-\;]{1,35})\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/lose$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Lose
mock.onPost(new RegExp(/^\/opportunities\/?([a-zA-Z0-9\-\;]{0,35})\/lose$/)).reply((config: any) => {
console.groupCollapsed("实体:opportunity 方法: Lose");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['opportunityid'];
const matchArray:any = new RegExp(/^\/opportunities\/([a-zA-Z0-9\-\;]{1,35})\/lose$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
//let items = mockDatas ? mockDatas : [];
//let _items = items.find((item: any) => Object.is(item.opportunityid, tempValue.opportunityid));
let data = JSON.parse(config.data);
mockDatas.forEach((item)=>{
if(item['opportunityid'] == tempValue['opportunityid'] ){
for(let value in data){
if(item.hasOwnProperty(value)){
item[value] = data[value];
}
}
}
})
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(data);
console.groupEnd();
console.groupEnd();
return [status, data];
});
......
......@@ -126,6 +126,28 @@ export default class LeadServiceBase extends EntityService {
return res;
}
/**
* DisQualification接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof LeadServiceBase
*/
public async DisQualification(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.account && context.contact && context.lead){
return Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/disqualification`,data,isloading);
}
if(context.contact && context.lead){
return Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/disqualification`,data,isloading);
}
if(context.campaign && context.lead){
return Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/disqualification`,data,isloading);
}
return Http.getInstance().post(`/leads/${context.lead}/disqualification`,data,isloading);
}
/**
* CheckKey接口方法
*
......@@ -214,6 +236,28 @@ export default class LeadServiceBase extends EntityService {
return res;
}
/**
* Qualification接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof LeadServiceBase
*/
public async Qualification(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.account && context.contact && context.lead){
return Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/qualification`,data,isloading);
}
if(context.contact && context.lead){
return Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/qualification`,data,isloading);
}
if(context.campaign && context.lead){
return Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/qualification`,data,isloading);
}
return Http.getInstance().post(`/leads/${context.lead}/qualification`,data,isloading);
}
/**
* Create接口方法
*
......
......@@ -57,6 +57,44 @@ export default class OpportunityServiceBase extends EntityService {
return Http.getInstance().get(`/opportunities/${context.opportunity}/select`,isloading);
}
/**
* Win接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof OpportunityServiceBase
*/
public async Win(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.account && context.contact && context.opportunity){
return Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
}
if(context.contact && context.opportunity){
return Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
}
return Http.getInstance().post(`/opportunities/${context.opportunity}/win`,data,isloading);
}
/**
* Lose接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof OpportunityServiceBase
*/
public async Lose(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.account && context.contact && context.opportunity){
return Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
}
if(context.contact && context.opportunity){
return Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
}
return Http.getInstance().post(`/opportunities/${context.opportunity}/lose`,data,isloading);
}
/**
* Get接口方法
*
......
server:
port: 10320
#Log配置
logging:
level:
cn.ibizlab.businesscentral: info
#zuul网关路由设置
zuul:
routes:
......
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<property name="LOG_PATH" value="logs" />
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] %-40.40logger{39} : %msg%n" />
<!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<!-- 彩色日志格式 -->
<property name="LOG_PATTERN2" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr([${LOG_LEVEL_PATTERN:-%5p}]) %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
<!-- 控制台输出 -->
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- 按照每天生成日志文件 -->
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_PATH}/ibizbusinesscentral-businesscentral.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<!--日志文件最大的大小-->
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>100MB</MaxFileSize>
</triggeringPolicy>
</appender>
<!-- 日志输出级别 -->
<root level="INFO">
<appender-ref ref="Console" />
<appender-ref ref="file" />
</root>
</configuration>
version: "3.2"
services:
iBizBusinessCentral-mysql:
image: mysql:5.7.20
volumes:
- $PWD/../../../../volumes/mysql/:/var/lib/mysql/
networks:
- agent_network
environment:
- TZ=Asia/Shanghai
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_ROOT_PASSWORD=root
- MYSQL_DATABASE=a_LAB01_e85d8801c
ports:
- 3306:3306
command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8 --explicit_defaults_for_timestamp
networks:
agent_network:
attachable: true
version: "3.2"
services:
iBizBusinessCentral-nacos:
image: nacos/nacos-server:latest
container_name: nacos-standalone
environment:
- PREFER_HOST_MODE=hostname
- MODE=standalone
ports:
- "8848:8848"
networks:
- agent_network
networks:
agent_network:
attachable: true
version: "3.2"
services:
iBizBusinessCentral-redis:
image: redis
ports:
- 6379:6379
environment:
- TZ=Asia/Shanghai
logging:
driver: "json-file"
command: redis-server
networks:
- agent_network
networks:
agent_network:
attachable: true
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<property name="LOG_PATH" value="logs" />
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] %-40.40logger{39} : %msg%n" />
<!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<!-- 彩色日志格式 -->
<property name="LOG_PATTERN2" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr([${LOG_LEVEL_PATTERN:-%5p}]) %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
<!-- 控制台输出 -->
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- 按照每天生成日志文件 -->
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_PATH}/ibizbusinesscentral.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<!--日志文件最大的大小-->
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>100MB</MaxFileSize>
</triggeringPolicy>
</appender>
<!-- 日志输出级别 -->
<root level="INFO">
<appender-ref ref="Console" />
<appender-ref ref="file" />
</root>
</configuration>
......@@ -92,10 +92,10 @@
<artifactId>liquibase-core</artifactId>
</dependency>
<!--xxl-job定时服务 -->
<!--baomidou-jobs定时服务 -->
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<groupId>com.baomidou</groupId>
<artifactId>jobs-spring-boot-starter</artifactId>
</dependency>
</dependencies>
......
......@@ -469,7 +469,7 @@ public class Account extends EntityMP implements Serializable {
* 客户
*/
@DEField(isKeyField=true)
@TableId(value= "accountid",type=IdType.UUID)
@TableId(value= "accountid",type=IdType.ASSIGN_UUID)
@JSONField(name = "accountid")
@JsonProperty("accountid")
private String accountid;
......
......@@ -195,7 +195,7 @@ public class ActivityMimeatTachment extends EntityMP implements Serializable {
* ActivityMimeAttachmentId
*/
@DEField(isKeyField=true)
@TableId(value= "activitymimeattachmentid",type=IdType.UUID)
@TableId(value= "activitymimeattachmentid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activitymimeattachmentid")
@JsonProperty("activitymimeattachmentid")
private String activitymimeattachmentid;
......
......@@ -79,7 +79,7 @@ public class ActivityParty extends EntityMP implements Serializable {
* 活动方
*/
@DEField(isKeyField=true)
@TableId(value= "activitypartyid",type=IdType.UUID)
@TableId(value= "activitypartyid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activitypartyid")
@JsonProperty("activitypartyid")
private String activitypartyid;
......
......@@ -199,7 +199,7 @@ public class ActivityPointer extends EntityMP implements Serializable {
* 活动
*/
@DEField(isKeyField=true)
@TableId(value= "activityid",type=IdType.UUID)
@TableId(value= "activityid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activityid")
@JsonProperty("activityid")
private String activityid;
......
......@@ -144,7 +144,7 @@ public class Annotation extends EntityMP implements Serializable {
* 注释
*/
@DEField(isKeyField=true)
@TableId(value= "annotationid",type=IdType.UUID)
@TableId(value= "annotationid",type=IdType.ASSIGN_UUID)
@JSONField(name = "annotationid")
@JsonProperty("annotationid")
private String annotationid;
......
......@@ -112,7 +112,7 @@ public class Appointment extends EntityMP implements Serializable {
* 约会
*/
@DEField(isKeyField=true)
@TableId(value= "activityid",type=IdType.UUID)
@TableId(value= "activityid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activityid")
@JsonProperty("activityid")
private String activityid;
......
......@@ -90,7 +90,7 @@ public class Audit extends EntityMP implements Serializable {
* 记录 ID
*/
@DEField(isKeyField=true)
@TableId(value= "auditid",type=IdType.UUID)
@TableId(value= "auditid",type=IdType.ASSIGN_UUID)
@JSONField(name = "auditid")
@JsonProperty("auditid")
private String auditid;
......
......@@ -324,7 +324,7 @@ public class BusinessUnit extends EntityMP implements Serializable {
* 业务部门
*/
@DEField(isKeyField=true)
@TableId(value= "businessunitid",type=IdType.UUID)
@TableId(value= "businessunitid",type=IdType.ASSIGN_UUID)
@JSONField(name = "businessunitid")
@JsonProperty("businessunitid")
private String businessunitid;
......
......@@ -43,7 +43,7 @@ public class BusinessUnitNewsArticle extends EntityMP implements Serializable {
* 公告
*/
@DEField(isKeyField=true)
@TableId(value= "businessunitnewsarticleid",type=IdType.UUID)
@TableId(value= "businessunitnewsarticleid",type=IdType.ASSIGN_UUID)
@JSONField(name = "businessunitnewsarticleid")
@JsonProperty("businessunitnewsarticleid")
private String businessunitnewsarticleid;
......
......@@ -59,7 +59,7 @@ public class Calendar extends EntityMP implements Serializable {
* 日历
*/
@DEField(isKeyField=true)
@TableId(value= "calendarid",type=IdType.UUID)
@TableId(value= "calendarid",type=IdType.ASSIGN_UUID)
@JSONField(name = "calendarid")
@JsonProperty("calendarid")
private String calendarid;
......
......@@ -141,7 +141,7 @@ public class Category extends EntityMP implements Serializable {
* 类别 ID
*/
@DEField(isKeyField=true)
@TableId(value= "categoryid",type=IdType.UUID)
@TableId(value= "categoryid",type=IdType.ASSIGN_UUID)
@JSONField(name = "categoryid")
@JsonProperty("categoryid")
private String categoryid;
......
......@@ -1155,7 +1155,7 @@ public class Contact extends EntityMP implements Serializable {
* 联系人
*/
@DEField(isKeyField=true)
@TableId(value= "contactid",type=IdType.UUID)
@TableId(value= "contactid",type=IdType.ASSIGN_UUID)
@JSONField(name = "contactid")
@JsonProperty("contactid")
private String contactid;
......
......@@ -316,7 +316,7 @@ public class CustomerAddress extends EntityMP implements Serializable {
* 地址
*/
@DEField(isKeyField=true)
@TableId(value= "customeraddressid",type=IdType.UUID)
@TableId(value= "customeraddressid",type=IdType.ASSIGN_UUID)
@JSONField(name = "customeraddressid")
@JsonProperty("customeraddressid")
private String customeraddressid;
......
......@@ -232,7 +232,7 @@ public class Email extends EntityMP implements Serializable {
* 电子邮件
*/
@DEField(isKeyField=true)
@TableId(value= "activityid",type=IdType.UUID)
@TableId(value= "activityid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activityid")
@JsonProperty("activityid")
private String activityid;
......
......@@ -200,7 +200,7 @@ public class Fax extends EntityMP implements Serializable {
* 传真
*/
@DEField(isKeyField=true)
@TableId(value= "activityid",type=IdType.UUID)
@TableId(value= "activityid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activityid")
@JsonProperty("activityid")
private String activityid;
......
......@@ -167,7 +167,7 @@ public class Feedback extends EntityMP implements Serializable {
* 反馈
*/
@DEField(isKeyField=true)
@TableId(value= "feedbackid",type=IdType.UUID)
@TableId(value= "feedbackid",type=IdType.ASSIGN_UUID)
@JSONField(name = "feedbackid")
@JsonProperty("feedbackid")
private String feedbackid;
......
......@@ -238,7 +238,7 @@ public class KnowledgeArticle extends EntityMP implements Serializable {
* 知识文章
*/
@DEField(isKeyField=true)
@TableId(value= "knowledgearticleid",type=IdType.UUID)
@TableId(value= "knowledgearticleid",type=IdType.ASSIGN_UUID)
@JSONField(name = "knowledgearticleid")
@JsonProperty("knowledgearticleid")
private String knowledgearticleid;
......
......@@ -146,7 +146,7 @@ public class KnowledgeArticleViews extends EntityMP implements Serializable {
* 查看
*/
@DEField(isKeyField=true)
@TableId(value= "knowledgearticleviewsid",type=IdType.UUID)
@TableId(value= "knowledgearticleviewsid",type=IdType.ASSIGN_UUID)
@JSONField(name = "knowledgearticleviewsid")
@JsonProperty("knowledgearticleviewsid")
private String knowledgearticleviewsid;
......
......@@ -57,7 +57,7 @@ public class KnowledgeBaseRecord extends EntityMP implements Serializable {
* 编号
*/
@DEField(isKeyField=true)
@TableId(value= "knowledgebaserecordid",type=IdType.UUID)
@TableId(value= "knowledgebaserecordid",type=IdType.ASSIGN_UUID)
@JSONField(name = "knowledgebaserecordid")
@JsonProperty("knowledgebaserecordid")
private String knowledgebaserecordid;
......
......@@ -52,7 +52,7 @@ public class LanguageLocale extends EntityMP implements Serializable {
* LanguageLocaleId
*/
@DEField(isKeyField=true)
@TableId(value= "languagelocaleid",type=IdType.UUID)
@TableId(value= "languagelocaleid",type=IdType.ASSIGN_UUID)
@JSONField(name = "languagelocaleid")
@JsonProperty("languagelocaleid")
private String languagelocaleid;
......
......@@ -375,7 +375,7 @@ public class Letter extends EntityMP implements Serializable {
* 信件
*/
@DEField(isKeyField=true)
@TableId(value= "activityid",type=IdType.UUID)
@TableId(value= "activityid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activityid")
@JsonProperty("activityid")
private String activityid;
......
......@@ -124,7 +124,7 @@ public class Metric extends EntityMP implements Serializable {
* 目标度量
*/
@DEField(isKeyField=true)
@TableId(value= "metricid",type=IdType.UUID)
@TableId(value= "metricid",type=IdType.ASSIGN_UUID)
@JSONField(name = "metricid")
@JsonProperty("metricid")
private String metricid;
......
......@@ -1491,7 +1491,7 @@ public class Organization extends EntityMP implements Serializable {
* 组织
*/
@DEField(isKeyField=true)
@TableId(value= "organizationid",type=IdType.UUID)
@TableId(value= "organizationid",type=IdType.ASSIGN_UUID)
@JSONField(name = "organizationid")
@JsonProperty("organizationid")
private String organizationid;
......
......@@ -122,7 +122,7 @@ public class PersonalDocumentTemplate extends EntityMP implements Serializable {
* 个人文档模板标识符
*/
@DEField(isKeyField=true)
@TableId(value= "personaldocumenttemplateid",type=IdType.UUID)
@TableId(value= "personaldocumenttemplateid",type=IdType.ASSIGN_UUID)
@JSONField(name = "personaldocumenttemplateid")
@JsonProperty("personaldocumenttemplateid")
private String personaldocumenttemplateid;
......
......@@ -368,7 +368,7 @@ public class PhoneCall extends EntityMP implements Serializable {
* 电话联络
*/
@DEField(isKeyField=true)
@TableId(value= "activityid",type=IdType.UUID)
@TableId(value= "activityid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activityid")
@JsonProperty("activityid")
private String activityid;
......
......@@ -117,7 +117,7 @@ public class Position extends EntityMP implements Serializable {
* 位置
*/
@DEField(isKeyField=true)
@TableId(value= "positionid",type=IdType.UUID)
@TableId(value= "positionid",type=IdType.ASSIGN_UUID)
@JSONField(name = "positionid")
@JsonProperty("positionid")
private String positionid;
......
......@@ -78,7 +78,7 @@ public class Post extends EntityMP implements Serializable {
* 公告
*/
@DEField(isKeyField=true)
@TableId(value= "postid",type=IdType.UUID)
@TableId(value= "postid",type=IdType.ASSIGN_UUID)
@JSONField(name = "postid")
@JsonProperty("postid")
private String postid;
......
......@@ -83,6 +83,7 @@ public class Relationships extends EntityMP implements Serializable {
/**
* 关系类型
*/
@DEField(defaultValue = "OPPORTUNITYCOMPETITOR")
@TableField(value = "relationshipstype")
@JSONField(name = "relationshipstype")
@JsonProperty("relationshipstype")
......@@ -91,7 +92,7 @@ public class Relationships extends EntityMP implements Serializable {
* 关系标识
*/
@DEField(isKeyField=true)
@TableId(value= "relationshipsid",type=IdType.UUID)
@TableId(value= "relationshipsid",type=IdType.ASSIGN_UUID)
@JSONField(name = "relationshipsid")
@JsonProperty("relationshipsid")
private String relationshipsid;
......
......@@ -447,7 +447,7 @@ public class Site extends EntityMP implements Serializable {
* 场所
*/
@DEField(isKeyField=true)
@TableId(value= "siteid",type=IdType.UUID)
@TableId(value= "siteid",type=IdType.ASSIGN_UUID)
@JSONField(name = "siteid")
@JsonProperty("siteid")
private String siteid;
......
......@@ -156,7 +156,7 @@ public class SiteMap extends EntityMP implements Serializable {
* SiteMapId
*/
@DEField(isKeyField=true)
@TableId(value= "sitemapid",type=IdType.UUID)
@TableId(value= "sitemapid",type=IdType.ASSIGN_UUID)
@JSONField(name = "sitemapid")
@JsonProperty("sitemapid")
private String sitemapid;
......
......@@ -50,7 +50,7 @@ public class Sla extends EntityMP implements Serializable {
* SLA
*/
@DEField(isKeyField=true)
@TableId(value= "slaid",type=IdType.UUID)
@TableId(value= "slaid",type=IdType.ASSIGN_UUID)
@JSONField(name = "slaid")
@JsonProperty("slaid")
private String slaid;
......
......@@ -168,7 +168,7 @@ public class SlaItem extends EntityMP implements Serializable {
* SLA 项
*/
@DEField(isKeyField=true)
@TableId(value= "slaitemid",type=IdType.UUID)
@TableId(value= "slaitemid",type=IdType.ASSIGN_UUID)
@JSONField(name = "slaitemid")
@JsonProperty("slaitemid")
private String slaitemid;
......
......@@ -43,7 +43,7 @@ public class SlaKpiInstance extends EntityMP implements Serializable {
* SLA KPI InstanceId
*/
@DEField(isKeyField=true)
@TableId(value= "slakpiinstanceid",type=IdType.UUID)
@TableId(value= "slakpiinstanceid",type=IdType.ASSIGN_UUID)
@JSONField(name = "slakpiinstanceid")
@JsonProperty("slakpiinstanceid")
private String slakpiinstanceid;
......
......@@ -127,7 +127,7 @@ public class Subject extends EntityMP implements Serializable {
* 主题
*/
@DEField(isKeyField=true)
@TableId(value= "subjectid",type=IdType.UUID)
@TableId(value= "subjectid",type=IdType.ASSIGN_UUID)
@JSONField(name = "subjectid")
@JsonProperty("subjectid")
private String subjectid;
......
......@@ -171,7 +171,7 @@ public class Task extends EntityMP implements Serializable {
* 任务​​
*/
@DEField(isKeyField=true)
@TableId(value= "activityid",type=IdType.UUID)
@TableId(value= "activityid",type=IdType.ASSIGN_UUID)
@JSONField(name = "activityid")
@JsonProperty("activityid")
private String activityid;
......
......@@ -78,7 +78,7 @@ public class Team extends EntityMP implements Serializable {
* 团队
*/
@DEField(isKeyField=true)
@TableId(value= "teamid",type=IdType.UUID)
@TableId(value= "teamid",type=IdType.ASSIGN_UUID)
@JSONField(name = "teamid")
@JsonProperty("teamid")
private String teamid;
......
......@@ -88,7 +88,7 @@ public class TeamTemplate extends EntityMP implements Serializable {
* 团队模板的主键
*/
@DEField(isKeyField=true)
@TableId(value= "teamtemplateid",type=IdType.UUID)
@TableId(value= "teamtemplateid",type=IdType.ASSIGN_UUID)
@JSONField(name = "teamtemplateid")
@JsonProperty("teamtemplateid")
private String teamtemplateid;
......
......@@ -153,7 +153,7 @@ public class Template extends EntityMP implements Serializable {
* 电子邮件模板
*/
@DEField(isKeyField=true)
@TableId(value= "templateid",type=IdType.UUID)
@TableId(value= "templateid",type=IdType.ASSIGN_UUID)
@JSONField(name = "templateid")
@JsonProperty("templateid")
private String templateid;
......
......@@ -67,7 +67,7 @@ public class Territory extends EntityMP implements Serializable {
* 区域
*/
@DEField(isKeyField=true)
@TableId(value= "territoryid",type=IdType.UUID)
@TableId(value= "territoryid",type=IdType.ASSIGN_UUID)
@JSONField(name = "territoryid")
@JsonProperty("territoryid")
private String territoryid;
......
......@@ -103,7 +103,7 @@ public class TimezoneDefinition extends EntityMP implements Serializable {
* 时区定义
*/
@DEField(isKeyField=true)
@TableId(value= "timezonedefinitionid",type=IdType.UUID)
@TableId(value= "timezonedefinitionid",type=IdType.ASSIGN_UUID)
@JSONField(name = "timezonedefinitionid")
@JsonProperty("timezonedefinitionid")
private String timezonedefinitionid;
......
......@@ -57,7 +57,7 @@ public class TimezoneLocalizedName extends EntityMP implements Serializable {
* 时区的本地化名称
*/
@DEField(isKeyField=true)
@TableId(value= "timezonelocalizednameid",type=IdType.UUID)
@TableId(value= "timezonelocalizednameid",type=IdType.ASSIGN_UUID)
@JSONField(name = "timezonelocalizednameid")
@JsonProperty("timezonelocalizednameid")
private String timezonelocalizednameid;
......
......@@ -160,7 +160,7 @@ public class TimezoneRule extends EntityMP implements Serializable {
* 时区规则
*/
@DEField(isKeyField=true)
@TableId(value= "timezoneruleid",type=IdType.UUID)
@TableId(value= "timezoneruleid",type=IdType.ASSIGN_UUID)
@JSONField(name = "timezoneruleid")
@JsonProperty("timezoneruleid")
private String timezoneruleid;
......
......@@ -59,7 +59,7 @@ public class TransactionCurrency extends EntityMP implements Serializable {
* 交易币种
*/
@DEField(isKeyField=true)
@TableId(value= "transactioncurrencyid",type=IdType.UUID)
@TableId(value= "transactioncurrencyid",type=IdType.ASSIGN_UUID)
@JSONField(name = "transactioncurrencyid")
@JsonProperty("transactioncurrencyid")
private String transactioncurrencyid;
......
......@@ -88,7 +88,7 @@ public class Uom extends EntityMP implements Serializable {
* 计价单位
*/
@DEField(isKeyField=true)
@TableId(value= "uomid",type=IdType.UUID)
@TableId(value= "uomid",type=IdType.ASSIGN_UUID)
@JSONField(name = "uomid")
@JsonProperty("uomid")
private String uomid;
......
......@@ -148,7 +148,7 @@ public class UomSchedule extends EntityMP implements Serializable {
* 计价单位组
*/
@DEField(isKeyField=true)
@TableId(value= "uomscheduleid",type=IdType.UUID)
@TableId(value= "uomscheduleid",type=IdType.ASSIGN_UUID)
@JSONField(name = "uomscheduleid")
@JsonProperty("uomscheduleid")
private String uomscheduleid;
......
......@@ -386,6 +386,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
}
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -155,6 +155,8 @@ public class ActivityMimeatTachmentServiceImpl extends ServiceImpl<ActivityMimea
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -181,6 +181,8 @@ public class ActivityPartyServiceImpl extends ServiceImpl<ActivityPartyMapper, A
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -209,6 +209,8 @@ public class ActivityPointerServiceImpl extends ServiceImpl<ActivityPointerMappe
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -155,6 +155,8 @@ public class AnnotationServiceImpl extends ServiceImpl<AnnotationMapper, Annotat
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -196,6 +196,8 @@ public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appoi
@Autowired
cn.ibizlab.businesscentral.core.base.mapping.AppointmentInheritMapping appointmentInheritMapping;
@Autowired
......
......@@ -155,6 +155,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -155,6 +155,8 @@ public class BusinessUnitNewsArticleServiceImpl extends ServiceImpl<BusinessUnit
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -220,6 +220,8 @@ public class BusinessUnitServiceImpl extends ServiceImpl<BusinessUnitMapper, Bus
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -189,6 +189,8 @@ public class CalendarServiceImpl extends ServiceImpl<CalendarMapper, Calendar> i
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -180,6 +180,8 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -344,6 +344,8 @@ public class ContactServiceImpl extends ServiceImpl<ContactMapper, Contact> impl
}
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -174,6 +174,8 @@ public class CustomerAddressServiceImpl extends ServiceImpl<CustomerAddressMappe
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -221,6 +221,8 @@ public class EmailServiceImpl extends ServiceImpl<EmailMapper, Email> implements
@Autowired
cn.ibizlab.businesscentral.core.base.mapping.EmailInheritMapping emailInheritMapping;
@Autowired
......
......@@ -196,6 +196,8 @@ public class FaxServiceImpl extends ServiceImpl<FaxMapper, Fax> implements IFaxS
@Autowired
cn.ibizlab.businesscentral.core.base.mapping.FaxInheritMapping faxInheritMapping;
@Autowired
......
......@@ -191,6 +191,8 @@ public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, Feedback> i
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -235,6 +235,8 @@ public class KnowledgeArticleServiceImpl extends ServiceImpl<KnowledgeArticleMap
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -168,6 +168,8 @@ public class KnowledgeArticleViewsServiceImpl extends ServiceImpl<KnowledgeArtic
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -168,6 +168,8 @@ public class KnowledgeBaseRecordServiceImpl extends ServiceImpl<KnowledgeBaseRec
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -158,6 +158,8 @@ public class LanguageLocaleServiceImpl extends ServiceImpl<LanguageLocaleMapper,
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -196,6 +196,8 @@ public class LetterServiceImpl extends ServiceImpl<LetterMapper, Letter> impleme
@Autowired
cn.ibizlab.businesscentral.core.base.mapping.LetterInheritMapping letterInheritMapping;
@Autowired
......
......@@ -158,6 +158,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricMapper, Metric> impleme
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -184,6 +184,8 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -155,6 +155,8 @@ public class PersonalDocumentTemplateServiceImpl extends ServiceImpl<PersonalDoc
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -196,6 +196,8 @@ public class PhoneCallServiceImpl extends ServiceImpl<PhoneCallMapper, PhoneCall
@Autowired
cn.ibizlab.businesscentral.core.base.mapping.PhoneCallInheritMapping phonecallInheritMapping;
@Autowired
......
......@@ -180,6 +180,8 @@ public class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> i
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -155,6 +155,8 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -155,6 +155,8 @@ public class RelationshipsServiceImpl extends ServiceImpl<RelationshipsMapper, R
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -155,6 +155,8 @@ public class SiteMapServiceImpl extends ServiceImpl<SiteMapMapper, SiteMap> impl
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -164,6 +164,8 @@ public class SiteServiceImpl extends ServiceImpl<SiteMapper, Site> implements IS
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -168,6 +168,8 @@ public class SlaItemServiceImpl extends ServiceImpl<SlaItemMapper, SlaItem> impl
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -197,6 +197,8 @@ public class SlaKpiInstanceServiceImpl extends ServiceImpl<SlaKpiInstanceMapper,
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -272,6 +272,8 @@ public class SlaServiceImpl extends ServiceImpl<SlaMapper, Sla> implements ISlaS
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -179,6 +179,8 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -196,6 +196,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
@Autowired
cn.ibizlab.businesscentral.core.base.mapping.TaskInheritMapping taskInheritMapping;
@Autowired
......
......@@ -210,6 +210,8 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -158,6 +158,8 @@ public class TeamTemplateServiceImpl extends ServiceImpl<TeamTemplateMapper, Tea
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -161,6 +161,8 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -171,6 +171,8 @@ public class TerritoryServiceImpl extends ServiceImpl<TerritoryMapper, Territory
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -161,6 +161,8 @@ public class TimezoneDefinitionServiceImpl extends ServiceImpl<TimezoneDefinitio
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -168,6 +168,8 @@ public class TimezoneLocalizedNameServiceImpl extends ServiceImpl<TimezoneLocali
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -168,6 +168,8 @@ public class TimezoneRuleServiceImpl extends ServiceImpl<TimezoneRuleMapper, Tim
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
......@@ -377,6 +377,8 @@ public class TransactionCurrencyServiceImpl extends ServiceImpl<TransactionCurre
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册