diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java index 5fafd92616..914dd2c3b5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java @@ -44,4 +44,9 @@ public class ScmVehicleGressionPageVo implements Vo { @ApiModelProperty("是否显示临时出门证按钮 审批流程完成后并且未上传现场照片时显示") private boolean showDownloadBtn; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; + } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml index f47a875b6a..50bc5de2d3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml @@ -23,16 +23,18 @@ SELECT svg.sid, - svg.vinNo as vin, - svg.applicantNo as applyId, - if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`, - if(length(svg.nodeState) > 0, false, true) as showDetectBtn, - if(length(svg.nodeState) > 0, false, true) as showUpdateBtn, - if(length(svg.nodeState) > 0, true, false) as showUploadBtn, - if(length(svg.nodeState) > 0, true, false) as showDownloadBtn, - svg.applicantName as applyName, - svg.applicantDate as applyDate, - svg.applicantFunds as applyPrice, - svg.taskId, - svg.procInstId + svg.vinNo as vin, + svg.applicantNo as applyId, + if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`, + if(length(svg.nodeState) > 0, false, true) as showDetectBtn, + if(length(svg.nodeState) > 0, false, true) as showUpdateBtn, + if(length(svg.nodeState) > 0, true, false) as showUploadBtn, + if(length(svg.nodeState) > 0, true, false) as showDownloadBtn, + svg.applicantName as applyName, + svg.applicantDate as applyDate, + svg.applicantFunds as applyPrice, + svg.taskId, + svg.procInstId FROM scm_vehicle_gression svg ${ew.sqlSegment} and concat(svg.applicantNo - , svg.vinNo) LIKE concat('%' - , #{names} - , '%') + , svg.vinNo) LIKE concat('%' + , #{names} + , '%') ORDER BY id DESC @@ -99,11 +101,11 @@ UPDATE scm_vehicle_gression SET nodeState=#{nodeState} - , nodeId=#{taskDefKey} + , nodeId=#{taskDefKey} , procDefId=#{procDefId}