修改

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(家访考察) <br/>
- * File: LoanHomevisitInvestigateOtherpeo.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo <br/>
- * Description: 家访考察-其他人员. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-08-10 15:13:46 <br/>
- *
- * @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;
 }

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<LoanBeColle
                 loanBeCollectionVehDetailsVo.setLockCarState("控制失败");
             } else if ("3".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("已解控");
-            }else if("4".equals(lockCarState)){
+            } else if ("4".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("解控中");
             }
             List<LoanFile> loanFiles1 = loanFileService.selectByLinkSid(loanBeCollectionVehDetailsVo.getSid(), LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType());
@@ -522,13 +523,19 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         ResultBean rb = ResultBean.fireFail();
         List<String> collMeasures = dto.getCollMeasures();
         List<LoanBeCollectionVehDto> 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);

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<LoanBeCollect
     }
 
     public LoanBeCollectionVehDbrDetailsVo initDbr(String saleVehSid) {
-        String applySid = baseMapper.selBySaleVehSid(saleVehSid);
-        LoanHomevisitInvestigateOtherpeoDetailsVo loanHomevisitInvestigateOtherpeoDetailsVo = loanHomevisitInvestigateOtherpeoService.selByMainSidAndSaleVehSid(applySid, saleVehSid);
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
+        String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());
+        LoanHomevisitInvestigateOtherpeoDetailsVo loanHomevisitInvestigateOtherpeoDetailsVo = loanHomevisitInvestigateOtherpeoService.selByMainSidAndSaleVehSid(sid, saleVehSid);
         LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = new LoanBeCollectionVehDbrDetailsVo();
         BeanUtil.copyProperties(loanHomevisitInvestigateOtherpeoDetailsVo, loanBeCollectionVehDbrDetailsVo);
         loanBeCollectionVehDbrDetailsVo.setSaleVehSid(saleVehSid);
-        loanBeCollectionVehDbrDetailsVo.setMainSid(applySid);
+        loanBeCollectionVehDbrDetailsVo.setMainSid(sid);
         List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzs = loanHomevisitInvestigateFileService.selBySaleVehSidAndTypeKey(saleVehSid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
         List<LoanBeCollectionFileVo> sfzs = new ArrayList<>();
         if (dbrsfzs != null && dbrsfzs.size() > 0){
@@ -202,6 +203,7 @@ public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollect
         loanHomevisitInvestigateOtherpeo.setPeoCareerValue(dto.getPeoCareerValue());
         loanHomevisitInvestigateOtherpeo.setMainSid(dto.getMainSid());
         loanHomevisitInvestigateOtherpeo.setSaleVehSid(dto.getSaleVehSid());
+        loanHomevisitInvestigateOtherpeo.setIsCs(1);
         List<LoanBeCollectionFileVo> sfzFiles = dto.getSfzFiles();
         if (sfzFiles != null && sfzFiles.size() > 0){
             for (LoanBeCollectionFileVo sfzFile : sfzFiles) {

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(家访考察) <br/>
- * File: LoanHomevisitInvestigateOtherpeoMapper.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoMapper <br/>
- * Description: 家访考察-其他人员. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-08-10 15:13:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface LoanHomevisitInvestigateOtherpeoMapper extends BaseMapper<LoanHomevisitInvestigateOtherpeo> {
 
-	//@Update("update loan_homevisit_investigate_otherpeo set name=#{msg} where id=#{id}")
-	//IPage<LoanHomevisitInvestigateOtherpeoVo> voPage(IPage<LoanHomevisitInvestigateOtherpeo> page, @Param(Constants.WRAPPER) QueryWrapper<LoanHomevisitInvestigateOtherpeo> qw);
+    IPage<LoanHomevisitInvestigateOtherpeoVo> selectPageVo(IPage<LoanHomevisitInvestigateOtherpeo> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitInvestigateOtherpeo> qw);
 
-	IPage<LoanHomevisitInvestigateOtherpeoVo> selectPageVo(IPage<LoanHomevisitInvestigateOtherpeo> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitInvestigateOtherpeo> qw);
+    List<LoanHomevisitInvestigateOtherpeoVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitInvestigateOtherpeo> qw);
 
-	List<LoanHomevisitInvestigateOtherpeoVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitInvestigateOtherpeo> qw);
-	
-	@Select("select * from loan_homevisit_investigate_otherpeo")
-	List<LoanHomevisitInvestigateOtherpeoVo> selectListVo();
+    @Select("select * from loan_homevisit_investigate_otherpeo")
+    List<LoanHomevisitInvestigateOtherpeoVo> selectListVo();
 
     List<LoanHomeVisitInvestigateInitOtherPeoVo> 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);
 }