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 af5595d42f..5c91de4daa 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 @@ -57,7 +57,7 @@ public interface CrmCustomerTempFeign { @ApiOperation("推送财务客户-否") @PostMapping("/sendFinCustomer/{orgCode}") - public ResultBean sendFinCustomer(@RequestBody String[] customerSids,@PathVariable("orgCode") String orgCode); + public ResultBean sendFinCustomer(@RequestBody String[] customerSids, @PathVariable("orgCode") String orgCode); @ApiOperation("推送财务客户-是") @PostMapping("/sendFinCustomerTrue") @@ -201,4 +201,13 @@ public interface CrmCustomerTempFeign { @ApiOperation("检查并创建金蝶中的客户") ResultBean checkCustomerOrUpdate(@Valid @RequestBody CustomerQuery customerQuery); + @ApiOperation("根据sid查询实体") + @GetMapping("/fetchEntity/{sid}") + @ResponseBody + public ResultBean fetchEntity(@PathVariable("sid") String sid); + + @ApiOperation("根据实体修改客户信息") + @PostMapping("/updateByEntity") + public ResultBean updateByEntity(@RequestBody CrmCustomerTemp crmCustomerTemp); + } \ No newline at end of file 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 941b031c24..d00680d9d1 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 @@ -155,5 +155,15 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } + @Override + public ResultBean fetchEntity(String sid) { + return null; + } + + @Override + public ResultBean updateByEntity(CrmCustomerTemp crmCustomerTemp) { + return null; + } + } \ No newline at end of file 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 7eae6e9415..6867b33bd4 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 @@ -73,8 +73,8 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { } @Override - public ResultBean sendFinCustomer(String[] customerSids,String orgCode) { - return crmCustomerTempService.sendFinCustomer(customerSids,orgCode); + public ResultBean sendFinCustomer(String[] customerSids, String orgCode) { + return crmCustomerTempService.sendFinCustomer(customerSids, orgCode); } @Override @@ -304,5 +304,19 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerTempService.checkCustomerOrUpdate(customerQuery); } + @Override + public ResultBean fetchEntity(String sid) { + ResultBean rb = ResultBean.fireFail(); + CrmCustomerTemp crmCustomerTemp = crmCustomerTempService.fetchBySid(sid); + return rb.success().setData(crmCustomerTemp); + } + + @Override + public ResultBean updateByEntity(CrmCustomerTemp crmCustomerTemp) { + ResultBean rb = ResultBean.fireFail(); + crmCustomerTempService.updateById(crmCustomerTemp); + return rb.success(); + } + } 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 a204e3d756..17ff9d11bc 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 @@ -78,7 +78,7 @@ public interface FinCompanyInvoicingMapper extends BaseMapper qySelByUseOrgSid(@Param(Constants.WRAPPER) QueryWrapper qw); - @Select("select * from fin_company_invoicing where taxpayerNo = #{taxpayerNo} and isDelete = 0") + FinCompanyInvoicingDetailsVo selectInvoingByTaxpayerNo(String taxpayerNo); @Select("select * from fin_company_invoicing where useOrgSid = #{userOrgSid} and isDelete = 0") 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 795a35a950..82e883752c 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 @@ -37,7 +37,8 @@ - + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index f0dc31ee96..b575f6e930 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -59,6 +59,7 @@ public enum ProcDefEnum { LOANHOMEVISITAPPEALAPPLY("家访考察申诉", "process_8ujil3h3:1:3665004"), BUSVALCUSTFILING("价值客户备案申请", "process_n8fwpitk:2:5085004"), LOANCUSTOMERRECORD("欠款客户备案", "process_x6o0chx9:1:5715004"), + BUSSOLUTIONSCHANGE("金融方案变更", "process_x6edjfoj:1:5932504"), /******************************测试流程id*********************************************/ diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecord.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecord.java index f705aad5b3..aa2ab7c670 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecord.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecord.java @@ -87,5 +87,11 @@ public class LoanCustomerRecord extends BaseEntity { private String taskId; // taskId @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("证件地址") + private String cardAddress; // 申请人组织路径 + @ApiModelProperty("证件号") + private String idNumber; // 申请人组织路径 + @ApiModelProperty("证件有效期") + private String endDate; // 申请人组织路径 } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordDto.java index d5b3b201de..0c26feb09a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanCustomerRecordDto.java @@ -58,6 +58,12 @@ public class LoanCustomerRecordDto implements Dto { private String customerSid; @ApiModelProperty("客户") private String customer; + @ApiModelProperty("客户证件号") + private String clientNo; + @ApiModelProperty("客户证件有效期") + private String documentsDate; + @ApiModelProperty("客户地址") + private String clientAddress; @ApiModelProperty("客户类型key") private String customerTypeKey; @ApiModelProperty("客户类型") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordDto.java index ad9428fc45..23f591a355 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppCustomerRecordDto.java @@ -53,9 +53,9 @@ public class AppCustomerRecordDto implements Dto { // private String mobile; // private String name; private String customerTypeKey; - // private String addressNss; -// private String idDate; -// private String idNumber; + private String addressNss; + private String idDate; + private String idNumber; // private String idType; private String isGK; private List staffs = new ArrayList<>(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java index a26d21ee0f..7c2708c3d6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java @@ -17,7 +17,9 @@ import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApplyFeign; import com.yxt.anrui.base.api.basedistributorapply.BaseSalesManger; import com.yxt.anrui.base.api.basedistributorapply.flow.DistributorDelegateQuery; import com.yxt.anrui.base.api.basedistributorapplyappendix.BaseDistributorApplyAppendixVo; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempUpdateDto; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDto; @@ -222,6 +224,15 @@ public class LoanCustomerRecordService extends MybatisBaseService saveRecord(LoanCustomerRecordDto dto) { ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(dto.getClientNo())) { + return rb.setMsg("证件号码不能为空!"); + } String sid = ""; // 企业开票人员信息 List staffs = dto.getStaffs(); @@ -343,6 +334,15 @@ public class LoanCustomerRecordService extends MybatisBaseService" + "欠款客户备案"; + variables.put("orderNames", orderNames); LoanCustomerRecord loanCustomerRecord1 = fetchBySid(businessSid); String msgBusinessSid = loanCustomerRecord1.getSid(); //用户的部门全路径sid @@ -635,12 +646,23 @@ public class LoanCustomerRecordService extends MybatisBaseService otherInfo = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); vo.setOtherInfo(otherInfo); } - } else { vo.setUserSid(userSid); vo.setOrgPath(orgPath); @@ -1198,6 +1274,9 @@ public class LoanCustomerRecordService extends MybatisBaseService saveCustomerRecord(AppCustomerRecordDto dto) { ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(dto.getIdNumber())) { + return rb.setMsg("证件号码不能为空!"); + } String sid = ""; // 企业开票人员信息 List staffs = dto.getStaffs(); @@ -1268,6 +1347,15 @@ public class LoanCustomerRecordService extends MybatisBaseService" + "欠款客户备案"; + variables.put("orderNames", orderNames); LoanCustomerRecord loanCustomerRecord1 = fetchBySid(businessSid); String msgBusinessSid = loanCustomerRecord1.getSid(); //用户的部门全路径sid diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordDto.java index 1e649e0e63..85fa5ea2f7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/CustomerRecordDto.java @@ -51,9 +51,9 @@ public class CustomerRecordDto implements Dto { // private String mobile; // private String name; private String customerTypeKey; - // private String addressNss; -// private String idDate; -// private String idNumber; + private String addressNss; + private String idDate; + private String idNumber; // private String idType; private String isGK; private List staffs = new ArrayList<>();