Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz商业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz商业套件
iBiz商业中心
提交
95cbc82b
提交
95cbc82b
编写于
10月 27, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 发布系统代码
上级
c982db3d
变更
12
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
74 行增加
和
74 行删除
+74
-74
Res_customer.java
...b/businesscentral/core/odoo_base/domain/Res_customer.java
+7
-7
Res_partner.java
...ab/businesscentral/core/odoo_base/domain/Res_partner.java
+7
-7
Res_supplier.java
...b/businesscentral/core/odoo_base/domain/Res_supplier.java
+7
-7
Res_users.java
...zlab/businesscentral/core/odoo_base/domain/Res_users.java
+3
-3
Res_usersServiceImpl.java
...ral/core/odoo_base/service/impl/Res_usersServiceImpl.java
+1
-1
Crm_lead.java
...bizlab/businesscentral/core/odoo_crm/domain/Crm_lead.java
+7
-7
Res_supplierMapper.xml
...rces/mapper/odoo_base/res_supplier/Res_supplierMapper.xml
+3
-3
iBizBusinessCentral.json
...core/src/main/resources/sysmodel/iBizBusinessCentral.json
+11
-11
Crm_leadDTO.java
...java/cn/ibizlab/businesscentral/core/dto/Crm_leadDTO.java
+8
-8
Res_partnerDTO.java
...a/cn/ibizlab/businesscentral/core/dto/Res_partnerDTO.java
+8
-8
Res_supplierDTO.java
.../cn/ibizlab/businesscentral/core/dto/Res_supplierDTO.java
+8
-8
Res_usersDTO.java
...ava/cn/ibizlab/businesscentral/core/dto/Res_usersDTO.java
+4
-4
未找到文件。
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_customer.java
浏览文件 @
95cbc82b
...
...
@@ -73,10 +73,10 @@ public class Res_customer extends EntityMP implements Serializable {
/**
* 工作岗位
*/
@TableField
(
value
=
"
ibiz
function"
)
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
private
String
ibiz
function
;
@TableField
(
value
=
"function"
)
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
private
String
function
;
/**
* 电话
*/
...
...
@@ -150,9 +150,9 @@ public class Res_customer extends EntityMP implements Serializable {
/**
* 设置 [工作岗位]
*/
public
void
set
Ibizfunction
(
String
ibiz
function
){
this
.
ibizfunction
=
ibiz
function
;
this
.
modify
(
"
ibizfunction"
,
ibiz
function
);
public
void
set
Function
(
String
function
){
this
.
function
=
function
;
this
.
modify
(
"
function"
,
function
);
}
/**
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_partner.java
浏览文件 @
95cbc82b
...
...
@@ -132,10 +132,10 @@ public class Res_partner extends EntityMP implements Serializable {
/**
* 工作岗位
*/
@TableField
(
value
=
"
ibiz
function"
)
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
private
String
ibiz
function
;
@TableField
(
value
=
"function"
)
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
private
String
function
;
/**
* 已开票总计
*/
...
...
@@ -1318,9 +1318,9 @@ public class Res_partner extends EntityMP implements Serializable {
/**
* 设置 [工作岗位]
*/
public
void
set
Ibizfunction
(
String
ibiz
function
){
this
.
ibizfunction
=
ibiz
function
;
this
.
modify
(
"
ibizfunction"
,
ibiz
function
);
public
void
set
Function
(
String
function
){
this
.
function
=
function
;
this
.
modify
(
"
function"
,
function
);
}
/**
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_supplier.java
浏览文件 @
95cbc82b
...
...
@@ -81,10 +81,10 @@ public class Res_supplier extends EntityMP implements Serializable {
/**
* 工作岗位
*/
@TableField
(
value
=
"
ibiz
function"
)
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
private
String
ibiz
function
;
@TableField
(
value
=
"function"
)
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
private
String
function
;
/**
* 手机
*/
...
...
@@ -143,9 +143,9 @@ public class Res_supplier extends EntityMP implements Serializable {
/**
* 设置 [工作岗位]
*/
public
void
set
Ibizfunction
(
String
ibiz
function
){
this
.
ibizfunction
=
ibiz
function
;
this
.
modify
(
"
ibizfunction"
,
ibiz
function
);
public
void
set
Function
(
String
function
){
this
.
function
=
function
;
this
.
modify
(
"
function"
,
function
);
}
/**
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_users.java
浏览文件 @
95cbc82b
...
...
@@ -769,9 +769,9 @@ public class Res_users extends EntityMP implements Serializable {
* 工作岗位
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
private
String
ibiz
function
;
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
private
String
function
;
/**
* 网站网址
*/
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_usersServiceImpl.java
浏览文件 @
95cbc82b
...
...
@@ -1460,7 +1460,7 @@ public class Res_usersServiceImpl extends EBSServiceImpl<Res_usersMapper, Res_us
et
.
setMessageMainAttachmentId
(
odooPartner
.
getMessageMainAttachmentId
());
et
.
setActivityUserId
(
odooPartner
.
getActivityUserId
());
et
.
setAdditionalInfo
(
odooPartner
.
getAdditionalInfo
());
et
.
set
Ibizfunction
(
odooPartner
.
getIbizf
unction
());
et
.
set
Function
(
odooPartner
.
getF
unction
());
et
.
setWebsiteUrl
(
odooPartner
.
getWebsiteUrl
());
et
.
setCalendarLastNotifAck
(
odooPartner
.
getCalendarLastNotifAck
());
et
.
setMessageNeedactionCounter
(
odooPartner
.
getMessageNeedactionCounter
());
...
...
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_crm/domain/Crm_lead.java
浏览文件 @
95cbc82b
...
...
@@ -59,10 +59,10 @@ public class Crm_lead extends EntityMP implements Serializable {
/**
* 工作岗位
*/
@TableField
(
value
=
"
ibiz
function"
)
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
private
String
ibiz
function
;
@TableField
(
value
=
"function"
)
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
private
String
function
;
/**
* 退回
*/
...
...
@@ -888,9 +888,9 @@ public class Crm_lead extends EntityMP implements Serializable {
/**
* 设置 [工作岗位]
*/
public
void
set
Ibizfunction
(
String
ibiz
function
){
this
.
ibizfunction
=
ibiz
function
;
this
.
modify
(
"
ibizfunction"
,
ibiz
function
);
public
void
set
Function
(
String
function
){
this
.
function
=
function
;
this
.
modify
(
"
function"
,
function
);
}
/**
...
...
businesscentral-core/src/main/resources/mapper/odoo_base/res_supplier/Res_supplierMapper.xml
浏览文件 @
95cbc82b
...
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"Res_supplierResultMap"
databaseId=
"postgresql"
>
<![CDATA[select t1.* from (SELECT t1.EMAIL, t1.FUNCTION
AS IBIZFUNCTION
, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1 ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1 ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...
...
@@ -29,12 +29,12 @@
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"postgresql"
>
<![CDATA[ SELECT t1.EMAIL, t1.FUNCTION
AS IBIZFUNCTION
, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1
<![CDATA[ SELECT t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1
]]>
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"postgresql"
>
<![CDATA[ SELECT t1.EMAIL, t1.FUNCTION
AS IBIZFUNCTION
, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1
<![CDATA[ SELECT t1.EMAIL, t1.FUNCTION, t1.ID, t1.MOBILE, t1.NAME, t1.PHONE, t1.TYPE, t1.VAT FROM RES_PARTNER t1
]]>
</sql>
</mapper>
...
...
businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json
浏览文件 @
95cbc82b
...
...
@@ -40763,8 +40763,8 @@
"major_field":0
},
{
"fieldname":"
IBIZ
FUNCTION" ,
"codename":"
Ibizf
unction",
"fieldname":"FUNCTION" ,
"codename":"
F
unction",
"field_logic_name":"工作岗位",
"entity_name":"Crm_lead",
"field_type":"TEXT",
...
...
@@ -146018,8 +146018,8 @@
"major_field":0
},
{
"fieldname":"
IBIZ
FUNCTION" ,
"codename":"
Ibizf
unction",
"fieldname":"FUNCTION" ,
"codename":"
F
unction",
"field_logic_name":"工作岗位",
"entity_name":"Res_customer",
"field_type":"TEXT",
...
...
@@ -146987,8 +146987,8 @@
"major_field":0
},
{
"fieldname":"
IBIZ
FUNCTION" ,
"codename":"
Ibizf
unction",
"fieldname":"FUNCTION" ,
"codename":"
F
unction",
"field_logic_name":"工作岗位",
"entity_name":"Res_partner",
"field_type":"TEXT",
...
...
@@ -151309,8 +151309,8 @@
"major_field":0
},
{
"fieldname":"
IBIZ
FUNCTION" ,
"codename":"
Ibizf
unction",
"fieldname":"FUNCTION" ,
"codename":"
F
unction",
"field_logic_name":"工作岗位",
"entity_name":"Res_supplier",
"field_type":"TEXT",
...
...
@@ -153091,12 +153091,12 @@
"major_field":0
},
{
"fieldname":"
IBIZ
FUNCTION" ,
"codename":"
Ibizf
unction",
"fieldname":"FUNCTION" ,
"codename":"
F
unction",
"field_logic_name":"工作岗位",
"entity_name":"Res_users",
"ref_de":"RES_PARTNER",
"ref_field_name":"
IBIZ
FUNCTION",
"ref_field_name":"FUNCTION",
"relation_name":"DER1N_RES_USERS__RES_PARTNER__PARTNER_ID",
"relation_codename":"Odoo_partner",
"field_type":"PICKUPDATA",
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Crm_leadDTO.java
浏览文件 @
95cbc82b
...
...
@@ -46,13 +46,13 @@ public class Crm_leadDTO extends DTOBase implements Serializable {
private
Integer
meetingCount
;
/**
* 属性 [
IBIZ
FUNCTION]
* 属性 [FUNCTION]
*
*/
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
@Size
(
min
=
0
,
max
=
100
,
message
=
"内容长度必须小于等于[100]"
)
private
String
ibiz
function
;
private
String
function
;
/**
* 属性 [MESSAGE_BOUNCE]
...
...
@@ -891,11 +891,11 @@ public class Crm_leadDTO extends DTOBase implements Serializable {
/**
* 设置 [
IBIZ
FUNCTION]
* 设置 [FUNCTION]
*/
public
void
set
Ibizfunction
(
String
ibiz
function
){
this
.
ibizfunction
=
ibiz
function
;
this
.
modify
(
"
ibizfunction"
,
ibiz
function
);
public
void
set
Function
(
String
function
){
this
.
function
=
function
;
this
.
modify
(
"
function"
,
function
);
}
/**
...
...
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Res_partnerDTO.java
浏览文件 @
95cbc82b
...
...
@@ -132,13 +132,13 @@ public class Res_partnerDTO extends DTOBase implements Serializable {
private
String
trust
;
/**
* 属性 [
IBIZ
FUNCTION]
* 属性 [FUNCTION]
*
*/
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
@Size
(
min
=
0
,
max
=
100
,
message
=
"内容长度必须小于等于[100]"
)
private
String
ibiz
function
;
private
String
function
;
/**
* 属性 [TOTAL_INVOICED]
...
...
@@ -1401,11 +1401,11 @@ public class Res_partnerDTO extends DTOBase implements Serializable {
}
/**
* 设置 [
IBIZ
FUNCTION]
* 设置 [FUNCTION]
*/
public
void
set
Ibizfunction
(
String
ibiz
function
){
this
.
ibizfunction
=
ibiz
function
;
this
.
modify
(
"
ibizfunction"
,
ibiz
function
);
public
void
set
Function
(
String
function
){
this
.
function
=
function
;
this
.
modify
(
"
function"
,
function
);
}
/**
...
...
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Res_supplierDTO.java
浏览文件 @
95cbc82b
...
...
@@ -75,13 +75,13 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
private
String
phone
;
/**
* 属性 [
IBIZ
FUNCTION]
* 属性 [FUNCTION]
*
*/
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
@Size
(
min
=
0
,
max
=
100
,
message
=
"内容长度必须小于等于[100]"
)
private
String
ibiz
function
;
private
String
function
;
/**
* 属性 [MOBILE]
...
...
@@ -145,11 +145,11 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
}
/**
* 设置 [
IBIZ
FUNCTION]
* 设置 [FUNCTION]
*/
public
void
set
Ibizfunction
(
String
ibiz
function
){
this
.
ibizfunction
=
ibiz
function
;
this
.
modify
(
"
ibizfunction"
,
ibiz
function
);
public
void
set
Function
(
String
function
){
this
.
function
=
function
;
this
.
modify
(
"
function"
,
function
);
}
/**
...
...
businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Res_usersDTO.java
浏览文件 @
95cbc82b
...
...
@@ -905,13 +905,13 @@ public class Res_usersDTO extends DTOBase implements Serializable {
private
String
additionalInfo
;
/**
* 属性 [
IBIZ
FUNCTION]
* 属性 [FUNCTION]
*
*/
@JSONField
(
name
=
"
ibiz
function"
)
@JsonProperty
(
"
ibiz
function"
)
@JSONField
(
name
=
"function"
)
@JsonProperty
(
"function"
)
@Size
(
min
=
0
,
max
=
100
,
message
=
"内容长度必须小于等于[100]"
)
private
String
ibiz
function
;
private
String
function
;
/**
* 属性 [WEBSITE_URL]
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录