Merge branch 'mazq-0301-messageId' into 'develop'

feature(工作流新增messageId字段): 工作流新增messageId字段

See merge request dcuc/auth-back!62

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/WorkFlowApiController.java

@@ -68,9 +68,10 @@ public class WorkFlowApiController {
     @ResponseBody
     public ApiResult dealAuthFlowResult(@RequestBody WorkFlowResutlAcceptVo flowResutlVo) {
         WorkFlowResutlAcceptDTO dto = new WorkFlowResutlAcceptDTO();
-        dto.setFlowStatus(WorkFlowStatusEnum.SUCCESS.getValue());
-        dto.setFlowId(flowResutlVo.getFlowId());
+        dto.setApproveResult(WorkFlowStatusEnum.SUCCESS.getValue());
+        dto.setProcessInstanceId(flowResutlVo.getProcessInstanceId());
         dto.setRemark(flowResutlVo.getDesc());
+        dto.setMessageId(flowResutlVo.getMessageId());
         serviceAuthFacade.dealAuthFlowResult(dto);
         return ApiResult.setSuccess();
     }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/vo/WorkFlowResutlAcceptVo.java

@@ -17,17 +17,17 @@ public class WorkFlowResutlAcceptVo {
      * 工作流状态
      */
     @ApiModelProperty(value = "工作流审批状态")
-    private String flowStatus;
+    private String approveResult;
     /**
      * 工作流id
      */
     @ApiModelProperty(value = "工作流id")
-    private String flowId;
+    private String processInstanceId;
     /**
-     * 内部工单号
+     * 内部消息id
      */
-    @ApiModelProperty(value = "内部工单号")
-    private String orderNo;
+    @ApiModelProperty(value = "内部消息id")
+    private String messageId;
     /**
      * 详细说明
      */