Merge remote-tracking branch 'origin/master'

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")

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("其它融期数")

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("其它融期数")

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;
+
 }

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")

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

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<LoanTemplateMapper,
         loanTemplateDetailsVo.setUserSid(loanTemplate.getCreateBySid());
         loanTemplateDetailsVo.setOrgPath(loanTemplate.getOrgSidPath());
         loanTemplateDetailsVo.setSid(loanTemplate.getSid());
+        loanTemplateDetailsVo.setTaskId(loanTemplate.getTaskId());
+        loanTemplateDetailsVo.setProcInstId(loanTemplate.getProcInstId());
         LoanTemplateInstall loanTemplateInstall = loanTemplateInstallService.selectByMainSid(sid);
         if (loanTemplateInstall != null) {
             loanTemplateDetailsVo.setInstall(true);