问题修改

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

@@ -99,5 +99,8 @@
         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/loanhomevisitappeal/LoanHomevisitAppealService.java

@@ -135,7 +135,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgSidPath());
-			privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setMenuSid( query.getMenuSid());
             privilegeQuery.setUserSid(query.getUserSid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
             if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
@@ -204,7 +204,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
         qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')"
                 );
-		if (StringUtils.isNotBlank(query.getNames())){
+        if (StringUtils.isNotBlank(query.getNames())) {
             qw.and(wrapper -> wrapper.like("bo.contractNo", query.getNames()).or().like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames()));
         }
         qw.orderByDesc("li.createTime");
@@ -256,16 +256,17 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
                 return p;
             }
         }
-		if (StringUtils.isNotBlank(query.getNames())){
+        if (StringUtils.isNotBlank(query.getNames())) {
             qw.and(wrapper -> wrapper.like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames()));
         }
+        qw.orderByDesc("la.createTime");
         IPage<LoanHomevisitAppeal> page = PagerUtil.queryToPage(pq);
         IPage<LoanHomeVisitAppealPageVo> pagging = baseMapper.getHomeAppealList2(page, qw);
         PagerVo<LoanHomeVisitAppealPageVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-	public String saveOrUpdateDto(LoanHomevisitAppealDto dto){
+    public String saveOrUpdateDto(LoanHomevisitAppealDto dto) {
         String dtoSid = dto.getSsSid();
         List<String> ssImages = dto.getSsImages();
         if (StringUtils.isBlank(dtoSid)) {
@@ -313,7 +314,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
         return dtoSid;
     }
 
-	public String insertByDto(LoanHomevisitAppealDto dto){
+    public String insertByDto(LoanHomevisitAppealDto dto) {
         LoanHomevisitAppeal entity = new LoanHomevisitAppeal();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setNodeState("待提交");
@@ -322,7 +323,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
         return entity.getSid();
     }
 
-	public void updateByDto(LoanHomevisitAppealDto dto){
+    public void updateByDto(LoanHomevisitAppealDto dto) {
         String dtoSid = dto.getSsSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -346,22 +347,22 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
         return rb.success().setMsg("删除成功");
     }
 
-	public LoanHomevisitAppealDetailsVo fetchDetailsVoBySid(String sid,String type){
+    public LoanHomevisitAppealDetailsVo fetchDetailsVoBySid(String sid, String type) {
         //type1 初始化 type2 编辑回显
         LoanHomevisitAppealDetailsVo vo = new LoanHomevisitAppealDetailsVo();
         LoanHomevisitInvestigate loanHomevisitInvestigate;
-		if (type.equals("1")){
+        if (type.equals("1")) {
             loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(sid);
             vo.setOrderSid(loanHomevisitInvestigate.getSaleOrderSid());
             vo.setHomeVisitSid(sid);
-		}else {
+        } else {
             LoanHomevisitAppeal entity = fetchBySid(sid);
             BeanUtil.copyProperties(entity, vo);
             loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(entity.getHomeVisitSid());
             vo.setOrderSid(loanHomevisitInvestigate.getSaleOrderSid());
             List<LoanHomevisitInvestigateFileDetailsVo> ssfjImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.SSFJ.getAttachType());
             List<String> ssImages = new ArrayList<>();
-			if (ssfjImages != null && ssfjImages.size() > 0){
+            if (ssfjImages != null && ssfjImages.size() > 0) {
                 for (LoanHomevisitInvestigateFileDetailsVo ssfjImage : ssfjImages) {
                     ssImages.add(ssfjImage.getFileUrl());
                 }
@@ -375,7 +376,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
     public ResultBean submitHomeAppeal(SubmitHomeAppealDto dto) {
         ResultBean rb = ResultBean.fireFail();
         int i = baseMapper.selectKcSid(dto.getKcSid());
-		if (i > 0){
+        if (i > 0) {
             return rb.setMsg("该家访考察申诉已存在");
         }
         dto.getKcSid();
@@ -497,14 +498,9 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 //修改贷款人状态为正常(1正常，0作废)
-				busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(),"1");
-				//家访通过后推送家访资料审核
-				LoanHomevisitFileexamineDto loanHomevisitFileexamineDto = new LoanHomevisitFileexamineDto();
-				loanHomevisitFileexamineDto.setHomeVisitSid(loanHomevisitInvestigate.getSid());
-				loanHomevisitFileexamineDto.setSaleOrderSid(loanHomevisitInvestigate.getSaleOrderSid());
-				loanHomevisitFileexamineService.saveOrUpdateDto(loanHomevisitFileexamineDto);
-				//家访通过后修改贷款人阶段状态
-				busSalesOrderBorrowerFeign.updateBusNo("303","家访资料审核",loanHomevisitInvestigate.getSaleOrderBorrowerSid());
+                busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(), "1");
+                //修改家访考察为待考察，并清空考察结果
+                loanHomevisitInvestigateService.updateState(loanHomevisitInvestigate.getSid(), "1");
             } else {
                 //极光推送
                 try {
@@ -737,12 +733,12 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
         loanHomeVisitInitAppealVo.setInvestigateValue(loanHomevisitInvestigate.getInvestigateValue());
         loanHomeVisitInitAppealVo.setRemarks(loanHomevisitInvestigate.getRemarks());
         loanHomeVisitInitAppealVo.setSaleOrderSid(loanHomevisitInvestigate.getSaleOrderSid());
-		if (StringUtils.isNotBlank(ssSid)){//详情
+        if (StringUtils.isNotBlank(ssSid)) {//详情
             LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(ssSid);
             loanHomeVisitInitAppealVo.setAppealReason(loanHomevisitAppeal.getAppealReason());
             List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(ssSid, LoanAttachTypeEnum.SSFJ.getAttachType());
             List<String> ssImages = new ArrayList<>();
-			if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){
+            if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) {
                 for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) {
                     ssImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
                 }

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());