diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java index 73463b97f1..9b5b8a188b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java @@ -61,12 +61,12 @@ public interface LoanCapitalCreditResultFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("保存附件") + @ApiOperation("保存附件---作废") @PostMapping("/saveImages") @ResponseBody public ResultBean saveImages(@RequestBody List images, @RequestParam("sid") String sid); - @ApiOperation("查看附件") + @ApiOperation("查看附件---作废") @PostMapping("/selectImages") @ResponseBody public ResultBean> selectImages(@RequestParam("sid") String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java index 5b1471d3bb..54323b6b55 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-riskcenter(资方信审终审结果反馈)
* File: LoanCapitalCreditResultVo.java
@@ -77,4 +79,6 @@ public class LoanCapitalCreditResultVo implements Vo { private String bankContractNo; @ApiModelProperty("销售订单消贷合同sid") private String loanContractSid; + @ApiModelProperty("信审附件") + private List xsImages; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDto.java index 4f718374b8..122806b20a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealDto.java @@ -54,12 +54,12 @@ public class LoanHomevisitAppealDto implements Dto { private String sid; - @ApiModelProperty("家访考察意见") - private String homeVisOpinion; @ApiModelProperty("申诉原因") private String appealReason; @ApiModelProperty("家访考察sid") - private String homeVisitSid; + private String kcSid; + private String orgPath; + private String userSid; @ApiModelProperty("申请编号") private String billNo; @ApiModelProperty("申诉附件") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealVo.java index beb75bfc9b..f21f81dc1e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitappeal/LoanHomevisitAppealVo.java @@ -71,6 +71,8 @@ public class LoanHomevisitAppealVo implements Vo { private String borrowerName; @ApiModelProperty("手机号码") private String mobile; + @ApiModelProperty("资方") + private String bankName; @ApiModelProperty("金融产品名称") private String policyName; @ApiModelProperty("家访专员姓名") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java index b3cc19759a..46cd81709f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateReservationDto.java @@ -9,6 +9,8 @@ public class LoanHomeVisitInvestigateReservationDto implements Dto { @ApiModelProperty("sid") private String sid; + @ApiModelProperty("用户sid") + private String userSid; @ApiModelProperty("预约时间") private String times; @ApiModelProperty("预约地址") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index 279dc7fda3..9836553d59 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -195,7 +195,7 @@ public interface LoanHomevisitInvestigateFeign { @ApiOperation("家访考察是否通过") @PostMapping("/saveReportInfo") @ResponseBody - public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid); + public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid, @RequestParam("userSid") String userSid); @ApiOperation("家访考察详情") @GetMapping("/details") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index f08f1f1cad..92ab05db6c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -187,7 +187,7 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves } @Override - public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { + public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) { return null; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index 49b5969804..a5a7182bb8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -156,6 +156,16 @@ public class LoanCapitalCreditResultService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (LoanCapitalCreditResultVo record : pagging.getRecords()) { + List xsfjFileVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(record.getSid(), LoanAttachTypeEnum.XSFJ.getAttachType()); + List xsfjImages = new ArrayList<>(); + if (xsfjFileVos != null && xsfjFileVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo xsfjFileVo : xsfjFileVos) { + xsfjImages.add(xsfjFileVo.getFileUrl()); + } + } + record.setXsImages(xsfjImages); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.java index 166aa90411..0e24fd0822 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.java @@ -69,4 +69,6 @@ public interface LoanHomevisitAppealMapper extends BaseMapper map); + + int selectKcSid(String kcSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml index a0fb9e4d52..77721dc7d9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml @@ -16,6 +16,7 @@ bo.`contractNo`, bb.`borrowerName`, bb.`mobile`, + bb.bankName, bb.`policyName`, li.`homeVisStaffName`, li.investigateValue @@ -45,7 +46,7 @@ + SELECT COUNT(*) + FROM loan_homevisit_appeal + WHERE homeVisitSid = #{kcSid} + AND nodeState != '待提交' + AND nodeState != '终止' + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java index 6f628b0e57..bad1ad3d09 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java @@ -123,12 +123,11 @@ public class LoanHomevisitAppealService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("li.state", 2); - qw.eq("bb.busNo", 302); if (StringUtils.isNotBlank(query.getMenuSid())) { //======================= PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgSidPath()); - privilegeQuery.setMenuUrl(query.getMenuSid()); + privilegeQuery.setMenuSid(query.getMenuSid()); privilegeQuery.setUserSid(query.getUserSid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { @@ -210,7 +209,7 @@ public class LoanHomevisitAppealService extends MybatisBaseService 0){ + return rb.setMsg("该家访考察申诉已存在"); + } + dto.getKcSid(); LoanHomevisitAppeal loanHomevisitAppeal = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, loanHomevisitAppeal); if (r == 3) { @@ -337,7 +342,8 @@ public class LoanHomevisitAppealService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 - appMap.put("sid", businessSid); + appMap.put("kcSid", loanHomevisitAppeal.getHomeVisitSid()); + appMap.put("ssSid", loanHomevisitAppeal.getSid()); variables.put("app", appMap); //流程定义id bv.setModelId(ProcDefEnum.LOANHOMEVISITAPPEALAPPLY.getProDefId()); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java index d2adda5f54..7e40ff73bd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java @@ -68,11 +68,11 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper ssImages = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java index db17275eda..f5957e3aa7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java @@ -42,7 +42,7 @@ public interface LoanHomeVisitInvestigateFeign { @ApiOperation("家访考察是否通过") @PostMapping("/saveReportInfo") @ResponseBody - public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid); + public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid, @RequestParam("userSid") String userSid); @ApiOperation("家访考察详情") @GetMapping("/details") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index 03cab6b308..deb5345b71 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -55,8 +55,8 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei } @Override - public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { - return loanHomeVisitInvestigateService.saveReportInfo(comment, agree, sid); + public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) { + return loanHomeVisitInvestigateService.saveReportInfo(comment, agree, sid, userSid); } @Override @@ -166,7 +166,7 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei @Override public ResultBean getHomeVisitAppealInfo(String kcSid, String ssSid) { - return loanHomeVisitInvestigateService.getHomeVisitAppealInfo(kcSid,ssSid); + return loanHomeVisitInvestigateService.getHomeVisitAppealInfo(kcSid, ssSid); } @Override diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index a1f51b92bf..e0059421d4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -35,6 +35,7 @@ import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApp import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo; import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyTaskQuery; import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomeVisitInitAppealVo; import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery; import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo; @@ -132,9 +133,9 @@ public class LoanHomeVisitInvestigateService { return rb.success(); } - public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { + public ResultBean saveReportInfo(String comment, Boolean agree, String sid, String userSid) { ResultBean rb = ResultBean.fireFail(); - ResultBean resultBean = loanHomevisitInvestigateFeign.saveReportInfo(comment, agree, sid); + ResultBean resultBean = loanHomevisitInvestigateFeign.saveReportInfo(comment, agree, sid, userSid); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } @@ -352,6 +353,9 @@ public class LoanHomeVisitInvestigateService { loanHomeVisitInvestigatePageVo.setMobile(record.getMobile()); loanHomeVisitInvestigatePageVo.setTimes(record.getResHomeVisDate()); loanHomeVisitInvestigatePageVo.setAddress(record.getHomeVisAddress()); + loanHomeVisitInvestigatePageVo.setZf(record.getBankName()); + loanHomeVisitInvestigatePageVo.setFinProduct(record.getPolicyName()); + loanHomeVisitInvestigatePageVo.setJfMember(record.getHomeVisStaffName()); if (record.getInvestigateValue().equals("不通过")) { loanHomeVisitInvestigatePageVo.setShowAppealBtn(true); } @@ -444,7 +448,9 @@ public class LoanHomeVisitInvestigateService { public ResultBean getHomeVisitAppealInfo(String kcSid, String ssSid) { ResultBean rb = ResultBean.fireFail(); - loanHomevisitAppealFeign.getHomeVisitAppealInfo(kcSid,ssSid); - return null; + LoanHomeVisitInitAppealVo loanHomeVisitInitAppealVo = loanHomevisitAppealFeign.getHomeVisitAppealInfo(kcSid, ssSid).getData(); + AppLoanHomeVisitInitAppealVo appLoanHomeVisitInitAppealVo = new AppLoanHomeVisitInitAppealVo(); + BeanUtil.copyProperties(loanHomeVisitInitAppealVo, appLoanHomeVisitInitAppealVo); + return rb.success().setData(appLoanHomeVisitInitAppealVo); } } \ No newline at end of file