问题修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java

@@ -101,7 +101,7 @@ public interface BusSalesOrderBorrowerFeign {
     @ResponseBody
     public ResultBean<List<BusSalesOrderBorrowerDetailsVo>> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid);
 
-    @ApiOperation("修改贷款人状态")
+    @ApiOperation("修改贷款人及贷款合同状态")
     @PostMapping("/updateState")
     @ResponseBody
     ResultBean updateState(@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid,@RequestParam("state") String state);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -99,4 +99,7 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
 
     @Update("update bus_sales_order_borrower set state = #{state} where sid = #{saleOrderBorrowerSid}")
     void updateState(@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid,@Param("state") String state);
+
+    @Update("update bus_sales_order_loancontract set state = #{state} where borrowerSid = #{saleOrderBorrowerSid}")
+    void updateState2(@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid,@Param("state") String state);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -322,6 +322,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
     public ResultBean updateState(String saleOrderBorrowerSid, String state) {
         ResultBean rb = ResultBean.fireFail();
         baseMapper.updateState(saleOrderBorrowerSid, state);
+        baseMapper.updateState2(saleOrderBorrowerSid, state);
         return rb.success();
     }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyDetailsVo.java

@@ -106,6 +106,8 @@ public class LoanPreloanCreditApplyDetailsVo implements Vo {
     private String zfshRemarks;
     @ApiModelProperty("申诉结果")
     private String ssjg;
+    @ApiModelProperty("有效期")
+    private String dateTo;
     @ApiModelProperty("身份证正反面附件")
     private List<String> idCardImages = new ArrayList<>();
     @ApiModelProperty("贷前信用审核人员列表")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml

@@ -80,24 +80,27 @@
     <select id="getHomeAppealList2"
             resultType="com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomeVisitAppealPageVo">
         SELECT la.sid,
-               la.homeVisitSid AS kcSid,
-               la.nodeState,
-               bo.`contractNo` AS contractId,
-               bo.`useOrgName`,
-               bo.`orgName`,
-               bo.`staffName`,
-               bb.`borrowerName`   AS lenderName,
-               bb.`mobile`,
-               li.homeVisStaffName AS jfMember,
-               li.resHomeVisDate   AS times,
-               li.`remarks`,
-               la.`appealReason`
+        la.homeVisitSid AS kcSid,
+        la.nodeState,
+        bo.`contractNo` AS contractId,
+        bo.`useOrgName`,
+        bo.`orgName`,
+        bo.`staffName`,
+        bb.`borrowerName` AS lenderName,
+        bb.`mobile`,
+        li.homeVisStaffName AS jfMember,
+        li.resHomeVisDate AS times,
+        li.`remarks`,
+        la.`appealReason`
         FROM loan_homevisit_appeal la
-                     LEFT JOIN loan_homevisit_investigate li
-                ON la.`homeVisitSid` = li.`sid`
-                     LEFT JOIN anrui_buscenter.`bus_sales_order` bo
-                ON li.`saleOrderSid` = bo.`sid`
-                     LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
-                ON li.`saleOrderBorrowerSid` = bb.`sid`
+        LEFT JOIN loan_homevisit_investigate li
+        ON la.`homeVisitSid` = li.`sid`
+        LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+        ON li.`saleOrderSid` = bo.`sid`
+        LEFT JOIN anrui_buscenter.`bus_sales_order_borrower` bb
+        ON li.`saleOrderBorrowerSid` = bb.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

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

@@ -81,4 +81,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
     int setState(String saleOrderBorrowerSid);
 
     int setState2(String saleOrderBorrowerSid);
+
+    @Update("update loan_homevisit_investigate set state = #{state},investigateKey = '',investigateValue = '' where sid = #{sid}")
+    void updateState(@Param("sid") String sid, @Param("state") String state);
 }

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

@@ -1728,4 +1728,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         loanHomeVisitInvestigateInitZLVo.setCarProperty(carProperty);
         return rb.success().setData(loanHomeVisitInvestigateInitZLVo);
     }
+
+    public void updateState(String sid, String state) {
+        baseMapper.updateState(sid,state);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java

@@ -31,6 +31,8 @@ public class CreditReviewDetailsOffVo extends CreditReviewDetailsVo{
     private String examineDate2;
     @ApiModelProperty("审核备注（资方）")
     private String examineRemarks2;
+    @ApiModelProperty("有效期")
+    private String dateTo;
     @ApiModelProperty("公司风控结果")
     private List<IdentityDetailsVo> companyResultDict = new ArrayList<>();
     @ApiModelProperty("资方风控结果")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@@ -650,6 +650,7 @@ public class CreditReviewService {
         creditReviewDetailsOffVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg());
         creditReviewDetailsOffVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate());
         creditReviewDetailsOffVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks());
+        creditReviewDetailsOffVo.setDateTo(loanPreloanCreditApplyDetailsVo.getDateTo());
         return rb.success().setData(creditReviewDetailsOffVo);
     }
 

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

@@ -95,6 +95,10 @@ public class LoanHomeVisitInvestigateService {
                 loanHomeVisitInvestigatePageVo.setNodeState("未预约");
                 loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(true);
             }
+            if (StringUtils.isNotBlank(record.getInvestigateValue())){
+                loanHomeVisitInvestigatePageVo.setNodeState(record.getInvestigateValue());
+                loanHomeVisitInvestigatePageVo.setShowAppointmentBtn(false);
+            }
             loanHomeVisitInvestigatePageVo.setSalesName(record.getStaffName());
             loanHomeVisitInvestigatePageVo.setCreateDate(record.getCreateDate());
             loanHomeVisitInvestigatePageVo.setLenderName(record.getBorrowerName());