修改

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

@@ -391,7 +391,7 @@ public class WorkOrderManageController {
         ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
                 "test1",
                 1,
-                8);
+                1);
         if(processDefinition == null){
             new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能派单！");
         }

operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderManage.java

@@ -120,4 +120,16 @@ public class WorkOrderManage implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ApiModelProperty(value = "修改时间")
     private Date dateUpdate;
+
+    @ApiModelProperty(value = "设备ID")
+    private Integer deviceId;
+
+    @ApiModelProperty(value = "场景ID")
+    private Integer scenesId;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "场景名称")
+    private String scenesName;
 }

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -209,7 +209,7 @@ public class PlanManageController {
         ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
                 "test1",
                 1,
-                1);
+                2);
         if(processDefinition == null){
             new AjaxMessage(ResultStatus.ERROR,"没有创建流程，不能提交！");
         }

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -37,6 +37,10 @@
     <result column="videos" property="videos" jdbcType="VARCHAR" />
     <result column="pictures" property="pictures" jdbcType="VARCHAR" />
     <result column="flow_detail" property="flowDetail" jdbcType="VARCHAR" />
+    <result column="device_id" property="deviceId" jdbcType="INTEGER" />
+    <result column="scenes_id" property="scenesId" jdbcType="INTEGER" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="scenes_name" property="scenesName" jdbcType="VARCHAR" />
   </resultMap>
 
   <resultMap id="workFlowLogResultMap" type="com.huaxu.order.entity.WorkFlowLog">
@@ -86,7 +90,8 @@
     date_limit, urgency, address, contact_user, contact_phone, order_time, company_org_id, 
     department_org_id, order_status, event_type, order_type_id, order_pid, tenant_id, 
     process_instance_id, process_def_id, current_task_id, current_users, current_task_name, 
-    create_by, date_create, update_by, date_update, geo,videos,pictures
+    create_by, date_create, update_by, date_update, geo,videos, pictures, device_id, scenes_id,
+    device_name, scenes_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -472,7 +477,6 @@
       pictures = #{pictures,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-
   <select id="selectAppTodo" resultMap="BaseResultMap">
     select id,task_no,send_time,address,order_type_id,create_by,update_by,task_desc,order_status
     from sc_work_order_manage
@@ -504,7 +508,6 @@
     where t1.id = #{id,jdbcType=INTEGER} or t1.order_pid = #{orderPid,jdbcType=INTEGER}
     order by t1.order_pid
   </select>
-
   <insert id="batchInsertByAlarms" >
     insert into sc_work_order_manage( task_no, task_desc, address, order_time, company_org_id, department_org_id, order_status, event_type, order_pid, tenant_id, current_task_name,  date_create, date_update, geo,scenes_id,scenes_name,device_id,device_name)
     values
@@ -512,7 +515,6 @@
       (#{item.taskNo} , #{item.taskDesc}, #{item.address}, #{item.orderTime}, #{item.companyOrgId}, #{item.departmentOrgId}, 0, 3, 0, #{item.tenantId}, '设备报警工单',  now(),  now(), #{item.geo}, #{item.parentSceneId}, #{item.parentSceneName}, #{item.deviceId}, #{item.deviceName})
     </foreach>
   </insert>
-
   <delete id="batchDeleteByAlarms" >
     delete from sc_work_order_manage
     where  order_status = 0 and  device_id in
@@ -520,7 +522,6 @@
       #{item}
     </foreach>
   </delete>
-
   <select id="findWorkOrderByDeviceIds" resultType="com.huaxu.order.dto.WorkOrderManageByAlarmDto">
     select
     id
@@ -546,6 +547,7 @@
     t1.order_type_id, t1.order_pid, t1.tenant_id,
     t1.process_instance_id, t1.process_def_id, t1.current_task_id, t1.current_users, t1.current_task_name,
     t1.create_by, t1.date_create, t1.update_by, t1.date_update, t1.geo,t1.videos,t1.pictures,
+    t1.device_id, t1.scenes_id, t1.device_name, t1.scenes_name,
     t2.flow_detail,t2.create_by detail_create_by,t2.date_create detail_date_create,t2.update_by detail_update_by,t2.date_update detail_date_update
     from sc_work_order_manage t1 left  join sc_work_flow_detail t2
     on t1.id = t2.flow_id and t2.flow_type=2