xignzi006 发布系统代码

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_crm/client/crm_leadFallback.java

@@ -58,4 +58,27 @@ public class crm_leadFallback implements crm_leadFeignClient{
             return null;
      }
 
+    public Crm_lead getDraft(){
+            return null;
+    }
+
+
+
+    public Boolean checkKey(Crm_lead crm_lead){
+            return false;
+     }
+
+
+    public Boolean save(Crm_lead crm_lead){
+            return false;
+     }
+    public Boolean saveBatch(List<Crm_lead> crm_leads){
+            return false;
+     }
+
+    public Page<Crm_lead> searchDefault(Crm_leadSearchContext context){
+            return null;
+     }
+
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_crm/client/crm_leadFeignClient.java

@@ -56,4 +56,24 @@ public interface crm_leadFeignClient {
     Page<Crm_lead> select();
 
 
+    @RequestMapping(method = RequestMethod.GET, value = "/crm_leads/getdraft")
+    Crm_lead getDraft();
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/crm_leads/checkkey")
+    Boolean checkKey(@RequestBody Crm_lead crm_lead);
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/crm_leads/save")
+    Boolean save(@RequestBody Crm_lead crm_lead);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/crm_leads/savebatch")
+    Boolean saveBatch(@RequestBody List<Crm_lead> crm_leads);
+
+
+
+    @RequestMapping(method = RequestMethod.POST, value = "/crm_leads/searchdefault")
+    Page<Crm_lead> searchDefault(@RequestBody Crm_leadSearchContext context);
+
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_crm/filter/Crm_leadSearchContext.java

@@ -27,6 +27,314 @@ import cn.ibizlab.businesscentral.core.odoo_crm.domain.Crm_lead;
 @Data
 public class Crm_leadSearchContext extends QueryWrapperContext<Crm_lead> {
 
+	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_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_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_kanban_state_eq;//[看板状态]
+	public void setN_kanban_state_eq(String n_kanban_state_eq) {
+        this.n_kanban_state_eq = n_kanban_state_eq;
+        if(!ObjectUtils.isEmpty(this.n_kanban_state_eq)){
+            this.getSearchCond().eq("kanban_state", n_kanban_state_eq);
+        }
+    }
+	private String n_priority_eq;//[优先级]
+	public void setN_priority_eq(String n_priority_eq) {
+        this.n_priority_eq = n_priority_eq;
+        if(!ObjectUtils.isEmpty(this.n_priority_eq)){
+            this.getSearchCond().eq("priority", n_priority_eq);
+        }
+    }
+	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_source_id_text_eq;//[来源]
+	public void setN_source_id_text_eq(String n_source_id_text_eq) {
+        this.n_source_id_text_eq = n_source_id_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_source_id_text_eq)){
+            this.getSearchCond().eq("source_id_text", n_source_id_text_eq);
+        }
+    }
+	private String n_source_id_text_like;//[来源]
+	public void setN_source_id_text_like(String n_source_id_text_like) {
+        this.n_source_id_text_like = n_source_id_text_like;
+        if(!ObjectUtils.isEmpty(this.n_source_id_text_like)){
+            this.getSearchCond().like("source_id_text", n_source_id_text_like);
+        }
+    }
+	private String n_partner_address_name_eq;//[业务伙伴联系姓名]
+	public void setN_partner_address_name_eq(String n_partner_address_name_eq) {
+        this.n_partner_address_name_eq = n_partner_address_name_eq;
+        if(!ObjectUtils.isEmpty(this.n_partner_address_name_eq)){
+            this.getSearchCond().eq("partner_address_name", n_partner_address_name_eq);
+        }
+    }
+	private String n_partner_address_name_like;//[业务伙伴联系姓名]
+	public void setN_partner_address_name_like(String n_partner_address_name_like) {
+        this.n_partner_address_name_like = n_partner_address_name_like;
+        if(!ObjectUtils.isEmpty(this.n_partner_address_name_like)){
+            this.getSearchCond().like("partner_address_name", n_partner_address_name_like);
+        }
+    }
+	private String n_medium_id_text_eq;//[媒介]
+	public void setN_medium_id_text_eq(String n_medium_id_text_eq) {
+        this.n_medium_id_text_eq = n_medium_id_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_medium_id_text_eq)){
+            this.getSearchCond().eq("medium_id_text", n_medium_id_text_eq);
+        }
+    }
+	private String n_medium_id_text_like;//[媒介]
+	public void setN_medium_id_text_like(String n_medium_id_text_like) {
+        this.n_medium_id_text_like = n_medium_id_text_like;
+        if(!ObjectUtils.isEmpty(this.n_medium_id_text_like)){
+            this.getSearchCond().like("medium_id_text", n_medium_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 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_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_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_campaign_id_text_eq;//[营销]
+	public void setN_campaign_id_text_eq(String n_campaign_id_text_eq) {
+        this.n_campaign_id_text_eq = n_campaign_id_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_campaign_id_text_eq)){
+            this.getSearchCond().eq("campaign_id_text", n_campaign_id_text_eq);
+        }
+    }
+	private String n_campaign_id_text_like;//[营销]
+	public void setN_campaign_id_text_like(String n_campaign_id_text_like) {
+        this.n_campaign_id_text_like = n_campaign_id_text_like;
+        if(!ObjectUtils.isEmpty(this.n_campaign_id_text_like)){
+            this.getSearchCond().like("campaign_id_text", n_campaign_id_text_like);
+        }
+    }
+	private String n_stage_id_text_eq;//[阶段]
+	public void setN_stage_id_text_eq(String n_stage_id_text_eq) {
+        this.n_stage_id_text_eq = n_stage_id_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_stage_id_text_eq)){
+            this.getSearchCond().eq("stage_id_text", n_stage_id_text_eq);
+        }
+    }
+	private String n_stage_id_text_like;//[阶段]
+	public void setN_stage_id_text_like(String n_stage_id_text_like) {
+        this.n_stage_id_text_like = n_stage_id_text_like;
+        if(!ObjectUtils.isEmpty(this.n_stage_id_text_like)){
+            this.getSearchCond().like("stage_id_text", n_stage_id_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_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_lost_reason_text_eq;//[失去原因]
+	public void setN_lost_reason_text_eq(String n_lost_reason_text_eq) {
+        this.n_lost_reason_text_eq = n_lost_reason_text_eq;
+        if(!ObjectUtils.isEmpty(this.n_lost_reason_text_eq)){
+            this.getSearchCond().eq("lost_reason_text", n_lost_reason_text_eq);
+        }
+    }
+	private String n_lost_reason_text_like;//[失去原因]
+	public void setN_lost_reason_text_like(String n_lost_reason_text_like) {
+        this.n_lost_reason_text_like = n_lost_reason_text_like;
+        if(!ObjectUtils.isEmpty(this.n_lost_reason_text_like)){
+            this.getSearchCond().like("lost_reason_text", n_lost_reason_text_like);
+        }
+    }
+	private Long n_lost_reason_eq;//[失去原因]
+	public void setN_lost_reason_eq(Long n_lost_reason_eq) {
+        this.n_lost_reason_eq = n_lost_reason_eq;
+        if(!ObjectUtils.isEmpty(this.n_lost_reason_eq)){
+            this.getSearchCond().eq("lost_reason", n_lost_reason_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_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_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_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_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_medium_id_eq;//[媒介]
+	public void setN_medium_id_eq(Long n_medium_id_eq) {
+        this.n_medium_id_eq = n_medium_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_medium_id_eq)){
+            this.getSearchCond().eq("medium_id", n_medium_id_eq);
+        }
+    }
+	private Long n_stage_id_eq;//[阶段]
+	public void setN_stage_id_eq(Long n_stage_id_eq) {
+        this.n_stage_id_eq = n_stage_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_stage_id_eq)){
+            this.getSearchCond().eq("stage_id", n_stage_id_eq);
+        }
+    }
+	private Long n_source_id_eq;//[来源]
+	public void setN_source_id_eq(Long n_source_id_eq) {
+        this.n_source_id_eq = n_source_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_source_id_eq)){
+            this.getSearchCond().eq("source_id", n_source_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);
+        }
+    }
+	private Long n_campaign_id_eq;//[营销]
+	public void setN_campaign_id_eq(Long n_campaign_id_eq) {
+        this.n_campaign_id_eq = n_campaign_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_campaign_id_eq)){
+            this.getSearchCond().eq("campaign_id", n_campaign_id_eq);
+        }
+    }
 	private Long n_partner_id_eq;//[客户]
 	public void setN_partner_id_eq(Long n_partner_id_eq) {
         this.n_partner_id_eq = n_partner_id_eq;
@@ -34,6 +342,20 @@ public class Crm_leadSearchContext extends QueryWrapperContext<Crm_lead> {
             this.getSearchCond().eq("partner_id", n_partner_id_eq);
         }
     }
+	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_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);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_crm/mapper/Crm_leadMapper.java

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 
 public interface Crm_leadMapper extends BaseMapper<Crm_lead>{
 
+    Page<Crm_lead> searchDefault(IPage page, @Param("srf") Crm_leadSearchContext context, @Param("ew") Wrapper<Crm_lead> wrapper) ;
     @Override
     Crm_lead selectById(Serializable id);
     @Override
@@ -61,4 +62,32 @@ public interface Crm_leadMapper extends BaseMapper<Crm_lead>{
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
 
+    List<Crm_lead> selectByLostReason(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByStageId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByTeamId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByCompanyId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByStateId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByCountryId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByTitle(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByPartnerId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByCreateUid(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByUserId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByWriteUid(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByCampaignId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectByMediumId(@Param("id") Serializable id) ;
+
+    List<Crm_lead> selectBySourceId(@Param("id") Serializable id) ;
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_crm/service/ICrm_leadService.java

@@ -33,6 +33,39 @@ public interface ICrm_leadService extends IService<Crm_lead>{
     boolean remove(Long key) ;
     void removeBatch(Collection<Long> idList) ;
     Crm_lead get(Long key) ;
+    Crm_lead getDraft(Crm_lead et) ;
+    boolean checkKey(Crm_lead et) ;
+    boolean save(Crm_lead et) ;
+    void saveBatch(List<Crm_lead> list) ;
+    Page<Crm_lead> searchDefault(Crm_leadSearchContext context) ;
+    List<Crm_lead> selectByLostReason(Long id) ;
+    void removeByLostReason(Long id) ;
+    List<Crm_lead> selectByStageId(Long id) ;
+    void removeByStageId(Long id) ;
+    List<Crm_lead> selectByTeamId(Long id) ;
+    void removeByTeamId(Long id) ;
+    List<Crm_lead> selectByCompanyId(Long id) ;
+    void removeByCompanyId(Long id) ;
+    List<Crm_lead> selectByStateId(Long id) ;
+    void removeByStateId(Long id) ;
+    List<Crm_lead> selectByCountryId(Long id) ;
+    void removeByCountryId(Long id) ;
+    List<Crm_lead> selectByTitle(Long id) ;
+    void removeByTitle(Long id) ;
+    List<Crm_lead> selectByPartnerId(Long id) ;
+    void removeByPartnerId(Long id) ;
+    List<Crm_lead> selectByCreateUid(Long id) ;
+    void removeByCreateUid(Long id) ;
+    List<Crm_lead> selectByUserId(Long id) ;
+    void removeByUserId(Long id) ;
+    List<Crm_lead> selectByWriteUid(Long id) ;
+    void removeByWriteUid(Long id) ;
+    List<Crm_lead> selectByCampaignId(Long id) ;
+    void removeByCampaignId(Long id) ;
+    List<Crm_lead> selectByMediumId(Long id) ;
+    void removeByMediumId(Long id) ;
+    List<Crm_lead> selectBySourceId(Long id) ;
+    void removeBySourceId(Long id) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_crm/service/impl/Crm_leadServiceImpl.java

@@ -156,7 +156,199 @@ public class Crm_leadServiceImpl extends ServiceImpl<Crm_leadMapper, Crm_lead> i
         return et;
     }
 
+    @Override
+    public Crm_lead getDraft(Crm_lead et) {
+        fillParentData(et);
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(Crm_lead et) {
+        return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
+    }
+    @Override
+    @Transactional
+    public boolean save(Crm_lead et) {
+        if(!saveOrUpdate(et))
+            return false;
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean saveOrUpdate(Crm_lead et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
+    }
+
+    @Override
+    @Transactional
+    public boolean saveBatch(Collection<Crm_lead> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public void saveBatch(List<Crm_lead> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+    }
+
+
+	@Override
+    public List<Crm_lead> selectByLostReason(Long id) {
+        return baseMapper.selectByLostReason(id);
+    }
+
+    @Override
+    public void removeByLostReason(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("lost_reason",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByStageId(Long id) {
+        return baseMapper.selectByStageId(id);
+    }
+
+    @Override
+    public void removeByStageId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("stage_id",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByTeamId(Long id) {
+        return baseMapper.selectByTeamId(id);
+    }
+
+    @Override
+    public void removeByTeamId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("team_id",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByCompanyId(Long id) {
+        return baseMapper.selectByCompanyId(id);
+    }
+
+    @Override
+    public void removeByCompanyId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("company_id",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByStateId(Long id) {
+        return baseMapper.selectByStateId(id);
+    }
+
+    @Override
+    public void removeByStateId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("state_id",id));
+    }
 
+	@Override
+    public List<Crm_lead> selectByCountryId(Long id) {
+        return baseMapper.selectByCountryId(id);
+    }
+
+    @Override
+    public void removeByCountryId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("country_id",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByTitle(Long id) {
+        return baseMapper.selectByTitle(id);
+    }
+
+    @Override
+    public void removeByTitle(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("title",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByPartnerId(Long id) {
+        return baseMapper.selectByPartnerId(id);
+    }
+
+    @Override
+    public void removeByPartnerId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("partner_id",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByCreateUid(Long id) {
+        return baseMapper.selectByCreateUid(id);
+    }
+
+    @Override
+    public void removeByCreateUid(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("create_uid",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByUserId(Long id) {
+        return baseMapper.selectByUserId(id);
+    }
+
+    @Override
+    public void removeByUserId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("user_id",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByWriteUid(Long id) {
+        return baseMapper.selectByWriteUid(id);
+    }
+
+    @Override
+    public void removeByWriteUid(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("write_uid",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByCampaignId(Long id) {
+        return baseMapper.selectByCampaignId(id);
+    }
+
+    @Override
+    public void removeByCampaignId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("campaign_id",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectByMediumId(Long id) {
+        return baseMapper.selectByMediumId(id);
+    }
+
+    @Override
+    public void removeByMediumId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("medium_id",id));
+    }
+
+	@Override
+    public List<Crm_lead> selectBySourceId(Long id) {
+        return baseMapper.selectBySourceId(id);
+    }
+
+    @Override
+    public void removeBySourceId(Long id) {
+        this.remove(new QueryWrapper<Crm_lead>().eq("source_id",id));
+    }
+
+
+    /**
+     * 查询集合 数据集
+     */
+    @Override
+    public Page<Crm_lead> searchDefault(Crm_leadSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Crm_lead> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Crm_lead>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
 
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/domain/Purchase_requisition.java

@@ -186,6 +186,22 @@ public class Purchase_requisition extends EntityMP implements Serializable {
     @JSONField(name = "schedule_date" , format="yyyy-MM-dd")
     @JsonProperty("schedule_date")
     private Timestamp scheduleDate;
+    /**
+     * 申请类型
+     */
+    @DEField(name = "type_id")
+    @TableField(value = "type_id")
+    @JSONField(name = "type_id")
+    @JsonProperty("type_id")
+    private Long typeId;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition_type odooType;
 
     /**
      * 
@@ -377,6 +393,14 @@ public class Purchase_requisition extends EntityMP implements Serializable {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         return sdf.format(scheduleDate);
     }
+    /**
+     * 设置 [申请类型]
+     */
+    public void setTypeId(Long typeId){
+        this.typeId = typeId ;
+        this.modify("type_id",typeId);
+    }
+
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/filter/Purchase_requisitionSearchContext.java

@@ -104,6 +104,13 @@ public class Purchase_requisitionSearchContext extends QueryWrapperContext<Purch
             this.getSearchCond().like("vendor_id_text", n_vendor_id_text_like);
         }
     }
+	private Long n_type_id_eq;//[申请类型]
+	public void setN_type_id_eq(Long n_type_id_eq) {
+        this.n_type_id_eq = n_type_id_eq;
+        if(!ObjectUtils.isEmpty(this.n_type_id_eq)){
+            this.getSearchCond().eq("type_id", n_type_id_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/mapper/Purchase_requisitionMapper.java

@@ -62,6 +62,8 @@ public interface Purchase_requisitionMapper extends BaseMapper<Purchase_requisit
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
 
+    List<Purchase_requisition> selectByTypeId(@Param("id") Serializable id) ;
+
     List<Purchase_requisition> selectByVendorId(@Param("id") Serializable id) ;
 
     List<Purchase_requisition> selectByCreateUid(@Param("id") Serializable id) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/IPurchase_requisitionService.java

@@ -38,6 +38,8 @@ public interface IPurchase_requisitionService extends IService<Purchase_requisit
     boolean save(Purchase_requisition et) ;
     void saveBatch(List<Purchase_requisition> list) ;
     Page<Purchase_requisition> searchDefault(Purchase_requisitionSearchContext context) ;
+    List<Purchase_requisition> selectByTypeId(Long id) ;
+    void removeByTypeId(Long id) ;
     List<Purchase_requisition> selectByVendorId(Long id) ;
     void removeByVendorId(Long id) ;
     List<Purchase_requisition> selectByCreateUid(Long id) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_requisitionServiceImpl.java

@@ -53,6 +53,9 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
     protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisition_lineService purchaseRequisitionLineService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisition_typeService purchaseRequisitionTypeService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_partnerService resPartnerService;
     @Autowired
     @Lazy
@@ -164,6 +167,16 @@ public class Purchase_requisitionServiceImpl extends ServiceImpl<Purchase_requis
     }
 
 
+	@Override
+    public List<Purchase_requisition> selectByTypeId(Long id) {
+        return baseMapper.selectByTypeId(id);
+    }
+
+    @Override
+    public void removeByTypeId(Long id) {
+        this.remove(new QueryWrapper<Purchase_requisition>().eq("type_id",id));
+    }
+
 	@Override
     public List<Purchase_requisition> selectByVendorId(Long id) {
         return baseMapper.selectByVendorId(id);

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_requisition_typeServiceImpl.java

@@ -48,6 +48,9 @@ import org.springframework.util.StringUtils;
 @Service("Purchase_requisition_typeServiceImpl")
 public class Purchase_requisition_typeServiceImpl extends ServiceImpl<Purchase_requisition_typeMapper, Purchase_requisition_type> implements IPurchase_requisition_typeService {
 
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.odoo_purchase.service.IPurchase_requisitionService purchaseRequisitionService;
     @Autowired
     @Lazy
     protected cn.ibizlab.businesscentral.core.odoo_base.service.IRes_usersService resUsersService;

businesscentral-core/src/main/resources/mapper/odoo_crm/crm_lead/Crm_leadMapper.xml

@@ -4,6 +4,9 @@
 <mapper	namespace="cn.ibizlab.businesscentral.core.odoo_crm.mapper.Crm_leadMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="Crm_leadResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.ACTIVE, t1.CAMPAIGN_ID, t131.NAME AS CAMPAIGN_ID_TEXT, t1.CITY, t1.COLOR, t61.CURRENCY_ID AS COMPANY_CURRENCY, t1.COMPANY_ID, t151.NAME AS COMPANY_ID_TEXT, t1.CONTACT_NAME, t1.COUNTRY_ID, t161.NAME AS COUNTRY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t111.NAME AS CREATE_UID_TEXT, t1.DATE_ACTION_LAST, t1.DATE_CLOSED, t1.DATE_CONVERSION, t1.DATE_DEADLINE, t1.DATE_LAST_STAGE_UPDATE, t1.DATE_OPEN, t1.DAY_CLOSE, t1.DAY_OPEN, t1.DESCRIPTION, t1.EMAIL_CC, t1.EMAIL_FROM, t1.EXPECTED_REVENUE, t1.IBIZFUNCTION, t1.ID, t1.LOST_REASON, t181.NAME AS LOST_REASON_TEXT, t1.MEDIUM_ID, t51.NAME AS MEDIUM_ID_TEXT, t1.MESSAGE_BOUNCE, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.MOBILE, t1.NAME, t41.EMAIL AS PARTNER_ADDRESS_EMAIL, t41.MOBILE AS PARTNER_ADDRESS_MOBILE, t41.NAME AS PARTNER_ADDRESS_NAME, t41.PHONE AS PARTNER_ADDRESS_PHONE, t1.PARTNER_ID, t1.PARTNER_NAME, t1.PHONE, t1.PLANNED_REVENUE, t1.PRIORITY, t1.PROBABILITY, t1.REFERRED, t1.SOURCE_ID, t31.NAME AS SOURCE_ID_TEXT, t1.STAGE_ID, t141.NAME AS STAGE_ID_TEXT, t1.STATE_ID, t121.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TEAM_ID, t71.NAME AS TEAM_ID_TEXT, t1.TITLE, t171.NAME AS TITLE_TEXT, t1.TYPE, t21.EMAIL AS USER_EMAIL, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t11.LOGIN AS USER_LOGIN, t1.WEBSITE, t1.WRITE_DATE, t1.WRITE_UID, t91.NAME AS WRITE_UID_TEXT, t1.ZIP FROM CRM_LEAD t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN UTM_SOURCE t31 ON t1.SOURCE_ID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t1.PARTNER_ID = t41.ID  LEFT JOIN UTM_MEDIUM t51 ON t1.MEDIUM_ID = t51.ID  LEFT JOIN RES_COMPANY t61 ON t1.COMPANY_ID = t61.ID  LEFT JOIN CRM_TEAM t71 ON t1.TEAM_ID = t71.ID  LEFT JOIN RES_USERS t81 ON t1.WRITE_UID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  LEFT JOIN RES_USERS t101 ON t1.CREATE_UID = t101.ID  LEFT JOIN RES_PARTNER t111 ON t101.PARTNER_ID = t111.ID  LEFT JOIN RES_COUNTRY_STATE t121 ON t1.STATE_ID = t121.ID  LEFT JOIN UTM_CAMPAIGN t131 ON t1.CAMPAIGN_ID = t131.ID  LEFT JOIN CRM_STAGE t141 ON t1.STAGE_ID = t141.ID  LEFT JOIN RES_PARTNER t151 ON t61.PARTNER_ID = t151.ID  LEFT JOIN RES_COUNTRY t161 ON t1.COUNTRY_ID = t161.ID  LEFT JOIN RES_PARTNER_TITLE t171 ON t1.TITLE = t171.ID  LEFT JOIN CRM_LOST_REASON t181 ON t1.LOST_REASON = t181.ID  ) t1 where id=#{id}]]>
+    </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="Crm_leadResultMap" type="cn.ibizlab.businesscentral.core.odoo_crm.domain.Crm_lead" autoMapping="true">
@@ -122,19 +125,122 @@
     </resultMap>
 
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__CRM_LOST_REASON__LOST_REASON] -->
+	 <select id="selectByLostReason" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  lost_reason=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__CRM_STAGE__STAGE_ID] -->
+	 <select id="selectByStageId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  stage_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__CRM_TEAM__TEAM_ID] -->
+	 <select id="selectByTeamId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  team_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__RES_COMPANY__COMPANY_ID] -->
+	 <select id="selectByCompanyId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  company_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__RES_COUNTRY_STATE__STATE_ID] -->
+	 <select id="selectByStateId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  state_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__RES_COUNTRY__COUNTRY_ID] -->
+	 <select id="selectByCountryId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  country_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__RES_PARTNER_TITLE__TITLE] -->
+	 <select id="selectByTitle" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  title=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__RES_PARTNER__PARTNER_ID] -->
+	 <select id="selectByPartnerId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  partner_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__RES_USERS__CREATE_UID] -->
+	 <select id="selectByCreateUid" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  create_uid=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__RES_USERS__USER_ID] -->
+	 <select id="selectByUserId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  user_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__RES_USERS__WRITE_UID] -->
+	 <select id="selectByWriteUid" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  write_uid=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__UTM_CAMPAIGN__CAMPAIGN_ID] -->
+	 <select id="selectByCampaignId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  campaign_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__UTM_MEDIUM__MEDIUM_ID] -->
+	 <select id="selectByMediumId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  medium_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_CRM_LEAD__UTM_SOURCE__SOURCE_ID] -->
+	 <select id="selectBySourceId" resultMap="Crm_leadResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  source_id=#{id}
+     </select>
 
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.odoo_crm.filter.Crm_leadSearchContext"  resultMap="Crm_leadResultMap">
+         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.CAMPAIGN_ID, t131.NAME AS CAMPAIGN_ID_TEXT, t1.CITY, t1.COLOR, t61.CURRENCY_ID AS COMPANY_CURRENCY, t1.COMPANY_ID, t151.NAME AS COMPANY_ID_TEXT, t1.CONTACT_NAME, t1.COUNTRY_ID, t161.NAME AS COUNTRY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t111.NAME AS CREATE_UID_TEXT, t1.DATE_ACTION_LAST, t1.DATE_CLOSED, t1.DATE_CONVERSION, t1.DATE_DEADLINE, t1.DATE_LAST_STAGE_UPDATE, t1.DATE_OPEN, t1.DAY_CLOSE, t1.DAY_OPEN, t1.EMAIL_FROM, t1.EXPECTED_REVENUE, t1.IBIZFUNCTION, t1.ID, t1.LOST_REASON, t181.NAME AS LOST_REASON_TEXT, t1.MEDIUM_ID, t51.NAME AS MEDIUM_ID_TEXT, t1.MESSAGE_BOUNCE, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.MOBILE, t1.NAME, t41.EMAIL AS PARTNER_ADDRESS_EMAIL, t41.MOBILE AS PARTNER_ADDRESS_MOBILE, t41.NAME AS PARTNER_ADDRESS_NAME, t41.PHONE AS PARTNER_ADDRESS_PHONE, t1.PARTNER_ID, t1.PARTNER_NAME, t1.PHONE, t1.PLANNED_REVENUE, t1.PRIORITY, t1.PROBABILITY, t1.REFERRED, t1.SOURCE_ID, t31.NAME AS SOURCE_ID_TEXT, t1.STAGE_ID, t141.NAME AS STAGE_ID_TEXT, t1.STATE_ID, t121.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TEAM_ID, t71.NAME AS TEAM_ID_TEXT, t1.TITLE, t171.NAME AS TITLE_TEXT, t1.TYPE, t21.EMAIL AS USER_EMAIL, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t11.LOGIN AS USER_LOGIN, t1.WEBSITE, t1.WRITE_DATE, t1.WRITE_UID, t91.NAME AS WRITE_UID_TEXT, t1.ZIP FROM CRM_LEAD t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN UTM_SOURCE t31 ON t1.SOURCE_ID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t1.PARTNER_ID = t41.ID  LEFT JOIN UTM_MEDIUM t51 ON t1.MEDIUM_ID = t51.ID  LEFT JOIN RES_COMPANY t61 ON t1.COMPANY_ID = t61.ID  LEFT JOIN CRM_TEAM t71 ON t1.TEAM_ID = t71.ID  LEFT JOIN RES_USERS t81 ON t1.WRITE_UID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  LEFT JOIN RES_USERS t101 ON t1.CREATE_UID = t101.ID  LEFT JOIN RES_PARTNER t111 ON t101.PARTNER_ID = t111.ID  LEFT JOIN RES_COUNTRY_STATE t121 ON t1.STATE_ID = t121.ID  LEFT JOIN UTM_CAMPAIGN t131 ON t1.CAMPAIGN_ID = t131.ID  LEFT JOIN CRM_STAGE t141 ON t1.STAGE_ID = t141.ID  LEFT JOIN RES_PARTNER t151 ON t61.PARTNER_ID = t151.ID  LEFT JOIN RES_COUNTRY t161 ON t1.COUNTRY_ID = t161.ID  LEFT JOIN RES_PARTNER_TITLE t171 ON t1.TITLE = t171.ID  LEFT JOIN CRM_LOST_REASON t181 ON t1.LOST_REASON = t181.ID  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ACTIVE, t1.CAMPAIGN_ID, t131.NAME AS CAMPAIGN_ID_TEXT, t1.CITY, t1.COLOR, t61.CURRENCY_ID AS COMPANY_CURRENCY, t1.COMPANY_ID, t151.NAME AS COMPANY_ID_TEXT, t1.CONTACT_NAME, t1.COUNTRY_ID, t161.NAME AS COUNTRY_ID_TEXT, t1.CREATE_DATE, t1.CREATE_UID, t111.NAME AS CREATE_UID_TEXT, t1.DATE_ACTION_LAST, t1.DATE_CLOSED, t1.DATE_CONVERSION, t1.DATE_DEADLINE, t1.DATE_LAST_STAGE_UPDATE, t1.DATE_OPEN, t1.DAY_CLOSE, t1.DAY_OPEN, t1.DESCRIPTION, t1.EMAIL_CC, t1.EMAIL_FROM, t1.EXPECTED_REVENUE, t1.IBIZFUNCTION, t1.ID, t1.LOST_REASON, t181.NAME AS LOST_REASON_TEXT, t1.MEDIUM_ID, t51.NAME AS MEDIUM_ID_TEXT, t1.MESSAGE_BOUNCE, t1.MESSAGE_MAIN_ATTACHMENT_ID, t1.MOBILE, t1.NAME, t41.EMAIL AS PARTNER_ADDRESS_EMAIL, t41.MOBILE AS PARTNER_ADDRESS_MOBILE, t41.NAME AS PARTNER_ADDRESS_NAME, t41.PHONE AS PARTNER_ADDRESS_PHONE, t1.PARTNER_ID, t1.PARTNER_NAME, t1.PHONE, t1.PLANNED_REVENUE, t1.PRIORITY, t1.PROBABILITY, t1.REFERRED, t1.SOURCE_ID, t31.NAME AS SOURCE_ID_TEXT, t1.STAGE_ID, t141.NAME AS STAGE_ID_TEXT, t1.STATE_ID, t121.NAME AS STATE_ID_TEXT, t1.STREET, t1.STREET2, t1.TEAM_ID, t71.NAME AS TEAM_ID_TEXT, t1.TITLE, t171.NAME AS TITLE_TEXT, t1.TYPE, t21.EMAIL AS USER_EMAIL, t1.USER_ID, t21.NAME AS USER_ID_TEXT, t11.LOGIN AS USER_LOGIN, t1.WEBSITE, t1.WRITE_DATE, t1.WRITE_UID, t91.NAME AS WRITE_UID_TEXT, t1.ZIP FROM CRM_LEAD t1  LEFT JOIN RES_USERS t11 ON t1.USER_ID = t11.ID  LEFT JOIN RES_PARTNER t21 ON t11.PARTNER_ID = t21.ID  LEFT JOIN UTM_SOURCE t31 ON t1.SOURCE_ID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t1.PARTNER_ID = t41.ID  LEFT JOIN UTM_MEDIUM t51 ON t1.MEDIUM_ID = t51.ID  LEFT JOIN RES_COMPANY t61 ON t1.COMPANY_ID = t61.ID  LEFT JOIN CRM_TEAM t71 ON t1.TEAM_ID = t71.ID  LEFT JOIN RES_USERS t81 ON t1.WRITE_UID = t81.ID  LEFT JOIN RES_PARTNER t91 ON t81.PARTNER_ID = t91.ID  LEFT JOIN RES_USERS t101 ON t1.CREATE_UID = t101.ID  LEFT JOIN RES_PARTNER t111 ON t101.PARTNER_ID = t111.ID  LEFT JOIN RES_COUNTRY_STATE t121 ON t1.STATE_ID = t121.ID  LEFT JOIN UTM_CAMPAIGN t131 ON t1.CAMPAIGN_ID = t131.ID  LEFT JOIN CRM_STAGE t141 ON t1.STAGE_ID = t141.ID  LEFT JOIN RES_PARTNER t151 ON t61.PARTNER_ID = t151.ID  LEFT JOIN RES_COUNTRY t161 ON t1.COUNTRY_ID = t161.ID  LEFT JOIN RES_PARTNER_TITLE t171 ON t1.TITLE = t171.ID  LEFT JOIN CRM_LOST_REASON t181 ON t1.LOST_REASON = t181.ID  
+			]]>
+    </sql>
 </mapper>
 

businesscentral-core/src/main/resources/mapper/odoo_purchase/purchase_requisition/Purchase_requisitionMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="Purchase_requisitionResultMap" databaseId="postgresql">
-        <![CDATA[select t1.* from (SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION 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_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID  ) t1 where id=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, t1.TYPE_ID, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION 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_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID  ) t1 where id=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -26,8 +26,11 @@
 		<result property="orderingDate" column="ordering_date" />
 		<result property="dateEnd" column="date_end" />
 		<result property="scheduleDate" column="schedule_date" />
+		<result property="typeId" column="type_id" />
             
 		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="odooType" javaType="cn.ibizlab.businesscentral.core.odoo_purchase.domain.Purchase_requisition_type" column="type_id" select="cn.ibizlab.businesscentral.core.odoo_purchase.mapper.Purchase_requisition_typeMapper.selectById" fetchType="lazy"></association>
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="odooVendor" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_partner" column="vendor_id" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_partnerMapper.selectById" fetchType="lazy"></association>
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
@@ -36,6 +39,13 @@
 		<association property="odooWrite" javaType="cn.ibizlab.businesscentral.core.odoo_base.domain.Res_users" column="write_uid" select="cn.ibizlab.businesscentral.core.odoo_base.mapper.Res_usersMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PURCHASE_REQUISITION_PURCHASE_REQUISITION_TYPE_TYPE_ID] -->
+	 <select id="selectByTypeId" resultMap="Purchase_requisitionResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  type_id=#{id}
+     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID] -->
 	 <select id="selectByVendorId" resultMap="Purchase_requisitionResultMap">
          select t1.* from (
@@ -69,12 +79,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="postgresql">
-		<![CDATA[ SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION 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_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID  
+		<![CDATA[ SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, t1.TYPE_ID, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION 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_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="postgresql">
-		<![CDATA[ SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION 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_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID  
+		<![CDATA[ SELECT t1.ACTIVITY_DATE_DEADLINE, t1.ACTIVITY_STATE, t1.CREATE_DATE, t1.CREATE_UID, t41.NAME AS CREATE_UNAME, t1.DATE_END, t1.ID, t1.NAME, t1.ORDERING_DATE, t1.ORDER_COUNT, t1.ORIGIN, t1.SCHEDULE_DATE, t1.TYPE_ID, t1.VENDOR_ID, t51.NAME AS VENDOR_ID_TEXT, t1.WRITE_DATE, t1.WRITE_UID, t21.NAME AS WRITE_UNAME FROM PURCHASE_REQUISITION 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_USERS t31 ON t1.CREATE_UID = t31.ID  LEFT JOIN RES_PARTNER t41 ON t31.PARTNER_ID = t41.ID  LEFT JOIN RES_PARTNER t51 ON t1.VENDOR_ID = t51.ID  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json

@@ -123952,6 +123952,23 @@
     "data_type":"DATETIME",
     "key_field":0,
     "major_field":0
+    },
+    {
+    "fieldname":"TYPE_ID" ,
+    "codename":"Type_id",
+    "field_logic_name":"申请类型",
+    "entity_name":"Purchase_requisition",
+    "ref_de":"PURCHASE_REQUISITION_TYPE",
+    "ref_field_name":"ID",
+    "relation_name":"DER1N_PURCHASE_REQUISITION_PURCHASE_REQUISITION_TYPE_TYPE_ID",
+    "relation_codename":"Odoo_type",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"BIGINT",
+    "data_length":20,
+    "key_field":0,
+    "major_field":0
     }
     ],
     "subEntitys":[
@@ -123963,6 +123980,12 @@
     }
     ],
     "parentEntitys":[
+    {"name":"DER1N_PURCHASE_REQUISITION_PURCHASE_REQUISITION_TYPE_TYPE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_type",
+     "entity_name":"PURCHASE_REQUISITION",
+     "ref_entity_name":"PURCHASE_REQUISITION_TYPE"
+    },
     {"name":"DER1N_PURCHASE_REQUISITION_RES_PARTNER_VENDOR_ID",
      "relation_type":"DER1N",
      "code_name":"Odoo_vendor",
@@ -124612,6 +124635,12 @@
     }
     ],
     "subEntitys":[
+    {"name":"DER1N_PURCHASE_REQUISITION_PURCHASE_REQUISITION_TYPE_TYPE_ID",
+     "relation_type":"DER1N",
+     "code_name":"Odoo_type",
+     "entity_name":"PURCHASE_REQUISITION",
+     "ref_entity_name":"PURCHASE_REQUISITION_TYPE"
+    }
     ],
     "parentEntitys":[
     {"name":"DER1N_PURCHASE_REQUISITION_TYPE_RES_USERS_CREATE_UID",

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Purchase_requisitionDTO.java

@@ -191,6 +191,15 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
     @JsonProperty("schedule_date")
     private Timestamp scheduleDate;
 
+    /**
+     * 属性 [TYPE_ID]
+     *
+     */
+    @JSONField(name = "type_id")
+    @JsonProperty("type_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long typeId;
+
 
     /**
      * 设置 [NAME]
@@ -296,6 +305,14 @@ public class Purchase_requisitionDTO extends DTOBase implements Serializable {
         this.modify("schedule_date",scheduleDate);
     }
 
+    /**
+     * 设置 [TYPE_ID]
+     */
+    public void setTypeId(Long  typeId){
+        this.typeId = typeId ;
+        this.modify("type_id",typeId);
+    }
+
 
 }
 

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Crm_leadResource.java

@@ -109,6 +109,55 @@ public class Crm_leadResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
+    @ApiOperation(value = "获取线索/商机草稿", tags = {"线索/商机" },  notes = "获取线索/商机草稿")
+	@RequestMapping(method = RequestMethod.GET, value = "/crm_leads/getdraft")
+    public ResponseEntity<Crm_leadDTO> getDraft() {
+        return ResponseEntity.status(HttpStatus.OK).body(crm_leadMapping.toDto(crm_leadService.getDraft(new Crm_lead())));
+    }
+
+    @ApiOperation(value = "检查线索/商机", tags = {"线索/商机" },  notes = "检查线索/商机")
+	@RequestMapping(method = RequestMethod.POST, value = "/crm_leads/checkkey")
+    public ResponseEntity<Boolean> checkKey(@RequestBody Crm_leadDTO crm_leaddto) {
+        return  ResponseEntity.status(HttpStatus.OK).body(crm_leadService.checkKey(crm_leadMapping.toDomain(crm_leaddto)));
+    }
+
+    @PreAuthorize("hasPermission(this.crm_leadMapping.toDomain(#crm_leaddto),'iBizBusinessCentral-Crm_lead-Save')")
+    @ApiOperation(value = "保存线索/商机", tags = {"线索/商机" },  notes = "保存线索/商机")
+	@RequestMapping(method = RequestMethod.POST, value = "/crm_leads/save")
+    public ResponseEntity<Boolean> save(@RequestBody Crm_leadDTO crm_leaddto) {
+        return ResponseEntity.status(HttpStatus.OK).body(crm_leadService.save(crm_leadMapping.toDomain(crm_leaddto)));
+    }
+
+    @PreAuthorize("hasPermission(this.crm_leadMapping.toDomain(#crm_leaddtos),'iBizBusinessCentral-Crm_lead-Save')")
+    @ApiOperation(value = "批量保存线索/商机", tags = {"线索/商机" },  notes = "批量保存线索/商机")
+	@RequestMapping(method = RequestMethod.POST, value = "/crm_leads/savebatch")
+    public ResponseEntity<Boolean> saveBatch(@RequestBody List<Crm_leadDTO> crm_leaddtos) {
+        crm_leadService.saveBatch(crm_leadMapping.toDomain(crm_leaddtos));
+        return  ResponseEntity.status(HttpStatus.OK).body(true);
+    }
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Crm_lead-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Crm_lead-Get')")
+	@ApiOperation(value = "获取数据集", tags = {"线索/商机" } ,notes = "获取数据集")
+    @RequestMapping(method= RequestMethod.GET , value="/crm_leads/fetchdefault")
+	public ResponseEntity<List<Crm_leadDTO>> fetchDefault(Crm_leadSearchContext context) {
+        Page<Crm_lead> domains = crm_leadService.searchDefault(context) ;
+        List<Crm_leadDTO> list = crm_leadMapping.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-Crm_lead-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Crm_lead-Get')")
+	@ApiOperation(value = "查询数据集", tags = {"线索/商机" } ,notes = "查询数据集")
+    @RequestMapping(method= RequestMethod.POST , value="/crm_leads/searchdefault")
+	public ResponseEntity<Page<Crm_leadDTO>> searchDefault(@RequestBody Crm_leadSearchContext context) {
+        Page<Crm_lead> domains = crm_leadService.searchDefault(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(crm_leadMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
 
 }