修改

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

@@ -368,6 +368,31 @@ public class WorkOrderManageController {
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
+    /**
+     * 事件列表查询 ，按创建事件排序
+     * @param pageNum 分页参数
+     * @param pageSize 分页参数
+     * @return
+     */
+    @GetMapping("/event/list")
+    @ApiOperation(value = "查询事件隐患/所有工单")
+    public AjaxMessage<Pagination<WorkOrderManageDto>> selectEventList(
+            @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
+            @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize){
+        WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
+        //根据用户编号，获取用户的权限
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        workOrderManageDto.setTenantId(loginUser.getTenantId());
+        if(loginUser.getDepartmentId() != null) {
+            workOrderManageDto.setDepartmentOrgId(String.valueOf(loginUser.getDepartmentId()));
+        }
+        IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
+        iPage = workOrderManageService.findEventListPage(iPage, workOrderManageDto);
+        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+
     @GetMapping("/order/selectByNo")
     @ApiOperation(value = "查询事件隐患/所有工单")
     public AjaxMessage<Pagination<WorkOrderManageDto>> selectByNo(

operation_manager/src/main/java/com/huaxu/order/dao/WorkOrderManageMapper.java

@@ -41,6 +41,8 @@ public interface WorkOrderManageMapper {
 
     int updateByAlarms(@Param("workOrderManage")WorkOrderManageByAlarmDto workOrderManage);
 
+    Page<WorkOrderManageDto> findEventListPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
+
     Page<WorkOrderManageDto> findPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
 
     Page<WorkOrderManageDto> findByNo(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);

operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -68,7 +68,10 @@ public interface WorkOrderManageService {
 
     Page<WorkOrderManageDto> selectByNo(IPage<WorkOrderManageDto> page,@Param("order") WorkOrderManageDto workOrderManageDto);
 
-
+    /**
+     * 事件列表
+     */
+    Page<WorkOrderManageDto> findEventListPage(IPage<WorkOrderManageDto> page, @Param("order") WorkOrderManageDto workOrderManageDto);
     /**
      * 根据orderPid查询
      */

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -118,6 +118,11 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
         return workOrderManageMapper.findByNo(page,workOrderManageDto);
     }
 
+    @Override
+    public Page<WorkOrderManageDto> findEventListPage(IPage<WorkOrderManageDto> page, WorkOrderManageDto workOrderManageDto) {
+        return workOrderManageMapper.findEventListPage(page,workOrderManageDto);
+    }
+
     @Override
     public List<WorkOrderManage> selectByPId(Map<String, Object> map) {
         return workOrderManageMapper.selectByPId(map);

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

@@ -832,4 +832,29 @@
     </where>
     order by t1.date_create desc
   </select>
+
+  <!--App事件列表-->
+  <select id="findEventListPage" resultMap="OrderResultMap">
+    select
+    t1.id, t1.task_no, t1.task_desc, t1.order_user_id, t1.send_time, t1.send_by, t1.plan_finish_date, t1.finish_date,
+    t1.date_limit, t1.urgency, t1.address, t1.contact_user, t1.contact_phone, t1.order_time, t1.company_org_id,
+    t1.department_org_id, t1.order_status, t1.event_type,case when t1.event_type=1 then '运维上报' when t1.event_type=2 then '用户上报' when t1.event_type=3 then '设备告警' end  event_type_name,
+    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
+    <where>
+      t1.event_type = 1 and t1.create_by = #{order.createBy}
+      <if test="order.tenantId != null and order.tenantId != ''">
+        and t1.tenant_id = #{order.tenantId}
+      </if>
+      <if test="order.departmentOrgId != null and order.departmentOrgId != ''">
+        and t1.department_org_id = #{order.departmentOrgId}
+      </if>
+      order by t1.date_create desc
+    </where>
+  </select>
 </mapper>