add : 吉安支持查询待验收的接口

linwei

2026-06-23 ebeb43ea497fafc448c827d1de6796bcaa4e0b52

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderFlowController.java

@@ -77,6 +77,7 @@
         queryWrapper.lambda().like(GdWorkOrderFlowEntity::getType, type.toString());
      }
      queryWrapper.lambda().orderByDesc(GdWorkOrderFlowEntity::getCreateTime);

      // 调用服务层方法获取分层结构的流程数据
      List<WorkOrderStageVO> stages = gdWorkOrderFlowService.getHierarchicalFlow(queryWrapper);

@@ -90,7 +91,23 @@
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "巡查流程列表", notes = "传入gdWorkOrderFlow")
   public R<List<GdWorkOrderFlowVO>> patrolList(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrderFlow) {
      List<GdWorkOrderFlowEntity> list = gdWorkOrderFlowService.list(Condition.getQueryWrapper(gdWorkOrderFlow, GdWorkOrderFlowEntity.class));
      // 手动构建查询条件,避免 Long 类型字段使用 LIKE 导致 Kingbase8 类型错误
      QueryWrapper<GdWorkOrderFlowEntity> queryWrapper = new QueryWrapper<>();
      queryWrapper.lambda().eq(GdWorkOrderFlowEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);

      // 处理 workOrderId (Long 类型,使用 EQ 而非 LIKE)
      Object workOrderId = gdWorkOrderFlow.get("workOrderId");
      if (workOrderId != null && !"".equals(workOrderId.toString())) {
         queryWrapper.lambda().eq(GdWorkOrderFlowEntity::getWorkOrderId, Long.parseLong(workOrderId.toString()));
      }

      // 处理 type 字段 (String 类型,可以使用 LIKE)
      Object type = gdWorkOrderFlow.get("type");
      if (type != null && !"".equals(type.toString())) {
         queryWrapper.lambda().like(GdWorkOrderFlowEntity::getType, type.toString());
      }
      queryWrapper.lambda().orderByAsc(GdWorkOrderFlowEntity::getCreateTime);
      List<GdWorkOrderFlowEntity> list = gdWorkOrderFlowService.list(queryWrapper);
      return R.data(GdWorkOrderFlowWrapper.build().entityVOList(list));
   }

@@ -154,11 +171,22 @@
   @ApiOperation(value = "导出数据", notes = "传入gdWorkOrderFlow")
   @ApiIgnore
   public void exportGdWorkOrderFlow(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrderFlow, BladeUser bladeUser, HttpServletResponse response) {
      QueryWrapper<GdWorkOrderFlowEntity> queryWrapper = Condition.getQueryWrapper(gdWorkOrderFlow, GdWorkOrderFlowEntity.class);
      //if (!AuthUtil.isAdministrator()) {
      //   queryWrapper.lambda().eq(GdWorkOrderFlow::getTenantId, bladeUser.getTenantId());
      //}
      // 手动构建查询条件,避免 Long 类型字段使用 LIKE 导致 Kingbase8 类型错误
      QueryWrapper<GdWorkOrderFlowEntity> queryWrapper = new QueryWrapper<>();
      queryWrapper.lambda().eq(GdWorkOrderFlowEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);

      // 处理 workOrderId (Long 类型,使用 EQ 而非 LIKE)
      Object workOrderId = gdWorkOrderFlow.get("workOrderId");
      if (workOrderId != null && !"".equals(workOrderId.toString())) {
         queryWrapper.lambda().eq(GdWorkOrderFlowEntity::getWorkOrderId, Long.parseLong(workOrderId.toString()));
      }

      // 处理 type 字段 (String 类型,可以使用 LIKE)
      Object type = gdWorkOrderFlow.get("type");
      if (type != null && !"".equals(type.toString())) {
         queryWrapper.lambda().like(GdWorkOrderFlowEntity::getType, type.toString());
      }

      List<GdWorkOrderFlowExcel> list = gdWorkOrderFlowService.exportGdWorkOrderFlow(queryWrapper);
      ExcelUtil.export(response, "流程记录表数据" + DateUtil.time(), "流程记录表数据表", list, GdWorkOrderFlowExcel.class);
   }