diff --git a/anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationAdd.vue b/anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationAdd.vue index ce4d79ec13..7b7f750db9 100644 --- a/anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationAdd.vue +++ b/anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationAdd.vue @@ -33,7 +33,9 @@
车牌号
- {{ formobj.vehicleMark }} + + + diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantDto.java new file mode 100644 index 0000000000..90d1576342 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantDto.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.riskcenter.api.loanwarrantinformation; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/11/3 13:46 + */ +@Data +public class LoanWarrantDto implements Dto { + @ApiModelProperty("业务车辆sid") + private String busVinSid; + @ApiModelProperty("销售订单sid") + private String salesOrderSid; + @ApiModelProperty("审核状态key") + private String auditStateKey; + @ApiModelProperty("审核状态Value") + private String auditStateValue; + @ApiModelProperty("消贷合同号") + private String contractNo; + @ApiModelProperty("销售部门") + private String department; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("使用组织全路径") + private String orgSidPath; + private String createBySid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java index 85da645b06..742e279929 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeign.java @@ -32,6 +32,15 @@ public interface LoanWarrantInformationFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + /** + * 保存推送 + * + * @param + */ + @ApiOperation("审核保存") + @PostMapping("/saveWarrant") + public ResultBean saveWarrant(@RequestBody LoanWarrantDto dto); + /** * 审核回显 diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java index 1961c3b4c3..ae76447783 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanwarrantinformation/LoanWarrantInformationFeignFallback.java @@ -19,6 +19,11 @@ public class LoanWarrantInformationFeignFallback implements LoanWarrantInformati return null; } + @Override + public ResultBean saveWarrant(LoanWarrantDto dto) { + return null; + } + @Override public ResultBean getAuditInfo(String sid) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml index 3ca81c48d7..4d1468f832 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactMapper.xml @@ -14,7 +14,8 @@ bankName as bankName, useOrgName as company, staff as salesman, - borrowerName as lenderName + borrowerName as lenderName, + loanContractNo as contractId FROM loan_mortgage_information_transact ${ew.sqlSegment} @@ -43,7 +44,10 @@ resultType="com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactDetailsVo"> SELECT busVinSid, remarks, - date_format(mortgageDate, '%Y-%m-%d') as mortgageDate + date_format(mortgageDate, '%Y-%m-%d') as mortgageDate, + borrowerName as borrowerName, + vinNo, + loanContractNo as contractId from loan_mortgage_information_transact where busVinSid = #{busVinSid} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java index a9eabaf6bb..ef1925c532 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java @@ -28,6 +28,7 @@ import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.*; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantDto; import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; import com.yxt.anrui.riskcenter.biz.loanwarrantinformation.LoanWarrantInformationService; @@ -476,6 +477,17 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService pagging = baseMapper.newlistPage(page, qw); + List records = pagging.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (LoanMortgageInformationTransactVo record : records) { + if (pagerQuery.getType().equals("1")) { + record.setShowHandleBtn(true); + } else if (pagerQuery.getType().equals("2")) { + record.setShowHandleBtn(false); + } + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -495,7 +507,6 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(salesOrder.getOrgSidPath()); - if (orgSidByPath.getSuccess()) { - String userOrgSid = orgSidByPath.getData(); - warrantInformation.setUseOrgSid(userOrgSid); - ResultBean organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); - if (organizationVo.getSuccess()) { - SysOrganizationVo organizationVoData = organizationVo.getData(); - if (null != organizationVoData) { - warrantInformation.setUseOrgName(organizationVoData.getName()); - } - } - } - } - //创建人sid - if (StringUtils.isNotBlank(salesOrder.getCreateBySid())) { - warrantInformation.setCreateBySid(salesOrder.getCreateBySid()); - } - //销售部门 - if (StringUtils.isNotBlank(salesOrder.getOrgName())) { - warrantInformation.setDepartment(salesOrder.getOrgName()); - } - //销售专员 - if (StringUtils.isNotBlank(salesOrder.getStaffName())) { - warrantInformation.setSalesman(salesOrder.getStaffName()); - } - //根据销售订单sid查询消贷合同表 - BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData(); - if (null != loancontract) { - //消贷合同编号 - if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) { - warrantInformation.setContractNo(loancontract.getLoanContractNo()); - } - //贷款人 - if (StringUtils.isNotBlank(loancontract.getBorrowerName())) { - warrantInformation.setBorrowerName(loancontract.getBorrowerName()); - } - //资方 - if (StringUtils.isNotBlank(loancontract.getBankName())) { - warrantInformation.setBankName(loancontract.getBankName()); - } - } + if (StringUtils.isNotBlank(entity.getSalesOrderSid())) { + loanWarrantDto.setSalesOrderSid(entity.getSalesOrderSid()); + } + //组织全路径 + if (StringUtils.isNotBlank(entity.getOrgSidPath())) { + loanWarrantDto.setOrgSidPath(entity.getOrgSidPath()); + } + //创建人sid + if (StringUtils.isNotBlank(entity.getCreateBySid())) { + loanWarrantDto.setCreateBySid(entity.getCreateBySid()); + } + //销售部门 + if (StringUtils.isNotBlank(entity.getDept())) { + loanWarrantDto.setDepartment(entity.getDept()); + } + //销售专员 + if (StringUtils.isNotBlank(entity.getStaff())) { + loanWarrantDto.setSalesman(entity.getStaff()); + } + //消贷合同编号 + if (StringUtils.isNotBlank(entity.getLoanContractNo())) { + loanWarrantDto.setContractNo(entity.getLoanContractNo()); + } + //贷款人 + if (StringUtils.isNotBlank(entity.getBorrowerName())) { + loanWarrantDto.setBorrowerName(entity.getBorrowerName()); + } + //资方 + if (StringUtils.isNotBlank(entity.getBankName())) { + loanWarrantDto.setBankName(entity.getBankName()); + } + if (StringUtils.isNotBlank(entity.getBusVinSid())) { + loanWarrantDto.setBusVinSid(entity.getBusVinSid()); } + loanWarrantDto.setAuditStateKey("001"); + loanWarrantDto.setAuditStateValue("待审核"); + loanWarrantInformationService.saveWarrant(loanWarrantDto); } - loanWarrantInformationService.insert(warrantInformation); } return rb.success().setData(dto.getBusVinSid()); } public ResultBean getMortgageInfo(String busVinSid) { ResultBean rb = ResultBean.fireFail(); - LoanMortgageInformationTransactDetailsVo fetchVo = baseMapper.getMortgageInfo(busVinSid); - LoanMortgageInformationTransactDetailsVo vo = new LoanMortgageInformationTransactDetailsVo(); - //根据业务车辆sid查询 销售订单业务车辆表 - BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData(); - if (null != orderVehicle) { - if (StringUtils.isNotBlank(orderVehicle.getLinkNo())) { - vo.setVinNo(orderVehicle.getLinkNo()); - } - String salesOrderSid = orderVehicle.getSalesOrderSid(); - //根据销售订单sid查询消贷合同表 - BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData(); - if (null != loancontract) { - //消贷合同编号 - if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) { - vo.setContractId(loancontract.getLoanContractNo()); - } - //贷款人 - if (StringUtils.isNotBlank(loancontract.getBorrowerName())) { - vo.setBorrowerName(loancontract.getBorrowerName()); - } - } - //登记证 1-2页 - List fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). - collect(Collectors.toList()); - vo.setRegistrationFiles1(registrationFiles1); - } - //登记证 3-4页 - fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); - vo.setRegistrationFiles2(registrationFiles2); - } - //营运证 - fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.TAXI_FILES.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List taxiFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); - vo.setTaxiFiles(taxiFiles); - } - //行驶证 - fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.DRIVING_CARD_FILES.getAttachType()); - fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - List drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); - vo.setDrivingFiles(drivingFiles); - } + LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid); + //登记证 1-2页 + List fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List registrationFiles1 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setRegistrationFiles1(registrationFiles1); } - if (null != fetchVo) { - if (StringUtils.isNotBlank(fetchVo.getMortgageDate())) { - vo.setMortgageDate(fetchVo.getMortgageDate()); - } - if (StringUtils.isNotBlank(fetchVo.getRemarks())) { - vo.setRemarks(fetchVo.getRemarks()); - } -// else { -// vo.setMortgageDate("-"); -// } + //登记证 3-4页 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_TWO.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List registrationFiles2 = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setRegistrationFiles2(registrationFiles2); + } + //营运证 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.TAXI_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List taxiFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setTaxiFiles(taxiFiles); + } + //行驶证 + fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.DRIVING_CARD_FILES.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List drivingFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList()); + vo.setDrivingFiles(drivingFiles); } -// else { -// vo.setMortgageDate("-"); -// } vo.setBusVinSid(busVinSid); return rb.success().setData(vo); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java index 9037156ed7..492f0a970e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationRest.java @@ -29,6 +29,11 @@ public class LoanWarrantInformationRest implements LoanWarrantInformationFeign { return rb.success().setData(page); } + @Override + public ResultBean saveWarrant(LoanWarrantDto dto) { + return loanMortgageInformationTransactService.saveWarrant(dto); + } + @Override public ResultBean getAuditInfo(String sid) { return loanMortgageInformationTransactService.getAuditInfo(sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java index f586597e83..e9e94d18d8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java @@ -277,9 +277,6 @@ public class LoanWarrantInformationService extends MybatisBaseService 0) { + if (sbConNo.length() > 0) { sbConNo.delete(sbConNo.length() - 1, sbConNo.length()); vo.setContractNo(sbConNo.toString()); } @@ -355,6 +352,7 @@ public class LoanWarrantInformationService extends MybatisBaseService saveWarrant(LoanWarrantDto dto) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isNotBlank(dto.getBusVinSid())) { + LoanWarrantInformation loanWarrantInformation = baseMapper.fetchByBusVinSid(dto.getBusVinSid()); + if (loanWarrantInformation != null) { + BeanUtil.copyProperties(dto, loanWarrantInformation); + baseMapper.updateById(loanWarrantInformation); + } else { + LoanWarrantInformation entity = new LoanWarrantInformation(); + BeanUtil.copyProperties(dto, entity); + //组织全路径 + if (StringUtils.isNotBlank(dto.getOrgSidPath())) { + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath()); + if (orgSidByPath.getSuccess()) { + String userOrgSid = orgSidByPath.getData(); + entity.setUseOrgSid(userOrgSid); + ResultBean organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid); + if (organizationVo.getSuccess()) { + SysOrganizationVo organizationVoData = organizationVo.getData(); + if (null != organizationVoData) { + entity.setUseOrgName(organizationVoData.getName()); + } + } + } + } + baseMapper.insert(entity); + } + } + return rb.success(); + } }