Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue

@@ -13,7 +13,7 @@
           <el-col :span="24">
             <div class="span-sty"><span class="icon">*</span>生成合同设置</div>
             <el-form-item>
-              <el-radio-group class="addinputInfo" :disabled="contractDisabled" style="font-size: 1px" v-model="contractKey">
+              <el-radio-group class="addinputInfo" :disabled="contractDisabled" style="font-size: 1px" v-model="formobj.conSetUpKey">
                 <el-radio label="001">一车一合同</el-radio>
                 <el-radio label="002">一贷款人一合同</el-radio>
               </el-radio-group>
@@ -283,7 +283,6 @@ export default {
       viewTitle: '',
       submitdisabled: false,
       contractDisabled: false,
-      contractKey: '',
       tableKey: 0,
       index: 0,
       career_list: [],
@@ -303,6 +302,7 @@ export default {
         bankNumber: '',
         children: '',
         childrenKey: '',
+        conSetUpKey: '',
         emergencyContactMobile: '',
         emergencyContactName: '',
         emergencyContactType: '',
@@ -387,7 +387,7 @@ export default {
             this.contractDisabled = false
           } else {
             this.contractDisabled = true
-            this.contractKey = res.data
+            this.formobj.conSetUpKey = res.data
           }
         }
       })
@@ -461,7 +461,7 @@ export default {
       }
     },
     saveOrUpdate() {
-      if (this.contractKey === '') {
+      if (this.formobj.conSetUpKey === '') {
         this.$message({ showClose: true, type: 'error', message: '生成合同设置不能为空' })
         return
       }
@@ -494,7 +494,7 @@ export default {
                 spinner: 'el-icon-loading',
                 background: 'rgba(0, 0, 0, 0.7)'
               })
-              req.saveLoanCon({ sid: this.formobj.sid, conSetUpKey: this.contractKey }).then((res) => {
+              req.saveLoanCon({ sid: this.formobj.sid, conSetUpKey: this.formobj.conSetUpKey }).then((res) => {
                 if (res.success) {
                   loading.close()
                   this.$message({ showClose: true, type: 'success', message: '操作成功' })
@@ -525,6 +525,7 @@ export default {
         bankNumber: '',
         children: '',
         childrenKey: '',
+        conSetUpKey: '',
         emergencyContactMobile: '',
         emergencyContactName: '',
         emergencyContactType: '',
@@ -553,7 +554,6 @@ export default {
         vehRegis: ''
       }
       this.submitdisabled = false
-      this.contractKey = ''
       this.contractDisabled = false
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')

anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue

@@ -60,6 +60,15 @@
           </el-row>
           <div v-if="formobj.isOtherPolicy == '1'">
             <div class="title">其它融<span>({{ formobj.otherPolicyName }})</span></div>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">资方合同号</div>
+                <el-form-item>
+                  <span v-if="formobj.sameBank == '1'" class="addinputInfo">{{ formobj.otherBankNo }}</span>
+                  <el-input v-else class="addinputInfo" style="width: 30%" v-model="formobj.otherBankNo" clearable placeholder=""/>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="8">
                 <div class="span-sty">贷款金额</div>
@@ -127,6 +136,7 @@ export default {
         mainLastRepay: '',
         otherPolicyName: '',
         otherAmount: '',
+        otherBankNo: '',
         otherPeriod: '',
         otherRepayDate: '',
         otherFirstRepay: '',
@@ -200,6 +210,7 @@ export default {
         otherPolicyName: '',
         otherAmount: '',
         otherPeriod: '',
+        otherBankNo: '',
         otherRepayDate: '',
         otherFirstRepay: '',
         otherMidRepay: '',

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitReportStateVo.java

@@ -19,4 +19,7 @@ public class LoanHomeVisitInvestigateInitReportStateVo implements Vo {
     private int transportState;
     @ApiModelProperty("资产情况")
     private int assetsState;
+
+    @ApiModelProperty("合同路径")
+    private String downloadUrl;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigate.java

@@ -66,5 +66,6 @@ public class LoanHomevisitInvestigate extends BaseEntity {
     private String saleOrderSid;
 	@ApiModelProperty("销售订单贷款人表sid")
     private String saleOrderBorrowerSid;
-
+    @ApiModelProperty("家访准备sid")
+    private String prepSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDetailsVo.java

@@ -67,5 +67,6 @@ public class LoanHomevisitInvestigateDetailsVo implements Vo {
     private String saleOrderSid;
 	@ApiModelProperty("销售订单贷款人表sid")
     private String saleOrderBorrowerSid;
-
+    @ApiModelProperty("家访准备sid")
+    private String prepSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateDto.java

@@ -67,5 +67,6 @@ public class LoanHomevisitInvestigateDto implements Dto {
     private String saleOrderSid;
 	@ApiModelProperty("销售订单贷款人表sid")
     private String saleOrderBorrowerSid;
-
+    @ApiModelProperty("家访准备sid")
+    private String prepSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java

@@ -87,4 +87,6 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto {
     private String accCompxAddress;
     @ApiModelProperty("挂车或上装是否公司采购（0是，1否）")
     private String isCompBuy;
+    @ApiModelProperty("001一车一合同 002一贷款人一合同")
+    private String conSetUpKey;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomer.java

@@ -123,5 +123,9 @@ public class LoanHomevisitInvestigateCustomer extends BaseEntity {
     private String accCompxAddress;
     @ApiModelProperty("挂车或上装是否公司采购（0是，1否）")
     private String isCompBuy;
+    @ApiModelProperty("001一车一合同 002一贷款人一合同")
+    private String conSetUpKey;
+    @ApiModelProperty("合同路径")
+    private String contractUrl;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java

@@ -124,4 +124,8 @@ public class LoanHomevisitInvestigateCustomerDetailsVo implements Vo {
     private String accCompxAddress;
     @ApiModelProperty("挂车或上装是否公司采购（0是，1否）")
     private String isCompBuy;
+    @ApiModelProperty("001一车一合同 002一贷款人一合同")
+    private String conSetUpKey;
+    @ApiModelProperty("合同路径")
+    private String contractUrl;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDto.java

@@ -124,4 +124,8 @@ public class LoanHomevisitInvestigateCustomerDto implements Dto {
     private String accCompxAddress;
     @ApiModelProperty("挂车或上装是否公司采购（0是，1否）")
     private String isCompBuy;
+    @ApiModelProperty("001一车一合同 002一贷款人一合同")
+    private String conSetUpKey;
+    @ApiModelProperty("合同路径")
+    private String contractUrl;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java

@@ -75,4 +75,9 @@ public interface LoanHomevisitInvestigateCustomerFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据主表sid查询")
+    @GetMapping("/selectByMainSid")
+    @ResponseBody
+    ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByMainSid(@RequestParam("mainSid") String mainSid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java

@@ -69,4 +69,9 @@ public class LoanHomevisitInvestigateCustomerFeignFallback implements LoanHomevi
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-riskcenter/loanhomevisitinvestigatecustomer/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByMainSid(String mainSid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -74,6 +74,7 @@ import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevis
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitprep.LoanHomevisitPrepService;
+import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.PushMessageQuery;
@@ -138,6 +139,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
 
     public PagerVo<LoanHomevisitInvestigateVo> listPageVo(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
         LoanHomevisitInvestigateQuery query = pq.getParams();
@@ -402,6 +405,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             }else {
                 loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
             }
+            //合同路径
+            if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl())){
+                loanHomeVisitInvestigateInitReportStateVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + loanHomevisitInvestigateCustomerDetailsVo.getContractUrl());
+            }
         }
         //订单信息状态
         LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(sid);
@@ -620,6 +627,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomevisitInvestigateCustomerDto.setAccCompAddress(dto.getAccCompAddress());
         loanHomevisitInvestigateCustomerDto.setAccCompxAddress(dto.getAccCompxAddress());
         loanHomevisitInvestigateCustomerDto.setIsCompBuy(dto.getIsCompBuy());
+        loanHomevisitInvestigateCustomerDto.setConSetUpKey(dto.getConSetUpKey());
         loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
         loanHomevisitInvestigateFileService.delByMainSidAndType(dto.getSid(), LoanAttachTypeEnum.YHK.getAttachType());
         if (bankCardImages.size() > 0) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java

@@ -73,4 +73,10 @@ public interface LoanHomevisitInvestigateCustomerMapper extends BaseMapper<LoanH
 
 	@Update("update loan_homevisit_investigate_customer set mainSid = #{mainSid} where sid = #{sid}")
 	void updateMainSid(@Param("sid") String sid,@Param("mainSid") String mainSid);
+
+	@Update("update loan_homevisit_investigate_customer set contractUrl = #{urlAll} where mainSid = #{mainSid}")
+    void updateContractUrl(@Param("mainSid") String mainSid,@Param("urlAll") String urlAll);
+
+	@Select("select * from loan_homevisit_investigate_customer where mainSid = #{mainSid}")
+	LoanHomevisitInvestigateCustomerDetailsVo selectByMainSid(String mainSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java

@@ -97,4 +97,11 @@ public class LoanHomevisitInvestigateCustomerRest implements LoanHomevisitInvest
 		LoanHomevisitInvestigateCustomerDetailsVo vo = loanHomevisitInvestigateCustomerService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByMainSid(String mainSid) {
+		ResultBean rb = ResultBean.fireFail();
+		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selectByMainSid(mainSid);
+		return rb.success().setData(loanHomevisitInvestigateCustomerDetailsVo);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java

@@ -119,4 +119,12 @@ public class LoanHomevisitInvestigateCustomerService extends MybatisBaseService<
 	public void updateMainSid(String sid, String mainSid) {
 		baseMapper.updateMainSid(sid,mainSid);
 	}
+
+	public void updateContractUrl(String mainSid, String urlAll) {
+		baseMapper.updateContractUrl(mainSid,urlAll);
+	}
+
+	public LoanHomevisitInvestigateCustomerDetailsVo selectByMainSid(String mainSid) {
+		return baseMapper.selectByMainSid(mainSid);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -267,6 +267,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         LoanHomevisitInvestigate loanHomevisitInvestigate = new LoanHomevisitInvestigate();
         loanHomevisitInvestigate.setSaleOrderSid(loanHomevisitPrep.getSaleOrderSid());
         loanHomevisitInvestigate.setSaleOrderBorrowerSid(loanHomevisitPrep.getSaleOrderBorrowerSid());
+        loanHomevisitInvestigate.setPrepSid(sid);
         loanHomevisitInvestigateService.save(loanHomevisitInvestigate);
         //查询是否已存在客户信息并关联
         LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(loanHomevisitPrep.getSaleOrderBorrowerSid());
@@ -360,10 +361,10 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         String urlAllVo = "";
         List<File> filesList = new ArrayList<>();
         //贷款人生成车辆买卖合同
-       /* List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
+        List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
         for (File xcmmContractUrl : xcmmContractUrls) {
             filesList.add(xcmmContractUrl);
-        }*/
+        }
         if (conSetUpKey.equals("001")) {//一车一合同
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@@ -390,7 +391,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 busSalesOrderLoancontractDto.setBusName("资方终审确认");
                 String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
                 busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
-              /*  //生成车辆融资协议
+                //生成车辆融资协议
                 String clrzxyUrl = generateCLRZXY(printConfirmDto);
                 //生成还款协议
                 String hkxyUrl = hkxy(printConfirmDto);
@@ -419,7 +420,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 if (StringUtils.isNotBlank(gsgddwdbjy)) {
                     File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
                     filesList.add(file);
-                }*/
+                }
             }
         } else if (conSetUpKey.equals("002")) {//一人一合同
             List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@@ -450,7 +451,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
             }
-           /* //生成车辆融资协议
+            //生成车辆融资协议
             String clrzxyUrl = generateCLRZXY(printConfirmDto);
             //生成还款协议
             String hkxy = hkxy(printConfirmDto);
@@ -479,7 +480,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             if (StringUtils.isNotBlank(gsgddwdbjy)) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
                 filesList.add(file);
-            }*/
+            }
         }
         //合并pdf文件
         if (filesList.size() > 0) {
@@ -493,6 +494,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             urlAll = typeName;
         }
         if (StringUtils.isNotBlank(urlAll)) {
+            loanHomevisitInvestigateCustomerService.updateContractUrl(sid,urlAll);
             urlAllVo = docPdfComponent.getPrefixTemplateUrl() + urlAll;
         }
         return rb.success().setData(urlAllVo);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java

@@ -19,4 +19,7 @@ public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo {
     private String transportState;
     @ApiModelProperty("资产情况")
     private String assetsState;
+
+    @ApiModelProperty("合同路径")
+    private String downloadUrl;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java

@@ -169,6 +169,11 @@ public interface LoanHomeVisitInvestigateFeign {
     @ResponseBody
     public ResultBean<AppLoanHomeVisitInitAppealVo> getHomeVisitAppealInfo(@RequestParam("kcSid") String kcSid,@RequestParam(value = "ssSid",required = false) String ssSid);
 
+    @ApiOperation("重新生成合同")
+    @GetMapping("/reContract")
+    @ResponseBody
+    public ResultBean<String> reContract(@RequestParam("sid") String sid);
+
     /****************************************流程审批******************************************/
 
     @ApiOperation("提交流程")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java

@@ -184,6 +184,11 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
         return loanHomeVisitInvestigateService.getHomeVisitAppealInfo(kcSid, ssSid);
     }
 
+    @Override
+    public ResultBean<String> reContract(String sid) {
+        return loanHomeVisitInvestigateService.reContract(sid);
+    }
+
     @Override
     public ResultBean submitCreditInfo(SubmitHomeAppealApplyDto dto) {
         return loanHomeVisitInvestigateService.submitCreditInfo(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -32,6 +32,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateSaveOperDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo;
@@ -43,6 +45,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVis
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto;
@@ -67,6 +70,10 @@ public class LoanHomeVisitInvestigateService {
     @Autowired
     private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
     @Autowired
+    private LoanHomevisitInvestigateCustomerFeign loanHomevisitInvestigateCustomerFeign;
+    @Autowired
+    private LoanHomevisitPrepFeign loanHomevisitPrepFeign;
+    @Autowired
     private LoanHomevisitAppealFeign loanHomevisitAppealFeign;
     @Autowired
     private CommonService commonService;
@@ -550,4 +557,21 @@ public class LoanHomeVisitInvestigateService {
         appLoanHomeVisitInitAppealVo.setOrderPage(orderPage2);
         return rb.success().setData(appLoanHomeVisitInitAppealVo);
     }
+
+    public ResultBean<String> reContract(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(sid).getData();
+        if (loanHomevisitInvestigateCustomerDetailsVo == null){
+            return rb.setMsg("请优先完善客户信息");
+        }
+        if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getConSetUpKey())){
+            return rb.setMsg("请联系管理员补充合同生成规则");
+        }
+        LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateFeign.fetchDetailsBySid(sid).getData();
+        if (StringUtils.isBlank(loanHomevisitInvestigateDetailsVo.getPrepSid())){
+            return rb.setMsg("旧版本数据暂无法重新生成合同");
+        }
+        String contractUrl = loanHomevisitPrepFeign.saveLoanCon(loanHomevisitInvestigateDetailsVo.getPrepSid(), loanHomevisitInvestigateCustomerDetailsVo.getConSetUpKey()).getData();
+        return rb.success().setData(contractUrl);
+    }
 }