Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -148,7 +148,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "1任务、2工单", required = true) @RequestParam Integer flowType,
             @ApiParam(value = "任务、工单id", required = true) @RequestParam Integer flowId,
             @ApiParam(value = "处理结果", required = true) @RequestParam String flowResult,
-            @ApiParam(value = "1审批通过、2同意、3驳回、4漏点定位、5停水、6提交", required = true) @RequestParam Integer actionId) {
+            @ApiParam(value = "1通过、2同意(暂时不用)、3驳回、4漏点定位、5停水、6提交", required = true) @RequestParam Integer actionId) {
         LoginUser currentUser = UserUtil.getCurrentUser();
 
         WorkFlowLog workFlowLog=new WorkFlowLog();
@@ -162,9 +162,9 @@ public class WorkOrderManageController {
 
         //流程流转 更新当前任务状态
         Action action=null;
-        if(actionId==1){
+        if(actionId==1||actionId==6){
             action=Action.ACTION_AUDIT;
-        }else if(actionId==2||actionId==6){
+        }else if(actionId==2){
             action=Action.ACTION_RECEIVE;
         }else if(actionId==3){
             action=Action.ACTION_REJECT;

operation_manager/src/main/java/com/huaxu/process/service/impl/WorkFlowServiceImpl.java

@@ -164,7 +164,8 @@ public class WorkFlowServiceImpl implements WorkFlowService {
             processDefinition.setVersion(1);
             processDefinition.setRunningVersion(0);
             processDefinition.setTenantId(tenantId);
-            processDefinition.setProcessKey(UUID.randomUUID().toString());
+            String processKey="A"+UUID.randomUUID().toString();
+            processDefinition.setProcessKey(processKey);
             processDefinition.setCompanyOrgId(id);
             processDefinition.setStatus(1);
             processDefinition.setCreateBy(UserUtil.getCurrentUser().getUsername());