diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java index 72f80b03a7..f0b582ab98 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java @@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-riskcenter(家访考察)
- * File: LoanHomevisitInvestigateOtherpeo.java
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo
- * Description: 家访考察-其他人员.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-08-10 15:13:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "家访考察-其他人员", description = "家访考察-其他人员") @TableName("loan_homevisit_investigate_otherpeo") @@ -52,26 +39,28 @@ public class LoanHomevisitInvestigateOtherpeo extends BaseEntity { @ApiModelProperty("人员身份key") private String peoTypeKey; - @ApiModelProperty("人员身份") + @ApiModelProperty("人员身份") private String peoType; // 人员身份 - @ApiModelProperty("姓名") + @ApiModelProperty("姓名") private String peoName; // 姓名 - @ApiModelProperty("身份证号") + @ApiModelProperty("身份证号") private String idNumber; // 身份证号 - @ApiModelProperty("手机号") + @ApiModelProperty("手机号") private String mobile; // 手机号 - @ApiModelProperty("户籍地址") + @ApiModelProperty("户籍地址") private String peoDomAddress; // 户籍地址 - @ApiModelProperty("现住址") + @ApiModelProperty("现住址") private String peoPreAddress; // 现住址 - @ApiModelProperty("工作单位") + @ApiModelProperty("工作单位") private String workUnit; // 工作单位 - @ApiModelProperty("职业key") + @ApiModelProperty("职业key") private String peoCareerKey; // 职业key - @ApiModelProperty("职业value") + @ApiModelProperty("职业value") private String peoCareerValue; // 职业value - @ApiModelProperty("家访考察表sid") + @ApiModelProperty("家访考察表sid") private String mainSid; // 家访考察表sid @ApiModelProperty("销售订单车辆sid") private String saleVehSid; + @ApiModelProperty("是否是催收措施增加的担保人") + private Integer isCs; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java index 7b53e36be4..e896587fbf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java @@ -58,6 +58,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanbecollectionapply.*; import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDbrDetailsVo; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto; @@ -382,7 +383,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanFiles1 = loanFileService.selectByLinkSid(loanBeCollectionVehDetailsVo.getSid(), LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType()); @@ -522,13 +523,19 @@ public class LoanBeCollectionApplyService extends MybatisBaseService collMeasures = dto.getCollMeasures(); List loanBeCollectionVehDetails = dto.getLoanBeCollectionVehDetails(); - if (collMeasures.contains("远程控制")) { - for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) { - int i = loanBeCollectionVehService.selKzStateBySaleVehSid(loanBeCollectionVehDetail.getSaleVehSid(),dto.getSid()); + for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) { + if (collMeasures.contains("远程控制")) { + int i = loanBeCollectionVehService.selKzStateBySaleVehSid(loanBeCollectionVehDetail.getSaleVehSid(), dto.getSid()); if (i > 0) { return rb.setMsg("车架号" + loanBeCollectionVehDetail.getVinNo() + "已存在审批中(待控制/控制成功),不可再次勾选远程控制措施。"); } } + if (collMeasures.contains("增加担保人")) { + LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(loanBeCollectionVehDetail.getSaleVehSid()); + if (loanBeCollectionVehDbrDetailsVo == null || StringUtils.isBlank(loanBeCollectionVehDbrDetailsVo.getPeoName())) { + return rb.setMsg("车架号" + loanBeCollectionVehDetail.getVinNo() + "没有添加担保人信息"); + } + } } LoanBeCollectionApply loanBeCollectionApply = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, loanBeCollectionApply); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java index 3508d00aa4..ba8c3cf316 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java @@ -147,12 +147,13 @@ public class LoanBeCollectionVehService extends MybatisBaseService dbrsfzs = loanHomevisitInvestigateFileService.selBySaleVehSidAndTypeKey(saleVehSid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); List sfzs = new ArrayList<>(); if (dbrsfzs != null && dbrsfzs.size() > 0){ @@ -202,6 +203,7 @@ public class LoanBeCollectionVehService extends MybatisBaseService sfzFiles = dto.getSfzFiles(); if (sfzFiles != null && sfzFiles.size() > 0){ for (LoanBeCollectionFileVo sfzFile : sfzFiles) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java index 9149bf7ea9..f8ab269bbb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java @@ -37,43 +37,27 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevis import java.util.List; -/** - * Project: anrui-riskcenter(家访考察)
- * File: LoanHomevisitInvestigateOtherpeoMapper.java
- * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoMapper
- * Description: 家访考察-其他人员.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-08-10 15:13:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface LoanHomevisitInvestigateOtherpeoMapper extends BaseMapper { - //@Update("update loan_homevisit_investigate_otherpeo set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from loan_homevisit_investigate_otherpeo") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from loan_homevisit_investigate_otherpeo") + List selectListVo(); List selByMainSid(String sid); - @Delete("DELETE FROM loan_homevisit_investigate_otherpeo WHERE mainSid = #{sid}") - void delByMainSid(String sid); + @Delete("DELETE FROM loan_homevisit_investigate_otherpeo WHERE mainSid = #{sid}") + void delByMainSid(String sid); - @Update("update loan_homevisit_investigate_otherpeo set mainSid = #{mainSid} where sid = #{sid}") - void updateMainSid(@Param("sid") String sid,@Param("mainSid") String mainSid); + @Update("update loan_homevisit_investigate_otherpeo set mainSid = #{mainSid} where sid = #{sid}") + void updateMainSid(@Param("sid") String sid, @Param("mainSid") String mainSid); - @Select("select * from loan_homevisit_investigate_otherpeo where mainSid = #{mainSid} and saleVehSid = #{saleVehSid}") - LoanHomevisitInvestigateOtherpeoDetailsVo selByMainSidAndSaleVehSid(@Param("mainSid") String mainSid,@Param("saleVehSid") String saleVehSid); + @Select("select * from loan_homevisit_investigate_otherpeo where mainSid = #{mainSid} and saleVehSid = #{saleVehSid} and isCs = 1") + LoanHomevisitInvestigateOtherpeoDetailsVo selByMainSidAndSaleVehSid(@Param("mainSid") String mainSid, @Param("saleVehSid") String saleVehSid); - @Delete("DELETE FROM loan_homevisit_investigate_otherpeo WHERE saleVehSid = #{saleVehSid}") + @Delete("DELETE FROM loan_homevisit_investigate_otherpeo WHERE saleVehSid = #{saleVehSid}") void delBySaleVehSid(String saleVehSid); } \ No newline at end of file