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

xignzi006 发布系统代码

上级 6a84ece8
......@@ -58,4 +58,27 @@ public class res_partnerFallback implements res_partnerFeignClient{
return null;
}
public Res_partner getDraft(){
return null;
}
public Boolean checkKey(Res_partner res_partner){
return false;
}
public Boolean save(Res_partner res_partner){
return false;
}
public Boolean saveBatch(List<Res_partner> res_partners){
return false;
}
public Page<Res_partner> searchDefault(Res_partnerSearchContext context){
return null;
}
}
......@@ -56,4 +56,24 @@ public interface res_partnerFeignClient {
Page<Res_partner> select();
@RequestMapping(method = RequestMethod.GET, value = "/res_partners/getdraft")
Res_partner getDraft();
@RequestMapping(method = RequestMethod.POST, value = "/res_partners/checkkey")
Boolean checkKey(@RequestBody Res_partner res_partner);
@RequestMapping(method = RequestMethod.POST, value = "/res_partners/save")
Boolean save(@RequestBody Res_partner res_partner);
@RequestMapping(method = RequestMethod.POST, value = "/res_partners/savebatch")
Boolean saveBatch(@RequestBody List<Res_partner> res_partners);
@RequestMapping(method = RequestMethod.POST, value = "/res_partners/searchdefault")
Page<Res_partner> searchDefault(@RequestBody Res_partnerSearchContext context);
}
......@@ -660,13 +660,6 @@ public class Res_partner extends EntityMP implements Serializable {
@JSONField(name = "journal_item_count")
@JsonProperty("journal_item_count")
private Integer journalItemCount;
/**
* 供应商
*/
@TableField(value = "supplier")
@JSONField(name = "supplier")
@JsonProperty("supplier")
private Integer supplier;
/**
* 供应商位置
*/
......@@ -1582,14 +1575,6 @@ public class Res_partner extends EntityMP implements Serializable {
this.modify("purchase_warn",purchaseWarn);
}
/**
* 设置 [供应商]
*/
public void setSupplier(Integer supplier){
this.supplier = supplier ;
this.modify("supplier",supplier);
}
/**
* 设置 [网站业务伙伴简介]
*/
......
......@@ -92,14 +92,6 @@ public class Res_users extends EntityMP implements Serializable {
@JSONField(name = "message_ids")
@JsonProperty("message_ids")
private String messageIds;
/**
* 安全PIN
*/
@DEField(name = "pos_security_pin")
@TableField(value = "pos_security_pin")
@JSONField(name = "pos_security_pin")
@JsonProperty("pos_security_pin")
private String posSecurityPin;
/**
* 徽章
*/
......@@ -865,13 +857,6 @@ public class Res_users extends EntityMP implements Serializable {
@JSONField(name = "comment")
@JsonProperty("comment")
private String comment;
/**
* 供应商
*/
@TableField(exist = false)
@JSONField(name = "supplier")
@JsonProperty("supplier")
private Integer supplier;
/**
* 网站meta关键词
*/
......@@ -1413,14 +1398,6 @@ public class Res_users extends EntityMP implements Serializable {
/**
* 设置 [安全PIN]
*/
public void setPosSecurityPin(String posSecurityPin){
this.posSecurityPin = posSecurityPin ;
this.modify("pos_security_pin",posSecurityPin);
}
/**
* 设置 [活动达成]
*/
......
......@@ -27,12 +27,264 @@ import cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner;
@Data
public class Res_partnerSearchContext extends QueryWrapperContext<Res_partner> {
private String n_type_eq;//[地址类型]
public void setN_type_eq(String n_type_eq) {
this.n_type_eq = n_type_eq;
if(!ObjectUtils.isEmpty(this.n_type_eq)){
this.getSearchCond().eq("type", n_type_eq);
}
}
private String n_trust_eq;//[对此债务人的信任度]
public void setN_trust_eq(String n_trust_eq) {
this.n_trust_eq = n_trust_eq;
if(!ObjectUtils.isEmpty(this.n_trust_eq)){
this.getSearchCond().eq("trust", n_trust_eq);
}
}
private String n_invoice_warn_eq;//[发票]
public void setN_invoice_warn_eq(String n_invoice_warn_eq) {
this.n_invoice_warn_eq = n_invoice_warn_eq;
if(!ObjectUtils.isEmpty(this.n_invoice_warn_eq)){
this.getSearchCond().eq("invoice_warn", n_invoice_warn_eq);
}
}
private String n_tz_eq;//[时区]
public void setN_tz_eq(String n_tz_eq) {
this.n_tz_eq = n_tz_eq;
if(!ObjectUtils.isEmpty(this.n_tz_eq)){
this.getSearchCond().eq("tz", n_tz_eq);
}
}
private String n_sale_warn_eq;//[销售警告]
public void setN_sale_warn_eq(String n_sale_warn_eq) {
this.n_sale_warn_eq = n_sale_warn_eq;
if(!ObjectUtils.isEmpty(this.n_sale_warn_eq)){
this.getSearchCond().eq("sale_warn", n_sale_warn_eq);
}
}
private String n_picking_warn_eq;//[库存拣货]
public void setN_picking_warn_eq(String n_picking_warn_eq) {
this.n_picking_warn_eq = n_picking_warn_eq;
if(!ObjectUtils.isEmpty(this.n_picking_warn_eq)){
this.getSearchCond().eq("picking_warn", n_picking_warn_eq);
}
}
private String n_purchase_warn_eq;//[采购订单]
public void setN_purchase_warn_eq(String n_purchase_warn_eq) {
this.n_purchase_warn_eq = n_purchase_warn_eq;
if(!ObjectUtils.isEmpty(this.n_purchase_warn_eq)){
this.getSearchCond().eq("purchase_warn", n_purchase_warn_eq);
}
}
private String n_activity_state_eq;//[活动状态]
public void setN_activity_state_eq(String n_activity_state_eq) {
this.n_activity_state_eq = n_activity_state_eq;
if(!ObjectUtils.isEmpty(this.n_activity_state_eq)){
this.getSearchCond().eq("activity_state", n_activity_state_eq);
}
}
private String n_name_like;//[名称]
public void setN_name_like(String n_name_like) {
this.n_name_like = n_name_like;
if(!ObjectUtils.isEmpty(this.n_name_like)){
this.getSearchCond().like("name", n_name_like);
}
}
private String n_company_type_eq;//[公司类别]
public void setN_company_type_eq(String n_company_type_eq) {
this.n_company_type_eq = n_company_type_eq;
if(!ObjectUtils.isEmpty(this.n_company_type_eq)){
this.getSearchCond().eq("company_type", n_company_type_eq);
}
}
private String n_lang_eq;//[语言]
public void setN_lang_eq(String n_lang_eq) {
this.n_lang_eq = n_lang_eq;
if(!ObjectUtils.isEmpty(this.n_lang_eq)){
this.getSearchCond().eq("lang", n_lang_eq);
}
}
private String n_write_uid_text_eq;//[最后更新者]
public void setN_write_uid_text_eq(String n_write_uid_text_eq) {
this.n_write_uid_text_eq = n_write_uid_text_eq;
if(!ObjectUtils.isEmpty(this.n_write_uid_text_eq)){
this.getSearchCond().eq("write_uid_text", n_write_uid_text_eq);
}
}
private String n_write_uid_text_like;//[最后更新者]
public void setN_write_uid_text_like(String n_write_uid_text_like) {
this.n_write_uid_text_like = n_write_uid_text_like;
if(!ObjectUtils.isEmpty(this.n_write_uid_text_like)){
this.getSearchCond().like("write_uid_text", n_write_uid_text_like);
}
}
private String n_title_text_eq;//[称谓]
public void setN_title_text_eq(String n_title_text_eq) {
this.n_title_text_eq = n_title_text_eq;
if(!ObjectUtils.isEmpty(this.n_title_text_eq)){
this.getSearchCond().eq("title_text", n_title_text_eq);
}
}
private String n_title_text_like;//[称谓]
public void setN_title_text_like(String n_title_text_like) {
this.n_title_text_like = n_title_text_like;
if(!ObjectUtils.isEmpty(this.n_title_text_like)){
this.getSearchCond().like("title_text", n_title_text_like);
}
}
private String n_company_id_text_eq;//[公司]
public void setN_company_id_text_eq(String n_company_id_text_eq) {
this.n_company_id_text_eq = n_company_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_company_id_text_eq)){
this.getSearchCond().eq("company_id_text", n_company_id_text_eq);
}
}
private String n_company_id_text_like;//[公司]
public void setN_company_id_text_like(String n_company_id_text_like) {
this.n_company_id_text_like = n_company_id_text_like;
if(!ObjectUtils.isEmpty(this.n_company_id_text_like)){
this.getSearchCond().like("company_id_text", n_company_id_text_like);
}
}
private String n_country_id_text_eq;//[国家/地区]
public void setN_country_id_text_eq(String n_country_id_text_eq) {
this.n_country_id_text_eq = n_country_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_country_id_text_eq)){
this.getSearchCond().eq("country_id_text", n_country_id_text_eq);
}
}
private String n_country_id_text_like;//[国家/地区]
public void setN_country_id_text_like(String n_country_id_text_like) {
this.n_country_id_text_like = n_country_id_text_like;
if(!ObjectUtils.isEmpty(this.n_country_id_text_like)){
this.getSearchCond().like("country_id_text", n_country_id_text_like);
}
}
private String n_state_id_text_eq;//[省/ 州]
public void setN_state_id_text_eq(String n_state_id_text_eq) {
this.n_state_id_text_eq = n_state_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_state_id_text_eq)){
this.getSearchCond().eq("state_id_text", n_state_id_text_eq);
}
}
private String n_state_id_text_like;//[省/ 州]
public void setN_state_id_text_like(String n_state_id_text_like) {
this.n_state_id_text_like = n_state_id_text_like;
if(!ObjectUtils.isEmpty(this.n_state_id_text_like)){
this.getSearchCond().like("state_id_text", n_state_id_text_like);
}
}
private String n_commercial_partner_id_text_eq;//[商业实体]
public void setN_commercial_partner_id_text_eq(String n_commercial_partner_id_text_eq) {
this.n_commercial_partner_id_text_eq = n_commercial_partner_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_commercial_partner_id_text_eq)){
this.getSearchCond().eq("commercial_partner_id_text", n_commercial_partner_id_text_eq);
}
}
private String n_commercial_partner_id_text_like;//[商业实体]
public void setN_commercial_partner_id_text_like(String n_commercial_partner_id_text_like) {
this.n_commercial_partner_id_text_like = n_commercial_partner_id_text_like;
if(!ObjectUtils.isEmpty(this.n_commercial_partner_id_text_like)){
this.getSearchCond().like("commercial_partner_id_text", n_commercial_partner_id_text_like);
}
}
private String n_parent_name_eq;//[上级名称]
public void setN_parent_name_eq(String n_parent_name_eq) {
this.n_parent_name_eq = n_parent_name_eq;
if(!ObjectUtils.isEmpty(this.n_parent_name_eq)){
this.getSearchCond().eq("parent_name", n_parent_name_eq);
}
}
private String n_parent_name_like;//[上级名称]
public void setN_parent_name_like(String n_parent_name_like) {
this.n_parent_name_like = n_parent_name_like;
if(!ObjectUtils.isEmpty(this.n_parent_name_like)){
this.getSearchCond().like("parent_name", n_parent_name_like);
}
}
private String n_user_id_text_eq;//[销售员]
public void setN_user_id_text_eq(String n_user_id_text_eq) {
this.n_user_id_text_eq = n_user_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_user_id_text_eq)){
this.getSearchCond().eq("user_id_text", n_user_id_text_eq);
}
}
private String n_user_id_text_like;//[销售员]
public void setN_user_id_text_like(String n_user_id_text_like) {
this.n_user_id_text_like = n_user_id_text_like;
if(!ObjectUtils.isEmpty(this.n_user_id_text_like)){
this.getSearchCond().like("user_id_text", n_user_id_text_like);
}
}
private String n_create_uid_text_eq;//[创建人]
public void setN_create_uid_text_eq(String n_create_uid_text_eq) {
this.n_create_uid_text_eq = n_create_uid_text_eq;
if(!ObjectUtils.isEmpty(this.n_create_uid_text_eq)){
this.getSearchCond().eq("create_uid_text", n_create_uid_text_eq);
}
}
private String n_create_uid_text_like;//[创建人]
public void setN_create_uid_text_like(String n_create_uid_text_like) {
this.n_create_uid_text_like = n_create_uid_text_like;
if(!ObjectUtils.isEmpty(this.n_create_uid_text_like)){
this.getSearchCond().like("create_uid_text", n_create_uid_text_like);
}
}
private String n_industry_id_text_eq;//[工业]
public void setN_industry_id_text_eq(String n_industry_id_text_eq) {
this.n_industry_id_text_eq = n_industry_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_industry_id_text_eq)){
this.getSearchCond().eq("industry_id_text", n_industry_id_text_eq);
}
}
private String n_industry_id_text_like;//[工业]
public void setN_industry_id_text_like(String n_industry_id_text_like) {
this.n_industry_id_text_like = n_industry_id_text_like;
if(!ObjectUtils.isEmpty(this.n_industry_id_text_like)){
this.getSearchCond().like("industry_id_text", n_industry_id_text_like);
}
}
private String n_team_id_text_eq;//[销售团队]
public void setN_team_id_text_eq(String n_team_id_text_eq) {
this.n_team_id_text_eq = n_team_id_text_eq;
if(!ObjectUtils.isEmpty(this.n_team_id_text_eq)){
this.getSearchCond().eq("team_id_text", n_team_id_text_eq);
}
}
private String n_team_id_text_like;//[销售团队]
public void setN_team_id_text_like(String n_team_id_text_like) {
this.n_team_id_text_like = n_team_id_text_like;
if(!ObjectUtils.isEmpty(this.n_team_id_text_like)){
this.getSearchCond().like("team_id_text", n_team_id_text_like);
}
}
private Long n_team_id_eq;//[销售团队]
public void setN_team_id_eq(Long n_team_id_eq) {
this.n_team_id_eq = n_team_id_eq;
if(!ObjectUtils.isEmpty(this.n_team_id_eq)){
this.getSearchCond().eq("team_id", n_team_id_eq);
}
}
private Long n_state_id_eq;//[省/ 州]
public void setN_state_id_eq(Long n_state_id_eq) {
this.n_state_id_eq = n_state_id_eq;
if(!ObjectUtils.isEmpty(this.n_state_id_eq)){
this.getSearchCond().eq("state_id", n_state_id_eq);
}
}
private Long n_user_id_eq;//[销售员]
public void setN_user_id_eq(Long n_user_id_eq) {
this.n_user_id_eq = n_user_id_eq;
if(!ObjectUtils.isEmpty(this.n_user_id_eq)){
this.getSearchCond().eq("user_id", n_user_id_eq);
}
}
private Long n_create_uid_eq;//[创建人]
public void setN_create_uid_eq(Long n_create_uid_eq) {
this.n_create_uid_eq = n_create_uid_eq;
if(!ObjectUtils.isEmpty(this.n_create_uid_eq)){
this.getSearchCond().eq("create_uid", n_create_uid_eq);
}
}
private Long n_parent_id_eq;//[关联公司]
public void setN_parent_id_eq(Long n_parent_id_eq) {
......@@ -41,6 +293,48 @@ public class Res_partnerSearchContext extends QueryWrapperContext<Res_partner> {
this.getSearchCond().eq("parent_id", n_parent_id_eq);
}
}
private Long n_title_eq;//[称谓]
public void setN_title_eq(Long n_title_eq) {
this.n_title_eq = n_title_eq;
if(!ObjectUtils.isEmpty(this.n_title_eq)){
this.getSearchCond().eq("title", n_title_eq);
}
}
private Long n_write_uid_eq;//[最后更新者]
public void setN_write_uid_eq(Long n_write_uid_eq) {
this.n_write_uid_eq = n_write_uid_eq;
if(!ObjectUtils.isEmpty(this.n_write_uid_eq)){
this.getSearchCond().eq("write_uid", n_write_uid_eq);
}
}
private Long n_commercial_partner_id_eq;//[商业实体]
public void setN_commercial_partner_id_eq(Long n_commercial_partner_id_eq) {
this.n_commercial_partner_id_eq = n_commercial_partner_id_eq;
if(!ObjectUtils.isEmpty(this.n_commercial_partner_id_eq)){
this.getSearchCond().eq("commercial_partner_id", n_commercial_partner_id_eq);
}
}
private Long n_industry_id_eq;//[工业]
public void setN_industry_id_eq(Long n_industry_id_eq) {
this.n_industry_id_eq = n_industry_id_eq;
if(!ObjectUtils.isEmpty(this.n_industry_id_eq)){
this.getSearchCond().eq("industry_id", n_industry_id_eq);
}
}
private Long n_company_id_eq;//[公司]
public void setN_company_id_eq(Long n_company_id_eq) {
this.n_company_id_eq = n_company_id_eq;
if(!ObjectUtils.isEmpty(this.n_company_id_eq)){
this.getSearchCond().eq("company_id", n_company_id_eq);
}
}
private Long n_country_id_eq;//[国家/地区]
public void setN_country_id_eq(Long n_country_id_eq) {
this.n_country_id_eq = n_country_id_eq;
if(!ObjectUtils.isEmpty(this.n_country_id_eq)){
this.getSearchCond().eq("country_id", n_country_id_eq);
}
}
/**
* 启用快速搜索
......
......@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
public interface Res_partnerMapper extends BaseMapper<Res_partner>{
Page<Res_partner> searchDefault(IPage page, @Param("srf") Res_partnerSearchContext context, @Param("ew") Wrapper<Res_partner> wrapper) ;
@Override
Res_partner selectById(Serializable id);
@Override
......@@ -61,4 +62,26 @@ public interface Res_partnerMapper extends BaseMapper<Res_partner>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<Res_partner> selectByTeamId(@Param("id") Serializable id) ;
List<Res_partner> selectByCompanyId(@Param("id") Serializable id) ;
List<Res_partner> selectByStateId(@Param("id") Serializable id) ;
List<Res_partner> selectByCountryId(@Param("id") Serializable id) ;
List<Res_partner> selectByIndustryId(@Param("id") Serializable id) ;
List<Res_partner> selectByTitle(@Param("id") Serializable id) ;
List<Res_partner> selectByCommercialPartnerId(@Param("id") Serializable id) ;
List<Res_partner> selectByParentId(@Param("id") Serializable id) ;
List<Res_partner> selectByCreateUid(@Param("id") Serializable id) ;
List<Res_partner> selectByUserId(@Param("id") Serializable id) ;
List<Res_partner> selectByWriteUid(@Param("id") Serializable id) ;
}
......@@ -33,6 +33,33 @@ public interface IRes_partnerService extends IService<Res_partner>{
boolean remove(Long key) ;
void removeBatch(Collection<Long> idList) ;
Res_partner get(Long key) ;
Res_partner getDraft(Res_partner et) ;
boolean checkKey(Res_partner et) ;
boolean save(Res_partner et) ;
void saveBatch(List<Res_partner> list) ;
Page<Res_partner> searchDefault(Res_partnerSearchContext context) ;
List<Res_partner> selectByTeamId(Long id) ;
void removeByTeamId(Long id) ;
List<Res_partner> selectByCompanyId(Long id) ;
void removeByCompanyId(Long id) ;
List<Res_partner> selectByStateId(Long id) ;
void removeByStateId(Long id) ;
List<Res_partner> selectByCountryId(Long id) ;
void removeByCountryId(Long id) ;
List<Res_partner> selectByIndustryId(Long id) ;
void removeByIndustryId(Long id) ;
List<Res_partner> selectByTitle(Long id) ;
void removeByTitle(Long id) ;
List<Res_partner> selectByCommercialPartnerId(Long id) ;
void removeByCommercialPartnerId(Long id) ;
List<Res_partner> selectByParentId(Long id) ;
void removeByParentId(Long id) ;
List<Res_partner> selectByCreateUid(Long id) ;
void removeByCreateUid(Long id) ;
List<Res_partner> selectByUserId(Long id) ;
void removeByUserId(Long id) ;
List<Res_partner> selectByWriteUid(Long id) ;
void removeByWriteUid(Long id) ;
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
......@@ -359,7 +359,169 @@ public class Res_partnerServiceImpl extends ServiceImpl<Res_partnerMapper, Res_p
return et;
}
@Override
public Res_partner getDraft(Res_partner et) {
fillParentData(et);
return et;
}
@Override
public boolean checkKey(Res_partner et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
public boolean save(Res_partner et) {
if(!saveOrUpdate(et))
return false;
return true;
}
@Override
@Transactional
public boolean saveOrUpdate(Res_partner et) {
if (null == et) {
return false;
} else {
return checkKey(et) ? this.update(et) : this.create(et);
}
}
@Override
@Transactional
public boolean saveBatch(Collection<Res_partner> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
return true;
}
@Override
@Transactional
public void saveBatch(List<Res_partner> list) {
list.forEach(item->fillParentData(item));
saveOrUpdateBatch(list,batchSize);
}
@Override
public List<Res_partner> selectByTeamId(Long id) {
return baseMapper.selectByTeamId(id);
}
@Override
public void removeByTeamId(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("team_id",id));
}
@Override
public List<Res_partner> selectByCompanyId(Long id) {
return baseMapper.selectByCompanyId(id);
}
@Override
public void removeByCompanyId(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("company_id",id));
}
@Override
public List<Res_partner> selectByStateId(Long id) {
return baseMapper.selectByStateId(id);
}
@Override
public void removeByStateId(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("state_id",id));
}
@Override
public List<Res_partner> selectByCountryId(Long id) {
return baseMapper.selectByCountryId(id);
}
@Override
public void removeByCountryId(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("country_id",id));
}
@Override
public List<Res_partner> selectByIndustryId(Long id) {
return baseMapper.selectByIndustryId(id);
}
@Override
public void removeByIndustryId(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("industry_id",id));
}
@Override
public List<Res_partner> selectByTitle(Long id) {
return baseMapper.selectByTitle(id);
}
@Override
public void removeByTitle(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("title",id));
}
@Override
public List<Res_partner> selectByCommercialPartnerId(Long id) {
return baseMapper.selectByCommercialPartnerId(id);
}
@Override
public void removeByCommercialPartnerId(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("commercial_partner_id",id));
}
@Override
public List<Res_partner> selectByParentId(Long id) {
return baseMapper.selectByParentId(id);
}
@Override
public void removeByParentId(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("parent_id",id));
}
@Override
public List<Res_partner> selectByCreateUid(Long id) {
return baseMapper.selectByCreateUid(id);
}
@Override
public void removeByCreateUid(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("create_uid",id));
}
@Override
public List<Res_partner> selectByUserId(Long id) {
return baseMapper.selectByUserId(id);
}
@Override
public void removeByUserId(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("user_id",id));
}
@Override
public List<Res_partner> selectByWriteUid(Long id) {
return baseMapper.selectByWriteUid(id);
}
@Override
public void removeByWriteUid(Long id) {
this.remove(new QueryWrapper<Res_partner>().eq("write_uid",id));
}
/**
* 查询集合 数据集
*/
@Override
public Page<Res_partner> searchDefault(Res_partnerSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<Res_partner> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
return new PageImpl<Res_partner>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
......
......@@ -1424,7 +1424,6 @@ public class Res_usersServiceImpl extends ServiceImpl<Res_usersMapper, Res_users
et.setVat(odooPartner.getVat());
et.setPurchaseWarnMsg(odooPartner.getPurchaseWarnMsg());
et.setComment(odooPartner.getComment());
et.setSupplier(odooPartner.getSupplier());
et.setWebsiteMetaKeywords(odooPartner.getWebsiteMetaKeywords());
et.setParentId(odooPartner.getParentId());
et.setPurchaseWarn(odooPartner.getPurchaseWarn());
......
......@@ -4,6 +4,9 @@
<mapper namespace="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_partnerMapper">
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="Res_partnerResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.ACTIVE, t1.ADDITIONAL_INFO, t1.BARCODE, t1.CALENDAR_LAST_NOTIF_ACK, t1.CITY, t1.COLOR, t1.COMMENT, t1.COMMERCIAL_COMPANY_NAME, t1.COMMERCIAL_PARTNER_ID, t81.NAME AS COMMERCIAL_PARTNER_ID_TEXT, t1.COMPANY_ID, t51.NAME AS COMPANY_ID_TEXT, t1.COMPANY_NAME, t1.COUNTRY_ID, t61.NAME AS COUNTRY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t131.NAME AS CREATE_UID_TEXT, t1.CREDIT_LIMIT, t1.DATE, t1.DEBIT_LIMIT, t1.DISPLAY_NAME, t1.EMAIL, t1.EMPLOYEE, t1.FUNCTION AS IBIZFUNCTION, t1.ID, t1.INDUSTRY_ID, t141.NAME AS INDUSTRY_ID_TEXT, t1.INVOICE_WARN, t1.INVOICE_WARN_MSG, t1.IS_COMPANY, t1.IS_PUBLISHED, t1.LANG, t1.LAST_TIME_ENTRIES_CHECKED, t1.MESSAGE_BOUNCE, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.MOBILE, t1.NAME, t1.PARENT_ID, t91.NAME AS PARENT_NAME, t1.PARTNER_GID, t1.PARTNER_SHARE, t1.PHONE, t1.PICKING_WARN, t1.PICKING_WARN_MSG, t1.PURCHASE_WARN, t1.PURCHASE_WARN_MSG, t1.REF, t1.SALE_WARN, t1.SALE_WARN_MSG, t1.SIGNUP_EXPIRATION, t1.SIGNUP_TOKEN, t1.SIGNUP_TYPE, t1.STATE_ID, t71.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TEAM_ID, t151.NAME AS TEAM_ID_TEXT, t1.TITLE, t31.NAME AS TITLE_TEXT, t1.TYPE, t1.TZ, t1.USER_ID, t111.NAME AS USER_ID_TEXT, t1.VAT, t1.WEBSITE, t1.WEBSITE_DESCRIPTION, t1.WEBSITE_ID, t1.WEBSITE_META_DESCRIPTION, t1.WEBSITE_META_KEYWORDS, t1.WEBSITE_META_OG_IMG, t1.WEBSITE_META_TITLE, t1.WEBSITE_SHORT_DESCRIPTION, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UID_TEXT, t1.ZIP FROM RES_PARTNER t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER_TITLE t31 ON t1.TITLE = t31.ID LEFT JOIN RES_COMPANY t41 ON t1.COMPANY_ID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_COUNTRY t61 ON t1.COUNTRY_ID = t61.ID LEFT JOIN RES_COUNTRY_STATE t71 ON t1.STATE_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t1.COMMERCIAL_PARTNER_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t1.PARENT_ID = t91.ID LEFT JOIN RES_USERS t101 ON t1.USER_ID = t101.ID LEFT JOIN RES_PARTNER t111 ON t101.PARTNER_ID = t111.ID LEFT JOIN RES_USERS t121 ON t1.CREATE_UID = t121.ID LEFT JOIN RES_PARTNER t131 ON t121.PARTNER_ID = t131.ID LEFT JOIN RES_PARTNER_INDUSTRY t141 ON t1.INDUSTRY_ID = t141.ID LEFT JOIN CRM_TEAM t151 ON t1.TEAM_ID = t151.ID ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="Res_partnerResultMap" type="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner" autoMapping="true">
......@@ -162,16 +165,101 @@
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__CRM_TEAM__TEAM_ID] -->
<select id="selectByTeamId" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where team_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_COMPANY__COMPANY_ID] -->
<select id="selectByCompanyId" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where company_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_COUNTRY_STATE__STATE_ID] -->
<select id="selectByStateId" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where state_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_COUNTRY__COUNTRY_ID] -->
<select id="selectByCountryId" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where country_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_PARTNER_INDUSTRY__INDUSTRY_ID] -->
<select id="selectByIndustryId" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where industry_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_PARTNER_TITLE__TITLE] -->
<select id="selectByTitle" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where title=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_PARTNER__COMMERCIAL_PARTNER_ID] -->
<select id="selectByCommercialPartnerId" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where commercial_partner_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_PARTNER__PARENT_ID] -->
<select id="selectByParentId" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where parent_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_USERS__CREATE_UID] -->
<select id="selectByCreateUid" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where create_uid=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_USERS__USER_ID] -->
<select id="selectByUserId" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where user_id=#{id}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RES_PARTNER__RES_USERS__WRITE_UID] -->
<select id="selectByWriteUid" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
) t1
where write_uid=#{id}
</select>
<!--数据集合[Default]-->
<select id="searchDefault" parameterType="cn.ibizlab.businesscentral.core.odoo_base.filter.Res_partnerSearchContext" resultMap="Res_partnerResultMap">
select t1.* from (
<include refid="Default" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTIVE, t1.ADDITIONAL_INFO, t1.BARCODE, t1.CALENDAR_LAST_NOTIF_ACK, t1.CITY, t1.COLOR, t1.COMMERCIAL_COMPANY_NAME, t1.COMMERCIAL_PARTNER_ID, t81.NAME AS COMMERCIAL_PARTNER_ID_TEXT, t1.COMPANY_ID, t51.NAME AS COMPANY_ID_TEXT, t1.COMPANY_NAME, t1.COUNTRY_ID, t61.NAME AS COUNTRY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t131.NAME AS CREATE_UID_TEXT, t1.CREDIT_LIMIT, t1.DATE, t1.DEBIT_LIMIT, t1.DISPLAY_NAME, t1.EMAIL, t1.EMPLOYEE, t1.FUNCTION AS IBIZFUNCTION, t1.ID, t1.INDUSTRY_ID, t141.NAME AS INDUSTRY_ID_TEXT, t1.INVOICE_WARN, t1.IS_COMPANY, t1.IS_PUBLISHED, t1.LANG, t1.LAST_TIME_ENTRIES_CHECKED, t1.MESSAGE_BOUNCE, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.MOBILE, t1.NAME, t1.PARENT_ID, t91.NAME AS PARENT_NAME, t1.PARTNER_GID, t1.PARTNER_SHARE, t1.PHONE, t1.PICKING_WARN, t1.PURCHASE_WARN, t1.REF, t1.SALE_WARN, t1.SIGNUP_EXPIRATION, t1.SIGNUP_TOKEN, t1.SIGNUP_TYPE, t1.STATE_ID, t71.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TEAM_ID, t151.NAME AS TEAM_ID_TEXT, t1.TITLE, t31.NAME AS TITLE_TEXT, t1.TYPE, t1.TZ, t1.USER_ID, t111.NAME AS USER_ID_TEXT, t1.VAT, t1.WEBSITE, t1.WEBSITE_ID, t1.WEBSITE_META_KEYWORDS, t1.WEBSITE_META_OG_IMG, t1.WEBSITE_META_TITLE, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UID_TEXT, t1.ZIP FROM RES_PARTNER t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER_TITLE t31 ON t1.TITLE = t31.ID LEFT JOIN RES_COMPANY t41 ON t1.COMPANY_ID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_COUNTRY t61 ON t1.COUNTRY_ID = t61.ID LEFT JOIN RES_COUNTRY_STATE t71 ON t1.STATE_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t1.COMMERCIAL_PARTNER_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t1.PARENT_ID = t91.ID LEFT JOIN RES_USERS t101 ON t1.USER_ID = t101.ID LEFT JOIN RES_PARTNER t111 ON t101.PARTNER_ID = t111.ID LEFT JOIN RES_USERS t121 ON t1.CREATE_UID = t121.ID LEFT JOIN RES_PARTNER t131 ON t121.PARTNER_ID = t131.ID LEFT JOIN RES_PARTNER_INDUSTRY t141 ON t1.INDUSTRY_ID = t141.ID LEFT JOIN CRM_TEAM t151 ON t1.TEAM_ID = t151.ID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTIVE, t1.ADDITIONAL_INFO, t1.BARCODE, t1.CALENDAR_LAST_NOTIF_ACK, t1.CITY, t1.COLOR, t1.COMMENT, t1.COMMERCIAL_COMPANY_NAME, t1.COMMERCIAL_PARTNER_ID, t81.NAME AS COMMERCIAL_PARTNER_ID_TEXT, t1.COMPANY_ID, t51.NAME AS COMPANY_ID_TEXT, t1.COMPANY_NAME, t1.COUNTRY_ID, t61.NAME AS COUNTRY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t131.NAME AS CREATE_UID_TEXT, t1.CREDIT_LIMIT, t1.DATE, t1.DEBIT_LIMIT, t1.DISPLAY_NAME, t1.EMAIL, t1.EMPLOYEE, t1.FUNCTION AS IBIZFUNCTION, t1.ID, t1.INDUSTRY_ID, t141.NAME AS INDUSTRY_ID_TEXT, t1.INVOICE_WARN, t1.INVOICE_WARN_MSG, t1.IS_COMPANY, t1.IS_PUBLISHED, t1.LANG, t1.LAST_TIME_ENTRIES_CHECKED, t1.MESSAGE_BOUNCE, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.MOBILE, t1.NAME, t1.PARENT_ID, t91.NAME AS PARENT_NAME, t1.PARTNER_GID, t1.PARTNER_SHARE, t1.PHONE, t1.PICKING_WARN, t1.PICKING_WARN_MSG, t1.PURCHASE_WARN, t1.PURCHASE_WARN_MSG, t1.REF, t1.SALE_WARN, t1.SALE_WARN_MSG, t1.SIGNUP_EXPIRATION, t1.SIGNUP_TOKEN, t1.SIGNUP_TYPE, t1.STATE_ID, t71.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TEAM_ID, t151.NAME AS TEAM_ID_TEXT, t1.TITLE, t31.NAME AS TITLE_TEXT, t1.TYPE, t1.TZ, t1.USER_ID, t111.NAME AS USER_ID_TEXT, t1.VAT, t1.WEBSITE, t1.WEBSITE_DESCRIPTION, t1.WEBSITE_ID, t1.WEBSITE_META_DESCRIPTION, t1.WEBSITE_META_KEYWORDS, t1.WEBSITE_META_OG_IMG, t1.WEBSITE_META_TITLE, t1.WEBSITE_SHORT_DESCRIPTION, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UID_TEXT, t1.ZIP FROM RES_PARTNER t1 LEFT JOIN RES_USERS t11 ON t1.WRITE_UID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID LEFT JOIN RES_PARTNER_TITLE t31 ON t1.TITLE = t31.ID LEFT JOIN RES_COMPANY t41 ON t1.COMPANY_ID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_COUNTRY t61 ON t1.COUNTRY_ID = t61.ID LEFT JOIN RES_COUNTRY_STATE t71 ON t1.STATE_ID = t71.ID LEFT JOIN RES_PARTNER t81 ON t1.COMMERCIAL_PARTNER_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t1.PARENT_ID = t91.ID LEFT JOIN RES_USERS t101 ON t1.USER_ID = t101.ID LEFT JOIN RES_PARTNER t111 ON t101.PARTNER_ID = t111.ID LEFT JOIN RES_USERS t121 ON t1.CREATE_UID = t121.ID LEFT JOIN RES_PARTNER t131 ON t121.PARTNER_ID = t131.ID LEFT JOIN RES_PARTNER_INDUSTRY t141 ON t1.INDUSTRY_ID = t141.ID LEFT JOIN CRM_TEAM t151 ON t1.TEAM_ID = t151.ID
]]>
</sql>
</mapper>
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="Res_usersResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.ACTION_ID, t1.ACTIVE, t11.ACTIVE AS ACTIVE_PARTNER, t11.ADDITIONAL_INFO, t101.ALIAS_CONTACT, t1.ALIAS_ID, t11.BARCODE, t11.CALENDAR_LAST_NOTIF_ACK, t11.CITY, t11.COLOR, t11.COMMENT, t11.COMMERCIAL_COMPANY_NAME, t11.COMMERCIAL_PARTNER_ID, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t11.COMPANY_NAME, t11.COUNTRY_ID, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t11.CREDIT_LIMIT, t11.DATE, t11.DEBIT_LIMIT, t11.EMAIL, t11.EMPLOYEE, t11.IBIZFUNCTION, t1.ID, t11.INDUSTRY_ID, t11.INVOICE_WARN, t11.INVOICE_WARN_MSG, t11.IS_COMPANY, t11.IS_PUBLISHED, t1.KARMA, t11.LANG, t11.LAST_TIME_ENTRIES_CHECKED, t1.LOGIN, t11.MESSAGE_BOUNCE, t11.MESSAGE_MAIN_ATTACHMENT_ID, t11.MOBILE, t11.NAME, t1.NOTIFICATION_TYPE, t1.ODOOBOT_STATE, t11.PARENT_ID, t21.NAME AS PARENT_NAME, t11.PARTNER_GID, t1.PARTNER_ID, t11.PARTNER_SHARE, t11.PHONE, t11.PICKING_WARN, t11.PICKING_WARN_MSG, t1.POS_SECURITY_PIN, t11.PURCHASE_WARN, t11.PURCHASE_WARN_MSG, t11.REF, t1.SALE_TEAM_ID, t31.NAME AS SALE_TEAM_ID_TEXT, t11.SALE_WARN, t11.SALE_WARN_MSG, t1.SHARE, t1.SIGNATURE, t11.SIGNUP_EXPIRATION, t11.SIGNUP_TOKEN, t11.SIGNUP_TYPE, t11.STATE_ID, t11.STREET, t11.STREET2, t11.SUPPLIER, t1.TARGET_SALES_DONE, t1.TARGET_SALES_INVOICED, t1.TARGET_SALES_WON, t11.TEAM_ID, t11.TITLE, t11.TYPE, t11.TZ, t11.USER_ID, t11.VAT, t11.WEBSITE, t11.WEBSITE_DESCRIPTION, t1.WEBSITE_ID, t11.WEBSITE_META_DESCRIPTION, t11.WEBSITE_META_KEYWORDS, t11.WEBSITE_META_OG_IMG, t11.WEBSITE_META_TITLE, t11.WEBSITE_SHORT_DESCRIPTION, t1.WRITE_DATE, t1.WRITE_UID, t51.NAME AS WRITE_UID_TEXT, t11.ZIP FROM RES_USERS t1 LEFT JOIN RES_PARTNER t11 ON t1.PARTNER_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARENT_ID = t21.ID LEFT JOIN CRM_TEAM t31 ON t1.SALE_TEAM_ID = t31.ID LEFT JOIN RES_USERS t41 ON t1.WRITE_UID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID LEFT JOIN MAIL_ALIAS t101 ON t1.ALIAS_ID = t101.ID ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.ACTION_ID, t1.ACTIVE, t11.ACTIVE AS ACTIVE_PARTNER, t11.ADDITIONAL_INFO, t101.ALIAS_CONTACT, t1.ALIAS_ID, t11.BARCODE, t11.CALENDAR_LAST_NOTIF_ACK, t11.CITY, t11.COLOR, t11.COMMENT, t11.COMMERCIAL_COMPANY_NAME, t11.COMMERCIAL_PARTNER_ID, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t11.COMPANY_NAME, t11.COUNTRY_ID, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t11.CREDIT_LIMIT, t11.DATE, t11.DEBIT_LIMIT, t11.EMAIL, t11.EMPLOYEE, t11.FUNCTION AS IBIZFUNCTION, t1.ID, t11.INDUSTRY_ID, t11.INVOICE_WARN, t11.INVOICE_WARN_MSG, t11.IS_COMPANY, t11.IS_PUBLISHED, t1.KARMA, t11.LANG, t11.LAST_TIME_ENTRIES_CHECKED, t1.LOGIN, t11.MESSAGE_BOUNCE, t11.MESSAGE_MAIN_ATTACHMENT_ID, t11.MOBILE, t11.NAME, t1.NOTIFICATION_TYPE, t1.ODOOBOT_STATE, t11.PARENT_ID, t21.NAME AS PARENT_NAME, t11.PARTNER_GID, t1.PARTNER_ID, t11.PARTNER_SHARE, t11.PHONE, t11.PICKING_WARN, t11.PICKING_WARN_MSG, t11.PURCHASE_WARN, t11.PURCHASE_WARN_MSG, t11.REF, t1.SALE_TEAM_ID, t31.NAME AS SALE_TEAM_ID_TEXT, t11.SALE_WARN, t11.SALE_WARN_MSG, t1.SHARE, t1.SIGNATURE, t11.SIGNUP_EXPIRATION, t11.SIGNUP_TOKEN, t11.SIGNUP_TYPE, t11.STATE_ID, t11.STREET, t11.STREET2, t1.TARGET_SALES_DONE, t1.TARGET_SALES_INVOICED, t1.TARGET_SALES_WON, t11.TEAM_ID, t11.TITLE, t11.TYPE, t11.TZ, t11.USER_ID, t11.VAT, t11.WEBSITE, t11.WEBSITE_DESCRIPTION, t1.WEBSITE_ID, t11.WEBSITE_META_DESCRIPTION, t11.WEBSITE_META_KEYWORDS, t11.WEBSITE_META_OG_IMG, t11.WEBSITE_META_TITLE, t11.WEBSITE_SHORT_DESCRIPTION, t1.WRITE_DATE, t1.WRITE_UID, t51.NAME AS WRITE_UID_TEXT, t11.ZIP FROM RES_USERS t1 LEFT JOIN RES_PARTNER t11 ON t1.PARTNER_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARENT_ID = t21.ID LEFT JOIN CRM_TEAM t31 ON t1.SALE_TEAM_ID = t31.ID LEFT JOIN RES_USERS t41 ON t1.WRITE_UID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID LEFT JOIN MAIL_ALIAS t101 ON t1.ALIAS_ID = t101.ID ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -18,7 +18,6 @@
<result property="resourceCalendarId" column="resource_calendar_id" />
<result property="logIds" column="log_ids" />
<result property="messageIds" column="message_ids" />
<result property="posSecurityPin" column="pos_security_pin" />
<result property="badgeIds" column="badge_ids" />
<result property="writeDate" column="write_date" />
<result property="companyIds" column="company_ids" />
......@@ -231,12 +230,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTION_ID, t1.ACTIVE, t11.ACTIVE AS ACTIVE_PARTNER, t11.ADDITIONAL_INFO, t101.ALIAS_CONTACT, t1.ALIAS_ID, t11.BARCODE, t11.CALENDAR_LAST_NOTIF_ACK, t11.CITY, t11.COLOR, t11.COMMERCIAL_COMPANY_NAME, t11.COMMERCIAL_PARTNER_ID, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t11.COMPANY_NAME, t11.COUNTRY_ID, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t11.CREDIT_LIMIT, t11.DATE, t11.DEBIT_LIMIT, t11.EMAIL, t11.EMPLOYEE, t11.IBIZFUNCTION, t1.ID, t11.INDUSTRY_ID, t11.INVOICE_WARN, t11.IS_COMPANY, t11.IS_PUBLISHED, t1.KARMA, t11.LANG, t11.LAST_TIME_ENTRIES_CHECKED, t1.LOGIN, t11.MESSAGE_BOUNCE, t11.MESSAGE_MAIN_ATTACHMENT_ID, t11.MOBILE, t11.NAME, t1.NOTIFICATION_TYPE, t1.ODOOBOT_STATE, t11.PARENT_ID, t21.NAME AS PARENT_NAME, t11.PARTNER_GID, t1.PARTNER_ID, t11.PARTNER_SHARE, t11.PHONE, t11.PICKING_WARN, t1.POS_SECURITY_PIN, t11.PURCHASE_WARN, t11.REF, t1.SALE_TEAM_ID, t31.NAME AS SALE_TEAM_ID_TEXT, t11.SALE_WARN, t1.SHARE, t11.SIGNUP_EXPIRATION, t11.SIGNUP_TOKEN, t11.SIGNUP_TYPE, t11.STATE_ID, t11.STREET, t11.STREET2, t11.SUPPLIER, t1.TARGET_SALES_DONE, t1.TARGET_SALES_INVOICED, t1.TARGET_SALES_WON, t11.TEAM_ID, t11.TITLE, t11.TYPE, t11.TZ, t11.USER_ID, t11.VAT, t11.WEBSITE, t1.WEBSITE_ID, t11.WEBSITE_META_KEYWORDS, t11.WEBSITE_META_OG_IMG, t11.WEBSITE_META_TITLE, t1.WRITE_DATE, t1.WRITE_UID, t51.NAME AS WRITE_UID_TEXT, t11.ZIP FROM RES_USERS t1 LEFT JOIN RES_PARTNER t11 ON t1.PARTNER_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARENT_ID = t21.ID LEFT JOIN CRM_TEAM t31 ON t1.SALE_TEAM_ID = t31.ID LEFT JOIN RES_USERS t41 ON t1.WRITE_UID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID LEFT JOIN MAIL_ALIAS t101 ON t1.ALIAS_ID = t101.ID
<![CDATA[ SELECT t1.ACTION_ID, t1.ACTIVE, t11.ACTIVE AS ACTIVE_PARTNER, t11.ADDITIONAL_INFO, t101.ALIAS_CONTACT, t1.ALIAS_ID, t11.BARCODE, t11.CALENDAR_LAST_NOTIF_ACK, t11.CITY, t11.COLOR, t11.COMMERCIAL_COMPANY_NAME, t11.COMMERCIAL_PARTNER_ID, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t11.COMPANY_NAME, t11.COUNTRY_ID, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t11.CREDIT_LIMIT, t11.DATE, t11.DEBIT_LIMIT, t11.EMAIL, t11.EMPLOYEE, t11.FUNCTION AS IBIZFUNCTION, t1.ID, t11.INDUSTRY_ID, t11.INVOICE_WARN, t11.IS_COMPANY, t11.IS_PUBLISHED, t1.KARMA, t11.LANG, t11.LAST_TIME_ENTRIES_CHECKED, t1.LOGIN, t11.MESSAGE_BOUNCE, t11.MESSAGE_MAIN_ATTACHMENT_ID, t11.MOBILE, t11.NAME, t1.NOTIFICATION_TYPE, t1.ODOOBOT_STATE, t11.PARENT_ID, t21.NAME AS PARENT_NAME, t11.PARTNER_GID, t1.PARTNER_ID, t11.PARTNER_SHARE, t11.PHONE, t11.PICKING_WARN, t11.PURCHASE_WARN, t11.REF, t1.SALE_TEAM_ID, t31.NAME AS SALE_TEAM_ID_TEXT, t11.SALE_WARN, t1.SHARE, t11.SIGNUP_EXPIRATION, t11.SIGNUP_TOKEN, t11.SIGNUP_TYPE, t11.STATE_ID, t11.STREET, t11.STREET2, t1.TARGET_SALES_DONE, t1.TARGET_SALES_INVOICED, t1.TARGET_SALES_WON, t11.TEAM_ID, t11.TITLE, t11.TYPE, t11.TZ, t11.USER_ID, t11.VAT, t11.WEBSITE, t1.WEBSITE_ID, t11.WEBSITE_META_KEYWORDS, t11.WEBSITE_META_OG_IMG, t11.WEBSITE_META_TITLE, t1.WRITE_DATE, t1.WRITE_UID, t51.NAME AS WRITE_UID_TEXT, t11.ZIP FROM RES_USERS t1 LEFT JOIN RES_PARTNER t11 ON t1.PARTNER_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARENT_ID = t21.ID LEFT JOIN CRM_TEAM t31 ON t1.SALE_TEAM_ID = t31.ID LEFT JOIN RES_USERS t41 ON t1.WRITE_UID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID LEFT JOIN MAIL_ALIAS t101 ON t1.ALIAS_ID = t101.ID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.ACTION_ID, t1.ACTIVE, t11.ACTIVE AS ACTIVE_PARTNER, t11.ADDITIONAL_INFO, t101.ALIAS_CONTACT, t1.ALIAS_ID, t11.BARCODE, t11.CALENDAR_LAST_NOTIF_ACK, t11.CITY, t11.COLOR, t11.COMMENT, t11.COMMERCIAL_COMPANY_NAME, t11.COMMERCIAL_PARTNER_ID, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t11.COMPANY_NAME, t11.COUNTRY_ID, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t11.CREDIT_LIMIT, t11.DATE, t11.DEBIT_LIMIT, t11.EMAIL, t11.EMPLOYEE, t11.IBIZFUNCTION, t1.ID, t11.INDUSTRY_ID, t11.INVOICE_WARN, t11.INVOICE_WARN_MSG, t11.IS_COMPANY, t11.IS_PUBLISHED, t1.KARMA, t11.LANG, t11.LAST_TIME_ENTRIES_CHECKED, t1.LOGIN, t11.MESSAGE_BOUNCE, t11.MESSAGE_MAIN_ATTACHMENT_ID, t11.MOBILE, t11.NAME, t1.NOTIFICATION_TYPE, t1.ODOOBOT_STATE, t11.PARENT_ID, t21.NAME AS PARENT_NAME, t11.PARTNER_GID, t1.PARTNER_ID, t11.PARTNER_SHARE, t11.PHONE, t11.PICKING_WARN, t11.PICKING_WARN_MSG, t1.POS_SECURITY_PIN, t11.PURCHASE_WARN, t11.PURCHASE_WARN_MSG, t11.REF, t1.SALE_TEAM_ID, t31.NAME AS SALE_TEAM_ID_TEXT, t11.SALE_WARN, t11.SALE_WARN_MSG, t1.SHARE, t1.SIGNATURE, t11.SIGNUP_EXPIRATION, t11.SIGNUP_TOKEN, t11.SIGNUP_TYPE, t11.STATE_ID, t11.STREET, t11.STREET2, t11.SUPPLIER, t1.TARGET_SALES_DONE, t1.TARGET_SALES_INVOICED, t1.TARGET_SALES_WON, t11.TEAM_ID, t11.TITLE, t11.TYPE, t11.TZ, t11.USER_ID, t11.VAT, t11.WEBSITE, t11.WEBSITE_DESCRIPTION, t1.WEBSITE_ID, t11.WEBSITE_META_DESCRIPTION, t11.WEBSITE_META_KEYWORDS, t11.WEBSITE_META_OG_IMG, t11.WEBSITE_META_TITLE, t11.WEBSITE_SHORT_DESCRIPTION, t1.WRITE_DATE, t1.WRITE_UID, t51.NAME AS WRITE_UID_TEXT, t11.ZIP FROM RES_USERS t1 LEFT JOIN RES_PARTNER t11 ON t1.PARTNER_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARENT_ID = t21.ID LEFT JOIN CRM_TEAM t31 ON t1.SALE_TEAM_ID = t31.ID LEFT JOIN RES_USERS t41 ON t1.WRITE_UID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID LEFT JOIN MAIL_ALIAS t101 ON t1.ALIAS_ID = t101.ID
<![CDATA[ SELECT t1.ACTION_ID, t1.ACTIVE, t11.ACTIVE AS ACTIVE_PARTNER, t11.ADDITIONAL_INFO, t101.ALIAS_CONTACT, t1.ALIAS_ID, t11.BARCODE, t11.CALENDAR_LAST_NOTIF_ACK, t11.CITY, t11.COLOR, t11.COMMENT, t11.COMMERCIAL_COMPANY_NAME, t11.COMMERCIAL_PARTNER_ID, t1.COMPANY_ID, t91.NAME AS COMPANY_ID_TEXT, t11.COMPANY_NAME, t11.COUNTRY_ID, t1.CREATE_DATE, t1.CREATE_UID, t71.NAME AS CREATE_UID_TEXT, t11.CREDIT_LIMIT, t11.DATE, t11.DEBIT_LIMIT, t11.EMAIL, t11.EMPLOYEE, t11.FUNCTION AS IBIZFUNCTION, t1.ID, t11.INDUSTRY_ID, t11.INVOICE_WARN, t11.INVOICE_WARN_MSG, t11.IS_COMPANY, t11.IS_PUBLISHED, t1.KARMA, t11.LANG, t11.LAST_TIME_ENTRIES_CHECKED, t1.LOGIN, t11.MESSAGE_BOUNCE, t11.MESSAGE_MAIN_ATTACHMENT_ID, t11.MOBILE, t11.NAME, t1.NOTIFICATION_TYPE, t1.ODOOBOT_STATE, t11.PARENT_ID, t21.NAME AS PARENT_NAME, t11.PARTNER_GID, t1.PARTNER_ID, t11.PARTNER_SHARE, t11.PHONE, t11.PICKING_WARN, t11.PICKING_WARN_MSG, t11.PURCHASE_WARN, t11.PURCHASE_WARN_MSG, t11.REF, t1.SALE_TEAM_ID, t31.NAME AS SALE_TEAM_ID_TEXT, t11.SALE_WARN, t11.SALE_WARN_MSG, t1.SHARE, t1.SIGNATURE, t11.SIGNUP_EXPIRATION, t11.SIGNUP_TOKEN, t11.SIGNUP_TYPE, t11.STATE_ID, t11.STREET, t11.STREET2, t1.TARGET_SALES_DONE, t1.TARGET_SALES_INVOICED, t1.TARGET_SALES_WON, t11.TEAM_ID, t11.TITLE, t11.TYPE, t11.TZ, t11.USER_ID, t11.VAT, t11.WEBSITE, t11.WEBSITE_DESCRIPTION, t1.WEBSITE_ID, t11.WEBSITE_META_DESCRIPTION, t11.WEBSITE_META_KEYWORDS, t11.WEBSITE_META_OG_IMG, t11.WEBSITE_META_TITLE, t11.WEBSITE_SHORT_DESCRIPTION, t1.WRITE_DATE, t1.WRITE_UID, t51.NAME AS WRITE_UID_TEXT, t11.ZIP FROM RES_USERS t1 LEFT JOIN RES_PARTNER t11 ON t1.PARTNER_ID = t11.ID LEFT JOIN RES_PARTNER t21 ON t11.PARENT_ID = t21.ID LEFT JOIN CRM_TEAM t31 ON t1.SALE_TEAM_ID = t31.ID LEFT JOIN RES_USERS t41 ON t1.WRITE_UID = t41.ID LEFT JOIN RES_PARTNER t51 ON t41.PARTNER_ID = t51.ID LEFT JOIN RES_USERS t61 ON t1.CREATE_UID = t61.ID LEFT JOIN RES_PARTNER t71 ON t61.PARTNER_ID = t71.ID LEFT JOIN RES_COMPANY t81 ON t1.COMPANY_ID = t81.ID LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID LEFT JOIN MAIL_ALIAS t101 ON t1.ALIAS_ID = t101.ID
]]>
</sql>
</mapper>
......
......@@ -136675,18 +136675,6 @@
"major_field":0
},
{
"fieldname":"SUPPLIER" ,
"codename":"Supplier",
"field_logic_name":"供应商",
"entity_name":"Res_partner",
"field_type":"TRUEFALSE",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"major_field":0
},
{
"fieldname":"PROPERTY_STOCK_SUPPLIER" ,
"codename":"Property_stock_supplier",
"field_logic_name":"供应商位置",
......@@ -139793,19 +139781,6 @@
"major_field":0
},
{
"fieldname":"POS_SECURITY_PIN" ,
"codename":"Pos_security_pin",
"field_logic_name":"安全PIN",
"entity_name":"Res_users",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":32,
"key_field":0,
"major_field":0
},
{
"fieldname":"BADGE_IDS" ,
"codename":"Badge_ids",
"field_logic_name":"徽章",
......@@ -141381,22 +141356,6 @@
"major_field":0
},
{
"fieldname":"SUPPLIER" ,
"codename":"Supplier",
"field_logic_name":"供应商",
"entity_name":"Res_users",
"ref_de":"RES_PARTNER",
"ref_field_name":"SUPPLIER",
"relation_name":"DER1N_RES_USERS__RES_PARTNER__PARTNER_ID",
"relation_codename":"Odoo_partner",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"INT",
"key_field":0,
"major_field":0
},
{
"fieldname":"WEBSITE_META_KEYWORDS" ,
"codename":"Website_meta_keywords",
"field_logic_name":"网站meta关键词",
......@@ -750,14 +750,6 @@ public class Res_partnerDTO extends DTOBase implements Serializable {
@JsonProperty("journal_item_count")
private Integer journalItemCount;
/**
* 属性 [SUPPLIER]
*
*/
@JSONField(name = "supplier")
@JsonProperty("supplier")
private Integer supplier;
/**
* 属性 [PROPERTY_STOCK_SUPPLIER]
*
......@@ -1641,14 +1633,6 @@ public class Res_partnerDTO extends DTOBase implements Serializable {
this.modify("purchase_warn",purchaseWarn);
}
/**
* 设置 [SUPPLIER]
*/
public void setSupplier(Integer supplier){
this.supplier = supplier ;
this.modify("supplier",supplier);
}
/**
* 设置 [WEBSITE_SHORT_DESCRIPTION]
*/
......
......@@ -90,15 +90,6 @@ public class Res_usersDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String messageIds;
/**
* 属性 [POS_SECURITY_PIN]
*
*/
@JSONField(name = "pos_security_pin")
@JsonProperty("pos_security_pin")
@Size(min = 0, max = 32, message = "内容长度必须小于等于[32]")
private String posSecurityPin;
/**
* 属性 [BADGE_IDS]
*
......@@ -1027,14 +1018,6 @@ public class Res_usersDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String comment;
/**
* 属性 [SUPPLIER]
*
*/
@JSONField(name = "supplier")
@JsonProperty("supplier")
private Integer supplier;
/**
* 属性 [WEBSITE_META_KEYWORDS]
*
......@@ -1629,14 +1612,6 @@ public class Res_usersDTO extends DTOBase implements Serializable {
private Long createUid;
/**
* 设置 [POS_SECURITY_PIN]
*/
public void setPosSecurityPin(String posSecurityPin){
this.posSecurityPin = posSecurityPin ;
this.modify("pos_security_pin",posSecurityPin);
}
/**
* 设置 [TARGET_SALES_DONE]
*/
......
......@@ -109,6 +109,55 @@ public class Res_partnerResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@ApiOperation(value = "获取联系人草稿", tags = {"联系人" }, notes = "获取联系人草稿")
@RequestMapping(method = RequestMethod.GET, value = "/res_partners/getdraft")
public ResponseEntity<Res_partnerDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(res_partnerMapping.toDto(res_partnerService.getDraft(new Res_partner())));
}
@ApiOperation(value = "检查联系人", tags = {"联系人" }, notes = "检查联系人")
@RequestMapping(method = RequestMethod.POST, value = "/res_partners/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody Res_partnerDTO res_partnerdto) {
return ResponseEntity.status(HttpStatus.OK).body(res_partnerService.checkKey(res_partnerMapping.toDomain(res_partnerdto)));
}
@PreAuthorize("hasPermission(this.res_partnerMapping.toDomain(#res_partnerdto),'iBizBusinessCentral-Res_partner-Save')")
@ApiOperation(value = "保存联系人", tags = {"联系人" }, notes = "保存联系人")
@RequestMapping(method = RequestMethod.POST, value = "/res_partners/save")
public ResponseEntity<Boolean> save(@RequestBody Res_partnerDTO res_partnerdto) {
return ResponseEntity.status(HttpStatus.OK).body(res_partnerService.save(res_partnerMapping.toDomain(res_partnerdto)));
}
@PreAuthorize("hasPermission(this.res_partnerMapping.toDomain(#res_partnerdtos),'iBizBusinessCentral-Res_partner-Save')")
@ApiOperation(value = "批量保存联系人", tags = {"联系人" }, notes = "批量保存联系人")
@RequestMapping(method = RequestMethod.POST, value = "/res_partners/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<Res_partnerDTO> res_partnerdtos) {
res_partnerService.saveBatch(res_partnerMapping.toDomain(res_partnerdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_partner-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Res_partner-Get')")
@ApiOperation(value = "获取数据集", tags = {"联系人" } ,notes = "获取数据集")
@RequestMapping(method= RequestMethod.GET , value="/res_partners/fetchdefault")
public ResponseEntity<List<Res_partnerDTO>> fetchDefault(Res_partnerSearchContext context) {
Page<Res_partner> domains = res_partnerService.searchDefault(context) ;
List<Res_partnerDTO> list = res_partnerMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_partner-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Res_partner-Get')")
@ApiOperation(value = "查询数据集", tags = {"联系人" } ,notes = "查询数据集")
@RequestMapping(method= RequestMethod.POST , value="/res_partners/searchdefault")
public ResponseEntity<Page<Res_partnerDTO>> searchDefault(@RequestBody Res_partnerSearchContext context) {
Page<Res_partner> domains = res_partnerService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(res_partnerMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册