From b6ba2ed6e89f2664770a269f4b8e0b9b8d744b48 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 21 Jun 2023 09:57:30 +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 --- .../loansolutions/app/SolutionsDetailsVo.java | 5 ++ .../api/loansolutions/app/SolutionsDto.java | 3 + .../LoanSolutionsOtherpolicy.java | 3 + .../loansolutions/LoanSolutionsService.java | 11 +++ .../anrui/terminal/biz/app/AppService.java | 72 +++++++++++-------- 5 files changed, 65 insertions(+), 29 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java index 62d3b832a5..72b8f264b8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @Author dimengzhe * @Date 2023/3/22 11:40 @@ -162,6 +164,9 @@ public class SolutionsDetailsVo implements Vo { @ApiModelProperty("上装成交价") private String szPrice; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java index bc9076b75a..7a4d6da73b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java @@ -159,4 +159,7 @@ public class SolutionsDto implements Dto { @ApiModelProperty("名义留购价") private String nominalPrice; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java index d42e6fb8e9..854a32ce56 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java @@ -79,5 +79,8 @@ public class LoanSolutionsOtherpolicy extends BaseEntity { @ApiModelProperty("其它融年利率") private String otherPolicyYearRatio; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 12ccf8db99..4a1cbaffa9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -438,6 +438,12 @@ public class LoanSolutionsService extends MybatisBaseService resultBean = flowTaskFeign.businessFlowRecord(procInsId); List voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList()); voList.removeAll(Collections.singleton(null)); - for (int i = 0; i < voList.size(); i++) { - AppFlowableRecordVo vo = voList.get(i); - if (vo.getFinishTime() != null) { - AppFlowCommentVo commentVo = vo.getComment(); - //类型 - String type = commentVo.getType(); - String comment = commentVo.getComment(); - if (StringUtils.isNotBlank(comment)) { - vo.setContent(comment); - } - String stateValue = FlowComment.getRemarkByType(type); - if (StringUtils.isNotBlank(stateValue)) { - String processEndTime = vo.getProcessEndTime(); - vo.setStateValue(stateValue); - if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) { + if (!voList.isEmpty()) { + for (int i = 0; i < voList.size(); i++) { + AppFlowableRecordVo vo = voList.get(i); + if (vo.getFinishTime() != null) { + AppFlowCommentVo commentVo = vo.getComment(); + //类型 + String type = commentVo.getType(); + String comment = commentVo.getComment(); + if (StringUtils.isNotBlank(comment)) { + vo.setContent(comment); + } + String stateValue = FlowComment.getRemarkByType(type); + if (StringUtils.isNotBlank(stateValue)) { + String processEndTime = vo.getProcessEndTime(); + vo.setStateValue(stateValue); + /* if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) { vo.setStateValue("已办结");//流程已办结 + }*/ + if (StringUtils.isNotBlank(processEndTime) && i == voList.size() - 1 && !"6".equals(type)) { + voList.get(i - 1).setStateValue("已办结");//流程已办结 + } } - } - if (StringUtils.isNotBlank(type)) { + /* if (StringUtils.isNotBlank(type)) { String processEndTime = vo.getProcessEndTime(); vo.setStateKey(type); if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) { vo.setStateKey("8");//流程已办结 } + }*/ + if (StringUtils.isNotBlank(type)) { + String processEndTime = vo.getProcessEndTime(); + vo.setStateKey(type); + if (StringUtils.isNotBlank(processEndTime) && i == voList.size() - 1 && !"6".equals(type)) { + voList.get(i - 1).setStateKey("8");//流程已办结 + } + } + } } } + return rb.success().setData(voList); } @@ -87,9 +101,9 @@ public class AppService { a.setFlowableRecordVo(f); a.setState(0 + ""); List taskUserInfos = f.getTaskUserInfos(); - if(taskUserInfos.size() == 1){ + if (taskUserInfos.size() == 1) { AppUserVo appUserVo = taskUserInfos.get(0); - if("admin".equals(appUserVo.getAssigneeName())){ + if ("admin".equals(appUserVo.getAssigneeName())) { return; } } @@ -106,20 +120,20 @@ public class AppService { list.add(a); }); // list.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime())); - if(progressList.size()>0){ - AppFlowableRecordVo appFlowableRecordVo = progressList.get(progressList.size()-1); - if(!"Event_end".equals(appFlowableRecordVo.getTaskDefKey())){ + if (progressList.size() > 0) { + AppFlowableRecordVo appFlowableRecordVo = progressList.get(progressList.size() - 1); + if (!"Event_end".equals(appFlowableRecordVo.getTaskDefKey())) { String proDefId = appFlowableRecordVo.getProcDefId(); - Map map = appFlowableRecordVo.getProcVars(); + Map map = appFlowableRecordVo.getProcVars(); FlowableQuery flowableQuery = new FlowableQuery(); flowableQuery.setModelId(proDefId); flowableQuery.setTaskDefKey(appFlowableRecordVo.getTaskDefKey()); flowableQuery.setMap(map); - ResultBean>> resultBean = flowTaskFeign.yuyanTest(flowableQuery); - if(resultBean.getData() != null){ - if(!resultBean.getData().isEmpty()){ - List> mapList = resultBean.getData(); - mapList.forEach(f->{ + ResultBean>> resultBean = flowTaskFeign.yuyanTest(flowableQuery); + if (resultBean.getData() != null) { + if (!resultBean.getData().isEmpty()) { + List> mapList = resultBean.getData(); + mapList.forEach(f -> { AppFlowableRecordAndCommentVo a = new AppFlowableRecordAndCommentVo(); AppFlowableRecordVo app = new AppFlowableRecordVo(); app.setTaskName(f.get("nodeName").toString()); @@ -131,7 +145,7 @@ public class AppService { } } } - list.sort(Comparator.nullsLast(Comparator.comparing(AppFlowableRecordAndCommentVo::getTime,nullComparator))); + list.sort(Comparator.nullsLast(Comparator.comparing(AppFlowableRecordAndCommentVo::getTime, nullComparator))); return rb.success().setData(list); }