diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmAppDisAndCustm.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmAppDisAndCustm.java new file mode 100644 index 0000000000..7cc4934409 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmAppDisAndCustm.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.crm.api.crmcustomertemp; + +import lombok.Data; + +@Data +public class CrmAppDisAndCustm { + + private String id; + private String dictValue; + private CrmExtra extra; +} 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 9dd6c1b91b..d6e41f52ca 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 @@ -93,7 +93,7 @@ public interface CrmCustomerTempFeign { */ @ApiOperation("开票信息维护客户新增修改") @PostMapping("/billApplicatSaveCust") - public ResultBean billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto); + public ResultBean billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto); /** diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmExtra.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmExtra.java new file mode 100644 index 0000000000..71ec1be101 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmExtra.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.crm.api.crmcustomertemp; + +import lombok.Data; + +@Data +public class CrmExtra { + + private String name; + private String sid; + private String info; +} 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 3342f0ebaa..739984727d 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 @@ -115,7 +115,7 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { } @Override - public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) { + 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 124ef025c5..25c7bebe7b 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 @@ -1101,7 +1101,7 @@ public class CrmCustomerTempService extends MybatisBaseService billApplicatSaveCust(CrmCustomerBillApplicationDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); //手机号 @@ -1116,6 +1116,11 @@ public class CrmCustomerTempService extends MybatisBaseService qySaveOrUpdate(@RequestBody FinCompanyInvoicingDto dto); @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息") @PostMapping("/qySelByUseOrgSid") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinExtra.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinExtra.java new file mode 100644 index 0000000000..385d0a64b3 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinExtra.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.fin.api.fincompanyinvoicing; + +import lombok.Data; + +@Data +public class FinExtra { + + private String name; + private String sid; + private String info; +} 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 07f908cc71..e5c931f8d6 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 @@ -132,7 +132,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { } @Override - public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) { + public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) { return finCompanyInvoicingService.qySaveOrUpdate(dto); } 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 022acc9ccd..06ca2dc680 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 @@ -155,10 +155,11 @@ public class FinCompanyInvoicingService extends MybatisBaseService qySaveOrUpdate(FinCompanyInvoicingDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); String useOrgSid = dto.getUseOrgSid(); @@ -284,8 +285,32 @@ public class FinCompanyInvoicingService extends MybatisBaseService(); qw1.eq("useOrgSid", useOrgSid); @@ -301,7 +326,31 @@ public class FinCompanyInvoicingService extends MybatisBaseService qyFetchListByName(String name,String useOrgSid) {