吉安感知网项目-后端
linwei
27 mins ago 08ddfad4530a014094c06fe68b8c2d9a0753403a
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
@@ -93,13 +93,15 @@
         @RequestParam(value = "startTime", required = false) String startTime,
         @ApiParam(value = "结束时间(创建时间)")
         @RequestParam(value = "endTime", required = false) String endTime,
         @ApiParam(value = "是否包含已退回数据,1为是,0为否")
         @RequestParam(value = "includeReturned", required = false, defaultValue = "0") Integer includeReturned,
         @ApiParam(value = "分页参数") Query query) {
      // 1. 构建分页对象
      IPage<GdClueEventListVO> pages = Condition.getPage(query);
      // 2. 查询分页数据
      IPage<GdClueEventListVO> result = gdClueEventService.pageGdClueEventByDept(
            pages, onlyMine, keyword, eventStatus, startTime, endTime);
            pages, onlyMine, keyword, eventStatus, startTime, endTime, includeReturned);
      // 3. 返回分页结果
      return R.data(result);
@@ -202,7 +204,7 @@
      List<GdClueDisposeRecordVO> disposeRecords = gdClueDisposeRecordService.getDisposeRecordsByEventId(id);
      // 3. 查询状态流转时间线
      List<GdClueEventStatusFlowVO> statusFlows = gdClueEventStatusFlowService.getStatusTimeline(id);
      List<GdClueEventStatusFlowVO> statusFlows = gdClueEventStatusFlowService.getStatusFlowsByEventId(id);
      // 4. 组装返回数据
      GdClueEventDetailVO detailVO = new GdClueEventDetailVO();