xignzi006 发布系统代码

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/client/res_partnerFallback.java

@@ -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;
+     }
+
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/client/res_partnerFeignClient.java

@@ -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);
+
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_partner.java

@@ -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);
-    }
-
     /**
      * 设置 [网站业务伙伴简介]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_users.java

@@ -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);
-    }
-
     /**
      * 设置 [活动达成]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/mapper/Res_partnerMapper.java

@@ -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) ;
+
 }

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/IRes_partnerService.java

@@ -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}

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_partnerServiceImpl.java

@@ -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());
+    }
 
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_usersServiceImpl.java

@@ -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());

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

@@ -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关键词",

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

@@ -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]
      */

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

@@ -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]
      */

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

@@ -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()));
+	}
+
 
 }