From be8dd73422a56a3fbc6f19ad88fac730b283ae69 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 14 Aug 2023 15:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E9=87=91=E8=9E=8D=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/api/loantemplate/LoanTemplateDetailsVo.java | 5 ++++- .../api/loantemplate/LoanTemplateSolutionsDto.java | 1 + .../riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java | 1 + .../anrui/riskcenter/api/loantemplate/LoanTemplateVo.java | 5 +++++ .../api/loantemplate/flowable/TemplateCompleteDto.java | 1 - .../anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml | 4 +++- .../riskcenter/biz/loantemplate/LoanTemplateService.java | 2 ++ 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateDetailsVo.java index 7ccba5d202..836da619bc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateDetailsVo.java @@ -16,7 +16,10 @@ import java.math.BigDecimal; @Data public class LoanTemplateDetailsVo implements Vo { private static final long serialVersionUID = 3033920198621775406L; - + @ApiModelProperty(value = "任务id") + private String taskId; + @ApiModelProperty(value = "流程实例id") + private String procInstId; private String sid; @ApiModelProperty("用户sid") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java index 86d71a0d3a..448db716d0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java @@ -79,6 +79,7 @@ public class LoanTemplateSolutionsDto implements Dto { @ApiModelProperty("其它融名称") private String otherPolicyName; + private String otherPolicySid; @ApiModelProperty("其它融贷款金额") private String otherPolicyAmount; @ApiModelProperty("其它融期数") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java index cfdfe6f3cd..b8a772f531 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java @@ -71,6 +71,7 @@ public class LoanTemplateSolutionsVo implements Vo { @ApiModelProperty("其它融名称") private String otherPolicyName; + private String otherPolicySid; @ApiModelProperty("其它融金额") private String otherPolicyAmount; @ApiModelProperty("其它融期数") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateVo.java index 638c722a99..237f440280 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateVo.java @@ -43,4 +43,9 @@ public class LoanTemplateVo implements Vo { @ApiModelProperty("其他融产品名称") private String otherPolicyName; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/flowable/TemplateCompleteDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/flowable/TemplateCompleteDto.java index da14112098..ea75d6d4b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/flowable/TemplateCompleteDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/flowable/TemplateCompleteDto.java @@ -18,7 +18,6 @@ public class TemplateCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "用户全路径不能为空") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml index dc4b0e18d4..cba7f8bdd1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateMapper.xml @@ -18,7 +18,9 @@ lote.vehModelConfigSid, ls.policyName, lso.otherPolicyName, - if(length(lote.nodeState) > 0, nodeState, '待提交') as nodeState + if(length(lote.nodeState) > 0, nodeState, '待提交') as nodeState, + procDefId, + procInstId from loan_template lote left join loan_solutions ls on ls.salesOrderSid = lote.sid left join loan_solutions_otherpolicy lso on lso.solutionsSid = ls.sid diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java index 1a06d96705..d1feb1565a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java @@ -580,6 +580,8 @@ public class LoanTemplateService extends MybatisBaseService