Merge remote-tracking branch 'origin/develop' into release/v1.0.2-flow-update

Conflicts:
	approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApprovalInfoDTO.java

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApprovalInfoDTO.java

@@ -119,6 +119,17 @@ public class ApprovalInfoDTO {
     @NotNull
     private ResourceInfoDTO resourceInfoDTO;
 
+    @ApiModelProperty(value = "申请类型")
+    private String flowType;
+
+    public String getFlowType() {
+        return flowType;
+    }
+
+    public void setFlowType(String flowType) {
+        this.flowType = flowType;
+    }
+
     @ApiModelProperty(value = "下一任务对象信息")
     private List<ActivitiHolder> activitiHolderList;
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/ApproveApplication.java

@@ -23,4 +23,5 @@ public class ApproveApplication {
     public static void main(String[] args) {
         SpringApplication.run(ApproveApplication.class, args);
     }
+
 }

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApproveTaskRequestVo.java

@@ -89,6 +89,19 @@ public class ApproveTaskRequestVo implements Serializable {
      */
     private String businessId;
 
+    public String getFlowType() {
+        return flowType;
+    }
+
+    public void setFlowType(String flowType) {
+        this.flowType = flowType;
+    }
+
+    /**
+     * 申请类型
+     */
+    private String flowType;
+
     public String getApplyTitle() {
         return applyTitle;
     }

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/impl/ApproveService.java

@@ -226,7 +226,9 @@ public class ApproveService implements IApproveService {
             logger.info("===开始提交=====");
             //构建申请的taskRequest
             TaskRequest<ApproveTaskRequestVo> taskRequest = new TaskRequest<>();
-            taskRequest.setData(this.buildTaskRequestVo(approvalInfo));
+            ApproveTaskRequestVo approveTaskRequestVo = this.buildTaskRequestVo(approvalInfo);
+            approveTaskRequestVo.setFlowType(approvalInfoDTO.getFlowType());
+            taskRequest.setData(approveTaskRequestVo);
             getCurrentUserId(approvalInfoDTO.getApplicantIdcard());
             String userId = approvalInfo.getApplicantIdcard();
             logger.info("===提交的用户是:{}===",userId);