diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index 0274137916..89b5d2f005 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -52,7 +52,7 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { List selectBybillingSid(@Param("billingSid") String billingSid); - @Select("SELECT COUNT(*) FROM fin_vehicle_invoice WHERE vehicleSid = #{vinSid}") + @Select("SELECT COUNT(*) FROM fin_vehicle_invoice WHERE vehicleSid = #{vinSid} AND billingStateKey != '003'") int selectCountByVinSid(String vehSid); VehicleInvoiceVo selectByVinSids(String vinSid); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransport.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransport.java index a9e33c4325..12e8f2f5ab 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransport.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransport.java @@ -63,7 +63,7 @@ public class LoanHomevisitInvestigateTransport extends BaseEntity { @ApiModelProperty("来回里程") private String roundTripMileage; // 来回里程 @ApiModelProperty("载重(吨)") - private String load; // 载重(吨) + private String deadWeight; // 载重(吨) @ApiModelProperty("每月/趟") private String monthlyTrip; // 每月/趟 @ApiModelProperty("每趟/元") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportDetailsVo.java index ae8b552d8b..a2f5409785 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportDetailsVo.java @@ -64,7 +64,7 @@ public class LoanHomevisitInvestigateTransportDetailsVo implements Vo { @ApiModelProperty("来回里程") private String roundTripMileage; // 来回里程 @ApiModelProperty("载重(吨)") - private String load; // 载重(吨) + private String deadWeight; // 载重(吨) @ApiModelProperty("每月/趟") private String monthlyTrip; // 每月/趟 @ApiModelProperty("每趟/元") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportDto.java index 77f392906d..6d638553a4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportDto.java @@ -64,7 +64,7 @@ public class LoanHomevisitInvestigateTransportDto implements Dto { @ApiModelProperty("来回里程") private String roundTripMileage; // 来回里程 @ApiModelProperty("载重(吨)") - private String load; // 载重(吨) + private String deadWeight; // 载重(吨) @ApiModelProperty("每月/趟") private String monthlyTrip; // 每月/趟 @ApiModelProperty("每趟/元") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportQuery.java index 300bccf798..da5be6d688 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportQuery.java @@ -62,7 +62,7 @@ public class LoanHomevisitInvestigateTransportQuery implements Query { @ApiModelProperty("来回里程") private String roundTripMileage; // 来回里程 @ApiModelProperty("载重(吨)") - private String load; // 载重(吨) + private String deadWeight; // 载重(吨) @ApiModelProperty("每月/趟") private String monthlyTrip; // 每月/趟 @ApiModelProperty("每趟/元") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportVo.java index 4e605079e5..fca74d5c53 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportVo.java @@ -64,7 +64,7 @@ public class LoanHomevisitInvestigateTransportVo implements Vo { @ApiModelProperty("来回里程") private String roundTripMileage; // 来回里程 @ApiModelProperty("载重(吨)") - private String load; // 载重(吨) + private String deadWeight; // 载重(吨) @ApiModelProperty("每月/趟") private String monthlyTrip; // 每月/趟 @ApiModelProperty("每趟/元") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java index c820e06060..d2adda5f54 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java @@ -74,5 +74,5 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper otherPersonnel = dto.getOtherPersonnel(); + List bankCardImages = dto.getBankCardImages(); LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto(); LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(dto.getSid()); if (loanHomevisitInvestigateCustomerDetailsVo == null) { @@ -527,7 +528,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService 0) { + for (String yhk : bankCardImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); + if (yhk.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + yhk = yhk.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(yhk); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + } loanHomevisitInvestigateOtherpeoService.delByMainSid(dto.getSid()); for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) { LoanHomevisitInvestigateOtherpeoDto loanHomevisitInvestigateOtherpeoDto = new LoanHomevisitInvestigateOtherpeoDto(); - BeanUtil.copyProperties(loanHomeVisitInvestigateSaveOtherPeoDto, loanHomevisitInvestigateOtherpeoDto); + BeanUtil.copyProperties(loanHomeVisitInvestigateSaveOtherPeoDto, loanHomevisitInvestigateOtherpeoDto, "sid"); loanHomevisitInvestigateOtherpeoDto.setPeoTypeKey(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelKey()); loanHomevisitInvestigateOtherpeoDto.setPeoType(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelType()); loanHomevisitInvestigateOtherpeoDto.setPeoName(loanHomeVisitInvestigateSaveOtherPeoDto.getName()); @@ -562,8 +578,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService SELECT sid, peoName AS name, - peoType AS personnelKey, + peoTypeKey AS personnelKey, + peoType AS personnelType, mobile, idNumber AS idCard, peoDomAddress AS residentAddress, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java index 8676ee11a1..c00dd19f8e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java @@ -55,59 +55,59 @@ import java.util.List; */ @Service public class LoanHomevisitInvestigateOtherpeoService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(LoanHomevisitInvestigateOtherpeoQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - LoanHomevisitInvestigateOtherpeoQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanHomevisitInvestigateOtherpeoDto dto){ + private QueryWrapper createQueryWrapper(LoanHomevisitInvestigateOtherpeoQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + LoanHomevisitInvestigateOtherpeoQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanHomevisitInvestigateOtherpeoDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(LoanHomevisitInvestigateOtherpeoDto dto){ - LoanHomevisitInvestigateOtherpeo entity = new LoanHomevisitInvestigateOtherpeo(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(LoanHomevisitInvestigateOtherpeoDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(LoanHomevisitInvestigateOtherpeoDto dto) { + LoanHomevisitInvestigateOtherpeo entity = new LoanHomevisitInvestigateOtherpeo(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanHomevisitInvestigateOtherpeoDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - LoanHomevisitInvestigateOtherpeo entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanHomevisitInvestigateOtherpeoDetailsVo fetchDetailsVoBySid(String sid){ - LoanHomevisitInvestigateOtherpeo entity = fetchBySid(sid); - LoanHomevisitInvestigateOtherpeoDetailsVo vo = new LoanHomevisitInvestigateOtherpeoDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + LoanHomevisitInvestigateOtherpeo entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanHomevisitInvestigateOtherpeoDetailsVo fetchDetailsVoBySid(String sid) { + LoanHomevisitInvestigateOtherpeo entity = fetchBySid(sid); + LoanHomevisitInvestigateOtherpeoDetailsVo vo = new LoanHomevisitInvestigateOtherpeoDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public List selByMainSid(String sid) { - return baseMapper.selByMainSid(sid); - } + public List selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } - public void delByMainSid(String sid) { - baseMapper.delByMainSid(sid); - } + public void delByMainSid(String sid) { + baseMapper.delByMainSid(sid); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml index 69e082a760..9af14f754e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml @@ -28,7 +28,7 @@ transportGoodsTrip AS transportGoodsGoTo, transportGoodsRetTrip AS transportGoodsReturn, roundTripMileage AS mileage, - `load` AS deadWeight, + deadWeight, monthlyTrip AS monthCount, perTripYuan AS countPrice, fuelConsumptionPerTrip AS fuelConsumption, diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitVo.java index 6777e8f911..2ca422c300 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/8/26 10:51 @@ -30,4 +32,14 @@ public class AppLoanHomeVisitVo implements Vo { private String json; private String requestCode; + + private String pluginName; + + private String aRouterClass; + + private String aRouterMethod; + + private List aRouterParamType; + + private List aRouterParamValue; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 22031c2b40..1164768d2e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -134,7 +134,10 @@ public class LoanHomeVisitInvestigateService { public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { ResultBean rb = ResultBean.fireFail(); - loanHomevisitInvestigateFeign.saveReportInfo(comment,agree,sid); + ResultBean resultBean = loanHomevisitInvestigateFeign.saveReportInfo(comment, agree, sid); + if (!resultBean.getSuccess()){ + return rb.setMsg(resultBean.getMsg()); + } return rb.success(); }