diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java index b257eb276c..cfc33a3c81 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java @@ -12,14 +12,16 @@ import lombok.Data; public class BaseDistributorListVo implements Vo { private static final long serialVersionUID = 7567158573644935938L; - private String name; - private String sid; + private String name;//名称 + private String sid;//sid - private String registNum;//税号 + private String registNum;//税号或身份证号 private String registDetailAddress;//地址 private String invoPhone;//开票联系电话 private String invoBank;//开票开户行 private String invoBankNum;//开票银行账号 - private String openTickRemarks; + private String openTickRemarks;//拼接的开票信息 + + private String nameAndPhone;//个人名字手机号拼接 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 7e1b4da2f1..880d5f7d53 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -903,6 +903,9 @@ public class BaseDistributorService extends MybatisBaseService + * File: CrmCustomerTempDto.java
+ * Class: com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto
+ * Description: 潜在客户信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-12 11:21:16
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "潜在客户信息 数据传输对象", description = "潜在客户信息 数据传输对象") +@Data +public class CrmCustomerBillApplicationDto implements Dto { + + @ApiModelProperty("sid") + private String sid; + + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("身份证号") + private String taxpayerNo; + @ApiModelProperty("电话") + private String phone; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("组织全路径") + private String orgSidPath; + @ApiModelProperty("业务员sid") + private String staffSid; + @ApiModelProperty("用户sid") + private String createBySid; +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java index a0f473f5e1..e0bce64fec 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.ArrayList; import java.util.List; /** @@ -132,10 +133,10 @@ public class CrmCustomerTempDto implements Dto { //运营信息 @ApiModelProperty(value = "运营信息") - private CrmBusinessDto crmBusinessDto; + private CrmBusinessDto crmBusinessDto = new CrmBusinessDto(); //见证材料集合 @ApiModelProperty(value = "见证材料的集合，编辑保存时无此字段") - private List crmVisitAppendixDtoList; + private List crmVisitAppendixDtoList = new ArrayList<>(); private String orgPath; diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index b30b462087..9dd6c1b91b 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -86,6 +86,16 @@ public interface CrmCustomerTempFeign { @PostMapping("/save") public ResultBean save(@Valid @RequestBody CrmCustomerTempDto dto); + /** + * 开票信息维护客户新增修改 + * + * @return + */ + @ApiOperation("开票信息维护客户新增修改") + @PostMapping("/billApplicatSaveCust") + public ResultBean billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto); + + /** * pc端潜在客户编辑保存 * diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 2e0a1d9240..9843960385 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -67,8 +67,13 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { public ResultBean save(CrmCustomerTempDto dto){ return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/save无法访问"); } - - @Override + + @Override + public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) { + return null; + } + + @Override public ResultBean update(CrmCustomerTempUpdateDto dto,String sid){ return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/update无法访问"); } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index b9dfde9895..3342f0ebaa 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -114,6 +114,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerTempService.saveCrmCustomer(dto); } + @Override + public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) { + return crmCustomerTempService.billApplicatSaveCust(dto); + } + /** * 潜在客户修改保存 * diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 1c39fd2022..72ed1cfb42 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -995,11 +995,11 @@ public class CrmCustomerTempService extends MybatisBaseService list = baseMapper.selectCustomerList(qw); @@ -1100,4 +1100,51 @@ public class CrmCustomerTempService extends MybatisBaseService> qyFetchListByName(@RequestParam("name") String name); + public ResultBean> qyFetchListByName(@RequestParam("name") String name,@RequestParam("useOrgSid") String useOrgSid); @ApiOperation("企业开票信息管理新增或保存") @PostMapping("/qySaveOrUpdate") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index dff7a1b6e4..a6a7609d7c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java @@ -48,65 +48,65 @@ import java.util.List; @Component public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-fin/fincompanyinvoicing/listPage无法访问"); - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-fin/fincompanyinvoicing/listPage无法访问"); + } - @Override - public ResultBean save(FinCompanyInvoicingDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问"); - } + @Override + public ResultBean save(FinCompanyInvoicingDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问"); + } - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问"); - } + @Override + public ResultBean delBySids(String[] sids) { + return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问"); + } - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-fin/fincompanyinvoicing/fetchDetailsBySid无法访问"); - } + @Override + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-fin/fincompanyinvoicing/fetchDetailsBySid无法访问"); + } - @Override - public ResultBean fetchDetailsByUseOrgSid(String useOrgSid) { - return null; - } + @Override + public ResultBean fetchDetailsByUseOrgSid(String useOrgSid) { + return null; + } - @Override - public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { - return null; - } + @Override + public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { + return null; + } - @Override - public ResultBean> selectInvoingList(String busSid) { - return null; - } + @Override + public ResultBean> selectInvoingList(String busSid) { + return null; + } - @Override - public ResultBean> qyListPage(PagerQuery pq) { - return null; - } + @Override + public ResultBean> qyListPage(PagerQuery pq) { + return null; + } - @Override - public ResultBean> qyFetchListByName(String name) { - return null; - } + @Override + public ResultBean> qyFetchListByName(String name, String useOrgSid) { + return null; + } - @Override - public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) { - return null; - } + @Override + public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) { + return null; + } - @Override - public List qySelByUseOrgSid(String orgSid) { - return null; - } + @Override + public List qySelByUseOrgSid(String orgSid) { + return null; + } - @Override - public List qyAppSelByUseOrgSid(String useOrgSid, String search) { - return null; - } + @Override + public List qyAppSelByUseOrgSid(String useOrgSid, String search) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java index a0beb0a664..78f8cd126c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java @@ -66,4 +66,6 @@ public class FinCompanyInvoicingQuery implements Query { private String name; @ApiModelProperty("纳税人识别号") private String taxpayerNo; + + private String appName;//移动端查询条件 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java index a1423d3a46..d460927c05 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java @@ -56,8 +56,10 @@ public interface FinCompanyInvoicingMapper extends BaseMapper voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage selectPageVoGS(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from fin_company_invoicing") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index 87a49a827c..db3baf7ff4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml @@ -3,6 +3,13 @@ + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index ce77a4d927..9c0fb0e759 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java @@ -118,9 +118,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { } @Override - public ResultBean> qyFetchListByName(String name) { + public ResultBean> qyFetchListByName(String name,String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - List finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name); + List finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name,useOrgSid); return rb.success().setData(finCompanyInvoicingDetailsVos); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index f7ec0a77e5..db117055d6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -130,7 +130,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); + IPage pagging = baseMapper.selectPageVoGS(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -239,12 +239,15 @@ public class FinCompanyInvoicingService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -261,12 +264,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw1.eq("useOrgSid", useOrgSid); qw1.eq("name", name); - qw1.isNull("purchaseSystemSid"); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1); QueryWrapper qw2 = new QueryWrapper<>(); qw2.eq("useOrgSid", useOrgSid); qw2.eq("taxpayerNo", taxpayerNo); - qw1.isNull("purchaseSystemSid"); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2); if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) { return rb.setMsg("该企业开票信息已存在"); @@ -278,13 +279,11 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw2.eq("useOrgSid", useOrgSid); qw1.notIn("sid", dtoSid); qw2.eq("taxpayerNo", taxpayerNo); - qw1.isNull("purchaseSystemSid"); FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2); if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) { return rb.setMsg("该企业开票信息已存在"); @@ -293,8 +292,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService qyFetchListByName(String name) { + public List qyFetchListByName(String name,String useOrgSid) { QueryWrapper qw = new QueryWrapper<>(); + qw.eq("useOrgSid", useOrgSid); + qw.eq("isDelete", 0); qw.like("name", name); List finCompanyInvoicingDetailsVos = baseMapper.qyFetchListByName(qw); return finCompanyInvoicingDetailsVos; @@ -304,7 +305,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw.eq("useOrgSid", orgSid); qw.eq("isDelete", 0); - qw.isNull("purchaseSystemSid"); List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos; } @@ -313,7 +313,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw.eq("useOrgSid", useOrgSid); qw.eq("isDelete", 0); - qw.isNull("purchaseSystemSid"); qw.like("name",search); List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos;