Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

operation_manager/src/main/java/com/huaxu/process/controller/WorkFlowController.java

@@ -176,15 +176,16 @@ public class WorkFlowController {
     @PostMapping ("/testHandleTask")
     @ApiOperation(value = "流程流转")
     public AjaxMessage testHandleTask( String taskId,Integer actionId) {
-
+        Map<String,Object>args=new HashMap<>();
         Action action=null;
         if(actionId==1){
             action=Action.ACTION_AUDIT;
         }
         else if(actionId==3){
             action=Action.ACTION_REJECT;
+            args.put("assineeFormUserId","1891");
         }
-        Map<String,Object>args=new HashMap<>();
+
         List<TaskPorcessResult> results = workFlowService.handleTask(action, taskId, args, "haowan");
         return new AjaxMessage(ResultStatus.OK,results);
     }

operation_manager/src/main/java/com/huaxu/process/entity/ProcessDefinition.java

@@ -1,5 +1,6 @@
 package com.huaxu.process.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,7 +47,7 @@ public class ProcessDefinition implements Serializable {
     /**
      * 任务类型
      */
-    @ApiModelProperty(value = "任务类型")
+    @ApiModelProperty(value = "任务类型,1表务工单，2停通水工单，3抢修工单，4漏点定位工单，5测漏工单,6违章跑水工单,7巡检任务,8测漏任务,9养护任务")
     private Integer taskType;
     /**
      * 公司id
@@ -56,7 +57,7 @@ public class ProcessDefinition implements Serializable {
     /**
      * 业务类型
      */
-    @ApiModelProperty(value = "业务类型")
+    @ApiModelProperty(value = "业务类型,1工单，2任务")
     private Integer businessType;
     /**
      * 关联activiti
@@ -118,6 +119,7 @@ public class ProcessDefinition implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间",hidden = true)
     private Date dateCreate;
     /**