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

xignzi006 发布系统代码,后台体系[Spring Boot]

上级 1438c592
...@@ -195,7 +195,6 @@ public class Res_partner extends EntityMP implements Serializable { ...@@ -195,7 +195,6 @@ public class Res_partner extends EntityMP implements Serializable {
@JSONField(name = "has_unreconciled_entries") @JSONField(name = "has_unreconciled_entries")
@JsonProperty("has_unreconciled_entries") @JsonProperty("has_unreconciled_entries")
private Boolean hasUnreconciledEntries; private Boolean hasUnreconciledEntries;
/** /**
* 标签 * 标签
*/ */
...@@ -1357,14 +1356,6 @@ public class Res_partner extends EntityMP implements Serializable { ...@@ -1357,14 +1356,6 @@ public class Res_partner extends EntityMP implements Serializable {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return sdf.format(signupExpiration); return sdf.format(signupExpiration);
} }
/**
* 设置 [标签]
*/
public void setCategoryId(String categoryId){
this.categoryId = categoryId ;
this.modify("category_id",categoryId);
}
/** /**
* 设置 [网站业务伙伴的详细说明] * 设置 [网站业务伙伴的详细说明]
*/ */
......
...@@ -85,6 +85,4 @@ public interface Res_partnerMapper extends BaseMapper<Res_partner>{ ...@@ -85,6 +85,4 @@ public interface Res_partnerMapper extends BaseMapper<Res_partner>{
List<Res_partner> selectByWriteUid(@Param("id") Serializable id) ; List<Res_partner> selectByWriteUid(@Param("id") Serializable id) ;
boolean saveRelByOdoo_partner(@Param("partner_id") Long partner_id, List<cn.ibizlab.businesscentral.util.domain.MultiSelectItem> res_partner_categories);
} }
...@@ -314,8 +314,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re ...@@ -314,8 +314,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re
@Override @Override
@Transactional @Transactional
public boolean create(Res_partner et) { public boolean create(Res_partner et) {
String category_id = et.getCategoryId() ;
boolean mail_create_nosubscribe = et.get("mail_create_nosubscribe") != null; boolean mail_create_nosubscribe = et.get("mail_create_nosubscribe") != null;
boolean mail_create_nolog = et.get("mail_create_nolog") != null; boolean mail_create_nolog = et.get("mail_create_nolog") != null;
boolean mail_notrack = et.get("mail_notrack") != null; boolean mail_notrack = et.get("mail_notrack") != null;
...@@ -335,10 +333,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re ...@@ -335,10 +333,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re
if (messageinfo && !mail_notrack) { if (messageinfo && !mail_notrack) {
} }
if(org.apache.commons.lang3.StringUtils.isNotBlank(et.getCategoryId())){
this.baseMapper.saveRelByOdoo_partner(et.getId() , com.alibaba.fastjson.JSONArray.parseArray(category_id, cn.ibizlab.businesscentral.util.domain.MultiSelectItem.class));
}
return true; return true;
} }
...@@ -352,13 +346,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re ...@@ -352,13 +346,6 @@ public class Res_partnerServiceImpl extends EBSServiceImpl<Res_partnerMapper, Re
@Override @Override
@Transactional @Transactional
public boolean update(Res_partner et) { public boolean update(Res_partner et) {
if(et.getFocusNull().contains("category_id") || org.apache.commons.lang3.StringUtils.isNotBlank(et.getCategoryId())){
resPartnerResPartnerCategoryRelService.removeByPartnerId(et.getId());
if(org.apache.commons.lang3.StringUtils.isNotBlank(et.getCategoryId())){
this.baseMapper.saveRelByOdoo_partner(et.getId() , com.alibaba.fastjson.JSONArray.parseArray(et.getCategoryId(), cn.ibizlab.businesscentral.util.domain.MultiSelectItem.class));
}
}
Res_partner old = new Res_partner() ; Res_partner old = new Res_partner() ;
CachedBeanCopier.copy(get(et.getId()), old); CachedBeanCopier.copy(get(et.getId()), old);
boolean mail_notrack = et.get("mail_notrack") != null; boolean mail_notrack = et.get("mail_notrack") != null;
......
...@@ -147161,11 +147161,11 @@ ...@@ -147161,11 +147161,11 @@
"codename":"Category_id", "codename":"Category_id",
"field_logic_name":"标签", "field_logic_name":"标签",
"entity_name":"Res_partner", "entity_name":"Res_partner",
"field_type":"ONE2MANYDATA", "field_type":"TEXT",
"nullable":1, "nullable":1,
"physical_field":0, "physical_field":0,
"data_type":"TEXT", "data_type":"VARCHAR",
"data_length":1048576, "data_length":100,
"key_field":0, "key_field":0,
"show_order":1000, "show_order":1000,
"major_field":0 "major_field":0
...@@ -214,7 +214,9 @@ public class Res_partnerDTO extends DTOBase implements Serializable { ...@@ -214,7 +214,9 @@ public class Res_partnerDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "category_id") @JSONField(name = "category_id")
@JsonProperty("category_id") @JsonProperty("category_id")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String categoryId; private String categoryId;
/** /**
* 属性 [WEBSITE_DESCRIPTION] * 属性 [WEBSITE_DESCRIPTION]
* *
...@@ -1431,14 +1433,6 @@ public class Res_partnerDTO extends DTOBase implements Serializable { ...@@ -1431,14 +1433,6 @@ public class Res_partnerDTO extends DTOBase implements Serializable {
this.modify("signup_expiration",signupExpiration); this.modify("signup_expiration",signupExpiration);
} }
/**
* 设置 [CATEGORY_ID]
*/
public void setCategoryId(String categoryId){
this.categoryId = categoryId ;
this.modify("category_id",categoryId);
}
/** /**
* 设置 [WEBSITE_DESCRIPTION] * 设置 [WEBSITE_DESCRIPTION]
*/ */
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册