From 8f547e5f4980039bc1f9299dddd230ef352cbcbe Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 15 Sep 2023 09:41:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCreditAppealApplyFeign.java | 9 +- .../LoanCreditAppealApplyFeignFallback.java | 5 + .../LoanCreditAppealApplyMapper.java | 3 + .../LoanCreditAppealApplyMapper.xml | 16 +- .../LoanCreditAppealApplyRest.java | 158 +++++++++--------- .../LoanCreditAppealApplyService.java | 5 + .../creditreview/CreditReviewService.java | 34 +++- 7 files changed, 145 insertions(+), 85 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeign.java index fc4ae25d3a..2693e6fbb9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeign.java @@ -68,7 +68,7 @@ public interface LoanCreditAppealApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody LoanCreditAppealApplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody @@ -78,7 +78,7 @@ public interface LoanCreditAppealApplyFeign { @DeleteMapping("/delBySid") @ResponseBody public ResultBean delBySid(@RequestParam("sid") String sid); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody @@ -116,4 +116,9 @@ public interface LoanCreditAppealApplyFeign { @ApiOperation(value = "终止任务") @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody LoanCreditApplyTaskQuery query); + + @ApiOperation("根据审核sid查询待提交状态申诉") + @PostMapping("/fetchDetailsByShSidAndState") + @ResponseBody + ResultBean fetchDetailsByShSidAndState(@RequestParam("shSid") String shSid, @RequestParam("nodeState") String nodeState); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeignFallback.java index 58f2566f55..6bbed78b06 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyFeignFallback.java @@ -115,4 +115,9 @@ public class LoanCreditAppealApplyFeignFallback implements LoanCreditAppealApply public ResultBean breakProcess(LoanCreditApplyTaskQuery query) { return null; } + + @Override + public ResultBean fetchDetailsByShSidAndState(String shSid, String nodeState) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java index aae10e827e..8a3c04eb1a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -74,4 +75,6 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyRest.java index 413eaa6abd..22238cf4db 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyRest.java @@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; + import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyQuery; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo; @@ -64,84 +65,89 @@ import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyF @RequestMapping("v1/loancreditappealapply") public class LoanCreditAppealApplyRest implements LoanCreditAppealApplyFeign { - @Autowired - private LoanCreditAppealApplyService loanCreditAppealApplyService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanCreditAppealApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanCreditAppealApplyDto dto){ - return loanCreditAppealApplyService.saveOrUpdateDto(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private LoanCreditAppealApplyService loanCreditAppealApplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanCreditAppealApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanCreditAppealApplyDto dto) { + return loanCreditAppealApplyService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return loanCreditAppealApplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return loanCreditAppealApplyService.delAll(sids); + } - @Override - public ResultBean delBySid(String sid) { - return loanCreditAppealApplyService.delBySid(sid); - } + @Override + public ResultBean delBySid(String sid) { + return loanCreditAppealApplyService.delBySid(sid); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return loanCreditAppealApplyService.fetchDetailsVoBySid(sid); - } - - @Override - public ResultBean init(String sid) { - return loanCreditAppealApplyService.init(sid); - } - - @Override - public ResultBean submitLoanCreditApply(SubmitLoanCreditApplyDto dto) { - return loanCreditAppealApplyService.submitLoanCreditApply(dto); - } - - @Override - public ResultBean complete(LoanCreditApplyCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId()); - return loanCreditAppealApplyService.complete(bv); - } - - @Override - public ResultBean> getPreviousNodesForReject(LoanCreditApplyNodeQuery query) { - return loanCreditAppealApplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean> getNextNodesForSubmit(LoanCreditApplyNodeQuery query) { - return loanCreditAppealApplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean reject(LoanCreditApplyTaskQuery query) { - return loanCreditAppealApplyService.reject(query); - } - - @Override - public ResultBean revokeProcess(LoanCreditApplyTaskQuery query) { - return loanCreditAppealApplyService.revokeProcess(query); - } - - @Override - public ResultBean breakProcess(LoanCreditApplyTaskQuery query) { - return loanCreditAppealApplyService.breakProcess(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return loanCreditAppealApplyService.fetchDetailsVoBySid(sid); + } + + @Override + public ResultBean init(String sid) { + return loanCreditAppealApplyService.init(sid); + } + + @Override + public ResultBean submitLoanCreditApply(SubmitLoanCreditApplyDto dto) { + return loanCreditAppealApplyService.submitLoanCreditApply(dto); + } + + @Override + public ResultBean complete(LoanCreditApplyCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId()); + return loanCreditAppealApplyService.complete(bv); + } + + @Override + public ResultBean> getPreviousNodesForReject(LoanCreditApplyNodeQuery query) { + return loanCreditAppealApplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean> getNextNodesForSubmit(LoanCreditApplyNodeQuery query) { + return loanCreditAppealApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean reject(LoanCreditApplyTaskQuery query) { + return loanCreditAppealApplyService.reject(query); + } + + @Override + public ResultBean revokeProcess(LoanCreditApplyTaskQuery query) { + return loanCreditAppealApplyService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(LoanCreditApplyTaskQuery query) { + return loanCreditAppealApplyService.breakProcess(query); + } + + @Override + public ResultBean fetchDetailsByShSidAndState(String shSid, String nodeState) { + return loanCreditAppealApplyService.fetchDetailsByShSidAndState(shSid, nodeState); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java index 8a9bca1c67..f887c5a551 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java @@ -655,4 +655,9 @@ public class LoanCreditAppealApplyService extends MybatisBaseService fetchDetailsByShSidAndState(String shSid, String nodeState) { + ResultBean rb = ResultBean.fireFail(); + LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = baseMapper.fetchDetailsByShSidAndState(shSid,nodeState); + return rb.success().setData(loanCreditAppealApplyDetailsVo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index 92c8ea7e02..1451ba5297 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -307,10 +307,34 @@ public class CreditReviewService { CreditReviewDetailsSsVo creditReviewDetailsSsVo = new CreditReviewDetailsSsVo(); LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo; if (query.getAddNew()) { - loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); - creditReviewDetailsSsVo.setSid2(query.getSid()); - creditReviewDetailsSsVo.setOrgPath(query.getOrgPath()); - creditReviewDetailsSsVo.setUserSid(query.getUserSid()); + LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsByShSidAndState(query.getSid(), "待提交").getData(); + if (loanCreditAppealApplyDetailsVo != null){ + loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData(); + creditReviewDetailsSsVo.setReason(loanCreditAppealApplyDetailsVo.getAppealReason()); + List loanCreditAppealPeos = loanCreditAppealApplyDetailsVo.getLoanCreditAppealPeos(); + List shareholderDetailsVos = new ArrayList<>(); + for (LoanCreditAppealPeoDetailsVo loanCreditAppealPeo : loanCreditAppealPeos) { + ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo(); + shareholderDetailsVo.setShareholderName(loanCreditAppealPeo.getName()); + shareholderDetailsVo.setShareholderIdNumber(loanCreditAppealPeo.getIdCard()); + shareholderDetailsVo.setShareholderMobile(loanCreditAppealPeo.getPhone()); + shareholderDetailsVo.setShareholderRemarks(loanCreditAppealPeo.getRemarks()); + shareholderDetailsVos.add(shareholderDetailsVo); + } + creditReviewDetailsSsVo.setGuarantorList(shareholderDetailsVos); + creditReviewDetailsSsVo.setUploadFiles(loanCreditAppealApplyDetailsVo.getSsImages()); + creditReviewDetailsSsVo.setOrgPath(loanCreditAppealApplyDetailsVo.getOrgSidPath()); + creditReviewDetailsSsVo.setUserSid(loanCreditAppealApplyDetailsVo.getCreateBySid()); + creditReviewDetailsSsVo.setSid2(loanCreditAppealApplyDetailsVo.getCreditApplySid()); + creditReviewDetailsSsVo.setSid(loanCreditAppealApplyDetailsVo.getSid()); + creditReviewDetailsSsVo.setTaskId(loanCreditAppealApplyDetailsVo.getTaskId()); + creditReviewDetailsSsVo.setProcInsId(loanCreditAppealApplyDetailsVo.getInstanceId()); + }else { + loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); + creditReviewDetailsSsVo.setSid2(query.getSid()); + creditReviewDetailsSsVo.setOrgPath(query.getOrgPath()); + creditReviewDetailsSsVo.setUserSid(query.getUserSid()); + } } else { LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsBySid(query.getSid()).getData(); loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData(); @@ -386,7 +410,7 @@ public class CreditReviewService { public ResultBean> selModelByUseOrgSid(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - List baseVehmodelConfigVos = baseVehmodelConfigFeign.selModelByUseOrgSid(useOrgSid,query.getName()).getData(); + List baseVehmodelConfigVos = baseVehmodelConfigFeign.selModelByUseOrgSid(useOrgSid, query.getName()).getData(); List identityDetailsVos = new ArrayList<>(); for (BaseVehmodelConfigVos baseVehmodelConfigVo : baseVehmodelConfigVos) { IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo();